summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Documentation/technical/reftable: change suggested file namesHan-Wen Nienhuys2019-10-301-11/+15
| | | | | | | | | | | | | | By using ${min_update}-${max_update} as file name template, we guarantee that each file has a unique name. This allows data from open files to be cached across reloads of the stack. This is in anticipation of Change I1837f268e ("file: implement FileReftableDatabase"), which is the first implementation of reftable on a filesystem. Change-Id: I7ef0610eb60c494165382d0c372afcf41f074393 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
* Update Orbit to S20191025144108 and Ant to 1.10.7.v20190926-0324Matthias Sohn2019-10-2920-46/+111
| | | | | | | | | | | | This is the Orbit version for 2019-12 M2. We tried earlier to update to Ant 1.10.7 but had to revert this since there were issues with the previous artefact version in Orbit. See platform bug 550793 for the list of changes since 1.10.6. Change-Id: Ifb3212d4420e3656083784e842da2bd9bf750911 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Update Tycho to 1.5.1Matthias Sohn2019-10-292-2/+2
| | | | | | | | This release fixes bug 552346 [1]. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=552346 Change-Id: I53be02c3702e62d3b5ceb85141b9798571a8ca0c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Upgrade Jetty to 9.4.22.v20191022Michael Keppler2019-10-2722-205/+205
| | | | | | Change-Id: Ie2ee0a978949f9cf70833645132eedf26c3cf1c8 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "[errorprone] Don't throw exception in finally"David Pursehouse2019-10-251-1/+1
|\
| * [errorprone] Don't throw exception in finallyMatthias Sohn2019-10-251-1/+1
| | | | | | | | | | | | | | Instead log the problem. There is no reason to panic when we fail to delete a single temporary file in java.io.tmpdir. Change-Id: Idb867b3f07b090c7453ccd3688e94097df3b2672 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "[errorprone] Add parenthesis to clarify operator precedence"David Pursehouse2019-10-251-4/+4
|\|
| * [errorprone] Add parenthesis to clarify operator precedenceMatthias Sohn2019-10-251-4/+4
| | | | | | | | | | | | This fixes OperatorPrecedence error raised by errorprone on FS#findHook. Change-Id: Ia15f61902c7deff7328c1afa066fc53152949bbf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Replace "Rebase interactive" with "Interactive rebase"Matthias Sohn2019-10-251-1/+1
|/ | | | | | | | The RepositoryState's description is shown in EGit's interactive rebase view. Use the grammatically correct form. Bug: 552359 Change-Id: I860ef730a67f2b34d7fabbfbda5ea65ead9270d2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* GPG: implement more OpenPGP UserId matching formatsThomas Wolf2019-10-235-11/+253
| | | | | | | | | | | | | | | | | | | | | Instead of just looking for a substring match of user.signingKey in a key's user ID implement the GPG matching formats[1] for: '=' Full exact match '<' Full exact match of the e-mail address '@' Substring match within the e-mail address only '*' General case-insensitive substring match (default) When user.signingKey is not set, the committer's e-mail address is used by default. In that case, use '<', i.e., require an exact match on the OpenPGP e-mail address. Also handle the optional "0x" prefix for (partial) key fingerprints. [1] https://www.gnupg.org/documentation/manuals/gnupg/Specify-a-User-ID.html Bug: 550335 Change-Id: I6ce482a099ff1a0dc9de45435cd4d3ec5b504f12 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* Merge "reftable: remove assert calls"Jonathan Tan2019-10-222-2/+7
|\
| * reftable: remove assert callsHan-Wen Nienhuys2019-10-222-2/+7
| | | | | | | | | | | | | | | | The effect of assert is defined by compiler flags, so this code introduced a potential vector for corruption. Change-Id: I12197432e4351a5bd4aa24d352a19937721845c3 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
* | Merge "TreeRevFilterTest: Simplify filter used"Jonathan Tan2019-10-221-17/+7
|\ \
| * | TreeRevFilterTest: Simplify filter usedJonathan Tan2019-10-221-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TreeRevFilterTest uses an unncessarily complicated TreeFilter - an AndTreeFilter - when it should be as simple as possible because this class tests TreeRevFilter, not AndTreeFilter. Replace the filter with a simpler one. Change-Id: I3256a65f6e0042d32fd76a9224b79a835674ff3a Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
* | | Merge "GpgKeyLocator: Return a signing key for a user instead of the master key"Gunnar Wagenknecht2019-10-221-6/+35
|\ \ \
| * | | GpgKeyLocator: Return a signing key for a user instead of the master keyRoan Hofland2019-10-221-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when a GPG key is looked up using a user identity the first key from the keyring that has this user identity is returned. The code was changed to instead return the first signing [S] key in this keyring and only return the master key if no such signing key was found. If the master key also does not have the signing flag set null is returned instead. Bug: 552288 Change-Id: I194862991d13c2c7ff34a60a54a227167f88f53b Signed-off-by: Roan Hofland <roan.hofland@hotmail.com>
* | | | Merge "GpgKeyLocator: Return subkeys instead of the first key for subkeys"Gunnar Wagenknecht2019-10-221-1/+7
|\| | |
| * | | GpgKeyLocator: Return subkeys instead of the first key for subkeysRoan Hofland2019-10-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when a subkey is configured for signing via the git user.signingkey configuration option the first key from the keyring for this subkey would be returned for use (master key). The code has been changed to return the requested key from the keyring instead. Bug: 552288 Change-Id: I1c1cdf64c1667316a274ff9d829fc2b563797f2a Signed-off-by: Roan Hofland <roan.hofland@hotmail.com>
* | | | Support for core.hooksPathThomas Wolf2019-10-218-52/+167
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Support the core.hooksPath git config. This can be an absolute or relative path of a directory where to find git hooks; a relative path is resolved relative to the directory the hook will run in. Bug: 500266 Change-Id: I671999a6386a837e897c31718583c91d8035f3ba Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | Upgrade Tycho to 1.5.0Michael Keppler2019-10-211-1/+1
| |/ |/| | | | | | | Change-Id: Iff3efa87997b635d84efca5b916436cc06ed9717 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
* | Close ObjectReaders in testsThomas Wolf2019-10-214-120/+145
| | | | | | | | Change-Id: Ic839af4f85861fb48091d45679e2a614f001d770 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | Close some Repository instances in testsThomas Wolf2019-10-216-167/+182
| | | | | | | | | | | | | | This doesn't yet ensure that _all_ repositories are closed. It only handles the obvious, local, and easy cases. Change-Id: I0f9f8607791f0f03ed1f5ad71e9595e78b78892f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | Close ObjectInserters in testsThomas Wolf2019-10-214-55/+67
| | | | | | | | Change-Id: I0048a9ae23aee79cfecafb15855c63cd92818c57 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | Upgrade jacoco-maven-plugin to 0.8.5David Pursehouse2019-10-211-1/+1
| | | | | | | | | | Change-Id: If1c3c661f9bcaf0ce806f6bd5e2a3919d6635d78 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | [pgm] Add --mirror option to clone commandMatthias Sohn2019-10-213-3/+50
| | | | | | | | | | Bug: 552173 Change-Id: Ic8a98b2e0f8f29afd599723f93e51b06b9f13314 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Remove meaningless comment in CloneCommandTestMatthias Sohn2019-10-211-1/+0
| | | | | | | | | | | | | | | | This comment was probably copied from testCloneRepositoryWithBranch() to testBareCloneRepositoryOnlyOneBranch() where it doesn't make sense. Hence remove it. Change-Id: I846debd084dd77fd473c3602a799f195a8390f77 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Implement mirror option in CloneCommandMatthias Sohn2019-10-212-27/+99
|/ | | | | Bug: 552173 Change-Id: If79adf578b303890314a3285d7a6d2c71f48d091 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* AppServer: Stop using deprecated SslContextFactory constructorDavid Pursehouse2019-10-171-1/+1
| | | | | | | | Use SslContextFactory.Client instead, as suggested in the deprecation javadoc. Change-Id: I746c953d3ad549c23d0e43eb4a18fc587e924f93 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Enable and fix "Statement unnecessarily nested within else clause" warningsDavid Pursehouse2019-10-17122-742/+663
| | | | | | | | | | | | | | | Since [1] the gerrit project includes jgit as a submodule, and has this warning enabled, resulting in 100s of warnings in the console. Also enable the warning here, and fix them. At the same time, add missing braces around adjacent and nearby one-line blocks. [1] https://gerrit-review.googlesource.com/c/gerrit/+/227897 Change-Id: I81df3fc7ed6eedf6874ce1a3bedfa727a1897e4c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Close RevWalks in testsThomas Wolf2019-10-167-380/+443
| | | | Change-Id: Id28804ace2572e8f659271660e78454a0d6ccc49 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* Merge "reftable: split off generic code from DFS code"Jonathan Tan2019-10-165-372/+721
|\
| * reftable: split off generic code from DFS codeHan-Wen Nienhuys2019-10-165-372/+721
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces ReftableBatchRefUpdate and ReftableDatabase, as generic classes, with some code moved to DfsReftableBatchRefUpdate and DfsReftableDatabase. Clarify thread-safety requirements by asserting locked status in accessors, and acquiring locks in callers. This does not fix threading problems, because ReftableBatchRefUpdate already wraps the whole transaction in a lock. This also fixes a number of bugs in ReftableBatchRefUpdate: * non-atomic updates should not bail on first failure * isNameConflicting should also check for conflicts between names that are added and removed in the BatchRefUpdate. Change-Id: I5ec91173ea9a0aa19da444c8c0b2e0f4e8f88798 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "reftable: fix lookup by ID in merged reftables"Jonathan Tan2019-10-162-1/+50
|\ \
| * | reftable: fix lookup by ID in merged reftablesHan-Wen Nienhuys2019-10-162-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On changing a ref, the old SHA1 is not updated in the object => ref mapping. This means search by object ID may still turn up a ref from deeper within the stack. To fix this, check all refs produced by the merged iterator against the merged reftables. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I41e9cd395b0608eedeeaead0a9fd997238d747c9
* | | Merge changes I6e022e4a,If1b9d808David Pursehouse2019-10-1520-916/+1041
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Close TreeWalks in tests Close SubmoduleWalks in tests
| * | | Close TreeWalks in testsThomas Wolf2019-10-1511-600/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that TreeWalk.forPath() needs not be closed; the ObjectReader _is_ closed when that method returns. Change-Id: I6e022e4a2fde0c88d610a82de092ea541b33f75c Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | Close SubmoduleWalks in testsThomas Wolf2019-10-159-316/+352
| | | | | | | | | | | | | | | | Change-Id: If1b9d80830b6b136d4ab33f5c7043b140bd92f85 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | Merge "IndexDiff: close SubmoduleWalk and use already loaded DirCache"Christian Halstrick2019-10-151-54/+58
|\| | |
| * | | IndexDiff: close SubmoduleWalk and use already loaded DirCacheThomas Wolf2019-10-151-54/+58
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the SubModuleWalk isn't closed its TreeWalk's ObjectReader won't be closed. Re-loading the DirCache during an IndexDiff is not only inefficient but could also give strange results if an external process had modified the index in the meantime: file diffs would be based on a "before" state, but submodule diffs on an "after" state. Change-Id: Iab948c08ac342138b37263c9028d80b84101f6d6 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | ProtocolV2Parser: Introduce advertise sideband-all optionIvan Frade2019-10-153-4/+19
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag enabling sideband-all is used in two places: in UploadPack for advertisement and in the protocol parser to read it from the request. This leds to problems in distributed deployments where the two requests of a fetch can go to different servers with different configurations. Use the existing allowsidebandall to accept the sideband-all request (and respond to it) and introduce a new "advertisesidebandall" to toggle the advertising of the feature. Change-Id: I892d541bc3f321606c89bad1d333b079dce6b5fa Signed-off-by: Ivan Frade <ifrade@google.com>
* | DfsPackFile: Remove unused parameter from loadReverseIdx methodDavid Pursehouse2019-10-141-2/+2
|/ | | | | Change-Id: I2373084c8b40ebd6f432806dddc8633a76938e80 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Silence API errors for new fields added to PackStatistics.AccumulatorMatthias Sohn2019-10-121-0/+17
| | | | | | These fields were added in a307c887. Change-Id: I9e80abdb6f48dc7bf72de683dcf3566d2dab611f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Remove unused API warning filtersMatthias Sohn2019-10-122-40/+0
| | | | Change-Id: I78262681e12079028752d8c144720ad0256c5707 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add missing @since tag to UploadPack#uploadWithExceptionPropagationMatthias Sohn2019-10-121-0/+1
| | | | | | This was missed in b8d9734c Change-Id: I4b9c1cf058eff16af725375047d743944e7f5db4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-5.5'David Pursehouse2019-10-121-1/+1
|\ | | | | | | | | | | | | | | * stable-5.5: Bazel: Bump bazel version to 1.0.0 Change-Id: I1dc833e8de7a0c54492ea847fb74971ecf438e51 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * Merge branch 'stable-5.4' into stable-5.5David Pursehouse2019-10-121-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-5.4: Bazel: Bump bazel version to 1.0.0 Change-Id: I967ad9e0fa6f13c5217aafb8faedc4a7dfb37c58 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * Merge branch 'stable-5.3' into stable-5.4Matthias Sohn2019-10-121-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.3: Bazel: Bump bazel version to 1.0.0 Change-Id: If07e2ff3281dc96bec206b68631d22be8fd4636a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-10-111-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Bazel: Bump bazel version to 1.0.0 Change-Id: Ife26567c08ec053741c9db4ca8b5b2836044dcde Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Merge branch 'stable-5.1' into stable-5.2Matthias Sohn2019-10-111-1/+1
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Bazel: Bump bazel version to 1.0.0 Change-Id: I067d8ebd15f35f139d86bc67473b42afac4f0f53
| | | | | * Bazel: Bump bazel version to 1.0.0David Pursehouse2019-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I607915af0556efe8b2fb640e9387029b755d1a7f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 04:03:14 +0000