summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* UploadPack: Clear advertised ref map after negotiationMinh Thai2020-04-232-3/+88
| | | | | | | | | | | After negotiation phase of a fetch, the advertised ref map is no longer used and can be safely cleared. For >1GiB repos object selection and packfile writing may take 10s of minutes. For the chromium.googlesource.com/chromium/src repo, this advertised ref map is >400MiB. Returning this memory to the Java heap is a major scalability win. Change-Id: I00d453c5ef47630c21f199e333e1cfcf47b7e92a Signed-off-by: Minh Thai <mthai@google.com>
* Use Map directly in MetaFilterLars Vogel2020-04-221-1/+1
| | | | Change-Id: I15545e9c7cdcbb8a913cbcf0eef7f8a2281de7a8 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
* Fix human name for local .bundle filesKonrad Windszus2020-04-213-0/+23
| | | | | | Bug: 560903 Change-Id: I15d45330398cc573940265d16a2db29ddce085aa Signed-off-by: Konrad Windszus <konrad_w@gmx.de>
* Merge branch 'stable-5.7'Matthias Sohn2020-04-182-0/+5
|\ | | | | | | | | | | | | | | * stable-5.7: Bazel: Disable SecurityManagerMissingPermissionsTest test Change-Id: Id8665d1ba630c1359e86846548143a785b178e75 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Bazel: Disable SecurityManagerMissingPermissionsTest testDavid Ostrovsky2020-04-182-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Id5376f09f0d a test with dependency on log4j library was added, but the library was missed to be added to the Bazel build tool chain. Given that Bazel test runner doesn't suport custom security manager the test wouldn't pass even if the missing dependency would be added. The only solution we have for now is to exclude that test from Bazel tool chain. Filed a feature request for bazel to support such tests at https://github.com/bazelbuild/bazel/issues/11146 Bug: 562274 Change-Id: I873a0e09addc583455b68122f66cd3952e485f0e Signed-off-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-5.7'Matthias Sohn2020-04-181-1/+1
|\| | | | | | | | | | | | | | | | | * stable-5.7: Remove double blank from sentence start Bump Bazel version to 3.0.0 Scan through all merged reftables for max/min update indices Change-Id: Idee792c6e65ca3fb283dba850f17d6554aaa1fa7
| * Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2020-04-182-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-5.6: Remove double blank from sentence start Bump Bazel version to 3.0.0 Change-Id: I26c3a8345020239d1c2ec5c6f70a633b43ddab86
| | * Remove double blank from sentence startMichael Keppler2020-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple whitespaces are not normalized when reading properties files, therefore leading to unwanted space/indentation in console or UI output. Change-Id: I1f5224fe359e0cac493e0237872afc75dc8b9fbe Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> (cherry picked from commit ebbc3efce73278d6e0dbb1acd099db2446b1bed9)
| | * Bump Bazel version to 3.0.0David Pursehouse2020-04-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I3866b58d3d288f37b1818be5b56d05e8be6ecb0f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | Scan through all merged reftables for max/min update indicesMinh Thai2020-04-052-4/+137
| | | | | | | | | | | | | | | | | | | | | | | | Since reftables might have update index ranges that are overlapped. Change-Id: I8f8215b99a0a978d4dd0155dbaf33e5e06ea8202 Signed-off-by: Minh Thai <mthai@google.com> (cherry picked from commit 06748c205c44bb4eaf6015387112de97f566c6a2)
* | | Upgrade maven-antrun-plugin to 3.0.0David Pursehouse2020-04-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I79d55d1c0b30cddfcc6a188af87ea08d802c4c3c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Upgrade maven-shade-plugin to 3.2.3David Pursehouse2020-04-161-1/+1
| | | | | | | | | | | | | | | Change-Id: Idf84a1a22b250484db5d03cf55c5207be37511b9 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Remove double blank from sentence startMichael Keppler2020-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Multiple whitespaces are not normalized when reading properties files, therefore leading to unwanted space/indentation in console or UI output. Change-Id: I1f5224fe359e0cac493e0237872afc75dc8b9fbe Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
* | | Merge "ReceivePack: Use error message if set"Terry Parker2020-04-061-36/+40
|\ \ \
| * | | ReceivePack: Use error message if setMasaya Suzuki2020-03-271-36/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ReceiveCommand can have an error message. This is shown only for some cases even if it's set. This change uses the error message if it's set, and fallback to the default message if unset. Change-Id: I8d906e71ad08cf49bcdb28caea8fcc66798c68ff Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
* | | | FileUtils: improve delete (Windows)Alexander Nittka2020-04-032-18/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure files are writable before trying to delete them. Bug: 408846 Change-Id: I930a547594bba853c33634ae54bd64d236afade3 Signed-off-by: Alexander Nittka <alex@nittka.de>
* | | | Merge branch 'stable-5.7'Thomas Wolf2020-04-037-15/+124
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: FS.runInShell(): handle quoted filters and hooksPath containing blanks Handle non-normalized index also for executable files Prepare 5.7.1-SNAPSHOT builds JGit v5.7.0.202003110725-r Change-Id: I8a8580e44bfa05989d476cf22a029abd4fd407c6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | Merge branch 'stable-5.6' into stable-5.7Thomas Wolf2020-04-037-15/+124
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | * stable-5.6: FS.runInShell(): handle quoted filters and hooksPath containing blanks Handle non-normalized index also for executable files Change-Id: I240377e87c073ee7a621a88e39fc319c59fa037a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | FS.runInShell(): handle quoted filters and hooksPath containing blanksThomas Wolf2020-04-034-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 2323d7a. Using $0 in the shell command call results in the command string being taken literally. That was introduced to fix a problem with backslashes, but is actually not correct. First, the problem with backslashes occurred only on Win32/Cygwin, and has been properly fixed in commit 6f268f8. Second, this is used only for hooks (which don't have backslashes in their names) and filter commands from the git config, where the user is responsible for properly quoting or escaping such that the commands work. Third, using $0 actually breaks correctly quoted filter commands like in the bug report. The shell really takes the command literally, and then doesn't find the command because of quotes. So revert this change. At the same time there's a related problem with hooks. If the path to the hook contains blanks, runInShell() would also fail to find the hook. In this case, the command doesn't come from user input but is just a Java File object with an absolute path containing blanks. (Can occur if core.hooksPath points to such a path with blanks, or if the repository has such a path.) The path to the hook as obtained from the file system must be quoted. Add a test for a hook path with a blank. This reverts commit 2323d7a1ef909f9deb3f21329cf30bd1173ee9cf. Bug: 561666 Change-Id: I4d7df13e6c9b245fe1706e191e4316685a8a9d59 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | Handle non-normalized index also for executable filesThomas Wolf2020-03-253-11/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 60cf85a4 corrected the handling of check-in for files where the index version is non-normalized, i.e., contains CR-LF line endings. However, it did so only for regular files, not executable files. Bug: 561438 Change-Id: I372cc990c5efeb00315460f36459c0652d5d1e77 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | Prepare 5.7.1-SNAPSHOT buildsMatthias Sohn2020-03-1174-455/+455
| | | | | | | | | | | | | | | | | | | | Change-Id: I29cd1b9872603810f9c4d42424ac326fedf5569f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | JGit v5.7.0.202003110725-rv5.7.0.202003110725-rMatthias Sohn2020-03-1174-455/+455
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4a9122eeb4eea0f379f6611984cfe1143a32f8d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Document gc and pack relevant optionsMatthias Sohn2020-04-031-0/+57
| | | | | | | | | | | | | | | | | | | | Change-Id: Iab7262b25942fa8c062b979d394674635b70a284 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Define constants for pack config option keysMatthias Sohn2020-04-032-41/+197
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb8227cb62370029d6774f2a22b15d6478c713ca Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | Fix javadoc typoKarsten Thoms2020-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 499934 Change-Id: I0d6ee56fad4472972f69cc1e7cb2a727e95ab6b4 Signed-off-by: Karsten Thoms <karsten.thoms@karakun.com>
* | | | Upgrade ecj to 3.21.0David Pursehouse2020-03-281-1/+1
| |_|/ |/| | | | | | | | | | | Change-Id: Id337a320a59a77c36866f668ea1e30780bb55f35 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Merge "Scan through all merged reftables for max/min update indices"Terry Parker2020-03-232-4/+137
|\ \ \
| * | | Scan through all merged reftables for max/min update indicesMinh Thai2020-03-202-4/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since reftables might have update index ranges that are overlapped. Change-Id: I8f8215b99a0a978d4dd0155dbaf33e5e06ea8202 Signed-off-by: Minh Thai <mthai@google.com>
* | | | Update to org.apache.sshd 2.4.0Thomas Wolf2020-03-2231-198/+263
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change target platforms to Orbit I20200319180910 and regenerate them. Change package imports to [2.4.0,2.5.0); adapt code to upstream API changes. Maven build: update version in root pom. Bazel build: update version & hash in WORKSPACE file. Proxy functionality verified manually using 3proxy (HTTP & SOCKS, with basic authentication) and ssh -vvv -D7020 localhost (SOCKS, no authentication). Bug: 561078 Change-Id: I582f6b98055b013c006f2c749890fe6db801cbaa Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | ResolveMerger: Ignore merge conflicts if asked soIvan Frade2020-03-192-16/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recursive merge strategy builds a virtual ancestor merging recursively the common bases (when more than one) between the want-to-merge commits. While building this virtual ancestor, content conflicts are ignored, but current code doesn't do so when a file is removed. This was spotted in [1], for example. Merging two commits to build the virtual ancestor bumped into a conflict (modified in one side, deleted in the other) that stopped the process. Follow the "spec" and in case of conflict leave the unmerged content in the index and working trees. [1] https://android-review.googlesource.com/c/kernel/common/+/1228962 Change-Id: Ife9c32ae3ac3a87d3660fa1242e07854b65169d5 Signed-off-by: Ivan Frade <ifrade@google.com>
* | | Upgrade spotbugs-maven-plugin to 4.0.0David Pursehouse2020-03-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I28369d116eff053e27d6853a3df914e58120fde5 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Upgrade maven-javadoc-plugin to 3.2.0David Pursehouse2020-03-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I355ca6ad9e050bf46d49a6f91365d86213d84b94 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Upgrade maven-dependency-plugin to 3.1.2David Pursehouse2020-03-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I48b4b8366404b01e394bb2dac08e19f0eebbd759 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Merge "tag option for clone command"Christian Halstrick2020-03-152-1/+81
|\ \ \
| * | | tag option for clone commandAlexander Nittka2020-03-152-1/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow explicitly setting the tag option for the remote configuration when cloning a repository. Bug: 561021 Change-Id: Iac43268a2bb231ae7599c3255bf555883d34fa32 Signed-off-by: Alexander Nittka <alex@nittka.de>
* | | | Set baseline for japicmp to 5.7.0.202003110725-rThomas Wolf2020-03-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ifef50c9e58c6973676fd24888344e4e1621d0427 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | RevWalk: fix bad topo flags error messageAlex Spradlin2020-03-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message for an Exception thrown by StartGenerator when given both the TOPO flag and the TOPO_KEEP_BRANCH_TOGETHER flag mentions a non-existent flag, TOPO_NON_INTERMIX. The error message was introduced in commit e498d43. Replace TOPO_NON_INTERMIX with TOPO_KEEP_BRANCH_TOGETHER in the error message of an Exception thrown by the StartGenerator when the TOPO flag is provided together with the TOPO_KEEP_BRANCH_TOGETHER flag. Signed-off-by: Alex Spradlin <alexaspradlin@google.com> Change-Id: Id24640dc08e96a196508fe38ce144aa7e035082f
* | | | Merge "RevWalk: new topo sort to not mix lines of history"Jonathan Nieder2020-03-119-2/+375
|\ \ \ \
| * | | | RevWalk: new topo sort to not mix lines of historyAlex Spradlin2020-03-119-2/+375
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The topological sort algorithm in TopoSortGenerator for RevWalk may mix multiple lines of history, producing results that differ from C git's git-log whose man page states: "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed." Lines of history are mixed because TopoSortGenerator merely delays producing a commit until all of its children have been produced; it does not immediately produce a commit after its last child has been produced. Therefore, add a new RevSort option called TOPO_KEEP_BRANCH_TOGETHER with a new topo sort algorithm in TopoNonIntermixGenerator. In the Generator, when the last child of a commit has been produced, unpop that commit so that it will be returned upon the subsequent call to next(). To avoid producing duplicates, mark commits that have not yet been produced as TOPO_QUEUED so that when a commit is popped, it is produced if and only if TOPO_QUEUED is set. To support nesting with other generators that may produce the same commit multiple times like DepthGenerator (for example, StartGenerator does this), do not increment parent inDegree for the same child commit more than once. Commit b5e764abd21bd4593287361a625ecc49bc0efd77 modified the existing TopoSortGenerator to avoid mixing lines of history, but it was reverted in e40c38ab08837473375c571c2f07ab680fc1985d because the new behavior caused problems for EGit users. This motivated adding a new Generator for the new behavior. Signed-off-by: Alex Spradlin <alexaspradlin@google.com> Change-Id: Icbb24eac98c00e45c175b01e1c8122554f617933
* | | | Upgrade maven-site-plugin to 3.9.0David Pursehouse2020-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I966a05b499d3853c39bc3da8c7e5a1abc11d398e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | Upgrade build-helper-maven-plugin to 3.1.0David Pursehouse2020-03-111-1/+1
|/ / / | | | | | | | | | | | | Change-Id: Iec821c7312ce185d29e64ee6f9852437e2bd99c4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | TransportHttp: support HTTP response 308 Permanent RedirectThomas Wolf2020-03-103-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 7538[1] added HTTP response code 308, signifying a permanent redirect that, contrary to the older 301, does not allow changing the request method from POST to GET. [1] https://tools.ietf.org/html/rfc7538 Bug: 560936 Change-Id: Ib65f3a3ed75db51d74d1fe81d4abe6fe92b0ca12 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Remove unused API problem filtersThomas Wolf2020-03-101-108/+0
| | | | | | | | | | | | Change-Id: I137cddaf0aecdf9f4bd1427fa9c1af1af4f5b546
* | | Merge branch 'stable-5.7'Matthias Sohn2020-03-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: Prepare 5.7.1-SNAPSHOT builds JGit v5.7.0.202003090808-r Prepare 5.7.0-SNAPSHOT builds JGit v5.7.0.202002241735-m3 Change-Id: Ibaf382bb2337ca8099f891d4364cebe0b85b095d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Prepare 5.7.1-SNAPSHOT buildsMatthias Sohn2020-03-0974-455/+455
| | | | | | | | | | | | | | | Change-Id: I23748c20b69a1cfb47c5cd0d7858182d376b3ce1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | JGit v5.7.0.202003090808-rv5.7.0.202003090808-rMatthias Sohn2020-03-0974-105/+105
| | | | | | | | | | | | | | | Change-Id: Ia23bffa3952687f6107d496a8932d54b11c12412 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Merge branch 'master' into stable-5.7Matthias Sohn2020-03-0774-333/+487
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Silence API errors introduced by 093fbbd1 Bump Bazel version to 2.2.0 Add validation to hex decoder Expose FileStoreAttributes.setBackground() Update reftable storage repo layout Add 4.14 and 4.15-staging target platforms Update Orbit to R20200224183213 for final 2020-03 Update Orbit to S20200224183213 for 2020-03 RC1 Cygwin expects forward slashes for commands to be run via sh.exe [releng] Update year in copyright notices for features Using for-each loop in jdt Make Logger instances final Move array designators from the variable to the type ObjectWalk: Add null check before skip tree. Revert "RevWalk: stop mixing lines of history in topo sort" Do not fail if known hosts file does not contain valid host key Change-Id: Ie7841d917b02c3579c4766e7214d6b1656c5f200
| * | | Prepare 5.7.0-SNAPSHOT buildsMatthias Sohn2020-02-2574-105/+105
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic4c83c0ed6cdef69890cc9c27b3aa35c3ff66240 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | JGit v5.7.0.202002241735-m3v5.7.0.202002241735-m3Matthias Sohn2020-02-2474-105/+105
| | | | | | | | | | | | | | | | | | | | Change-Id: I9f71835ed9a0a1176f7ac99edf45d9ce97080720 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Merge branch 'master' into stable-5.7Matthias Sohn2020-02-24110-281/+701
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update Orbit to S20200219023850 for 2012-03 M3 Revert "Prepend hostname to subsection used to store file timestamp resolution" Remove use of org.bouncycastle.util.encoders.Hex Remove use of org.bouncycastle.util.io.TeeOutputStream Make the IMatcher public API SimilarityRenameDetector: Fix inconsistent indentation Use indexOf(char) and lastIndexOf(char) rather than String versions Reorder modifiers to follow Java Language Specification GitmoduleEntry: Remove redundant import of class from same package Remove redundant "static" qualifier from enum declarations RevWalk: stop mixing lines of history in topo sort Upgrade plexus-compiler-{eclipse|javac|javac-errorprone} to 2.8.6 Upgrade maven-shade-plugin to 3.2.2 Removed unused imports Documentation/technical/reftable: improve repo layout Change-Id: I558eff2abda44342fbaf1662fda07e2bcc6d4ee3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 05:39:04 +0000