aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into stable-5.12Matthias Sohn2021-06-0139-150/+278
|\ | | | | | | | | | | | | | | | | | | | | | | | | * master: Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926 Skip detecting content renames for binary files RepoCommand: Retry commit on LockFailure Finish upgrading eclipse-jarsigner-plugin to 1.3.1 Upgrade maven-javadoc-plugin to 3.3.0 Update maven-project-info-reports-plugin to 3.1.2 Update spotbugs-maven-plugin to 4.2.3 Change-Id: I3b77b0ef21bdf69a3009fb64af0d23d79b518009
| * Update Orbit to S20210518003616 and ant to 1.10.10.v20210426-1926Matthias Sohn2021-06-0132-95/+95
| | | | | | | | | | Change-Id: I87df882d4434c4fb107b8bd662ce63749078f1bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge "Skip detecting content renames for binary files"Han-Wen NIenhuys2021-05-314-7/+111
| |\
| | * Skip detecting content renames for binary filesYoussef Elghareeb2021-05-314-7/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to change Idbc2c29bd that skipped detecting content renames for large files. With this change, we added a new option in RenameDetector called "skipContentRenamesForBinaryFiles", that when set, causes binary files with any slight modification to be identified as added/deleted. The default for this boolean is false, so preserving current behaviour. Change-Id: I4770b1f69c60b1037025ddd0940ba86df6047299
| * | Merge changes I34319d70,I43fad374,Ie531a253,Id0dfcfd0Matthias Sohn2021-05-282-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Finish upgrading eclipse-jarsigner-plugin to 1.3.1 Upgrade maven-javadoc-plugin to 3.3.0 Update maven-project-info-reports-plugin to 3.1.2 Update spotbugs-maven-plugin to 4.2.3
| | * | Finish upgrading eclipse-jarsigner-plugin to 1.3.1Marco Miller2021-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 46b0f8a04 started that upgrade while missing this additional change. Change-Id: I34319d7006be13534497499e97536a8278906b1f Signed-off-by: Marco Miller <marco.miller@ericsson.com>
| | * | Upgrade maven-javadoc-plugin to 3.3.0Marco Miller2021-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I43fad374b6af1700c078b29f5ff45e2fd0b4cd00 Signed-off-by: Marco Miller <marco.miller@ericsson.com>
| | * | Update maven-project-info-reports-plugin to 3.1.2Marco Miller2021-05-262-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie531a253a37459ee55ddb7f5ed7bad414fe6b67e Signed-off-by: Marco Miller <marco.miller@ericsson.com>
| | * | Update spotbugs-maven-plugin to 4.2.3Marco Miller2021-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id0dfcfd060e19fb84fd5ec0cb7bafc9d13153660 Signed-off-by: Marco Miller <marco.miller@ericsson.com>
| * | | RepoCommand: Retry commit on LockFailureIvan Frade2021-05-261-43/+67
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the target repository is receiving commits from other sources, the repo command commit can fail with a LOCK_FAILURE. We could let callers retry, but then the command needs to redo all the work (opening all subrepos to recreate the tree). Retry the commit in LOCK_FAILURE inside the command. The commit rewrites the whole tree, so it shouldn't have merge errors. Use an exponential delay with jitter for the retries. Change-Id: I517b6f2afd16a4b695e6cf471b5d6cf492024ec4 Signed-off-by: Ivan Frade <ifrade@google.com>
* | | Prepare 5.12.0-SNAPSHOT buildsMatthias Sohn2021-06-0188-121/+121
| | | | | | | | | | | | | | | Change-Id: If563be77aab768ac1f31ae2211fb0892d0205a2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | JGit v5.12.0.202105261145-m3v5.12.0.202105261145-m3Matthias Sohn2021-05-2688-121/+121
| | | | | | | | | | | | | | | Change-Id: I3b1af2032227900e6e0c6189f47bace1df67f0ab Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge branch 'master' into stable-5.12Matthias Sohn2021-05-2661-128/+2460
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: RepoCommand: Do not set 'branch' if the revision is a tag pgm: rewrite parents when --parents flag is passed ApplyCommand: fix "no newline at end" detection ApplyCommand: handle completely empty context lines in text patches ApplyCommand: use byte arrays for text patches, not strings ApplyCommand: support binary patches ApplyCommand: add a stream to apply a delta patch ApplyCommand: add streams to read/write binary patch hunks ApplyCommand: add a base-85 codec ApplyCommand: convert to git internal format before applying patch SSH config: fix whitespace handling SSH config: fix negated patterns Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMS Prepare 5.11.2-SNAPSHOT builds JGit v5.11.1.202105131744-r Add a cgit interoperability test for LockFile Add TemporaryBuffer.toString(int limit) LockFile: create OutputStream only when needed Add git config for conflict style merge/diff3 Change-Id: If7751ff99079eaea31ed1fce811d141ecf209727 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | RepoCommand: Do not set 'branch' if the revision is a tagIvan Frade2021-05-262-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "branch" field in the .gitmodules is the signal for gerrit to keep the superproject autoupdated. Tags are immutable and there is no need to track them, plus the cgit client requires the field to be a "remote branch name" but not a tag. Do not set the "branch" field if the revision is a tag. Keep those tags in another field ("ref") as they help other tools to find the commit in the destination repository. We can still have false negatives when a refname is not fully qualified, but this check covers e.g. the most common case in android. Note that the javadoc of #setRecordRemoteBranch already mentions that "submodules that request a tag will not have branch name recorded". Change-Id: Ib1c321a4d3b7f8d51ca2ea204f72dc0cfed50c37 Signed-off-by: Ivan Frade <ifrade@google.com>
| * | Merge "Add git config for conflict style merge/diff3"Matthias Sohn2021-05-262-0/+22
| |\ \
| | * | Add git config for conflict style merge/diff3Thomas Wolf2021-05-032-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a constant in ConfigConstants, and a ConflictStyle enum in MergeCommand. Change-Id: Idf8e036b6b6953bec06d6923a39e5ff30c2da562 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | Merge changes from topic "apply"Matthias Sohn2021-05-2647-55/+2084
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: ApplyCommand: fix "no newline at end" detection ApplyCommand: handle completely empty context lines in text patches ApplyCommand: use byte arrays for text patches, not strings ApplyCommand: support binary patches ApplyCommand: add a stream to apply a delta patch ApplyCommand: add streams to read/write binary patch hunks ApplyCommand: add a base-85 codec ApplyCommand: convert to git internal format before applying patch
| | * | ApplyCommand: fix "no newline at end" detectionThomas Wolf2021-05-265-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the last line of the last hunk of a file, not the last line of the whole patch. Note that C git only checks that this line starts with "\ " and is at least 12 characters long because of possible different texts when non- English messages are used. Change-Id: I0db81699eb3e99ed7b536a3e2b8dc97df1f58a89 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | ApplyCommand: handle completely empty context lines in text patchesThomas Wolf2021-05-265-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C git treats completely empty lines as empty context lines (which traditionally have a single blank). Apparently newer GNU diff may produce such lines; see [1]. ("Newer" meaning "since 2006"...) [1] https://github.com/git/git/commit/b507b465f7831 Change-Id: I80c1f030edb17a46289b1dabf11a2648d2660d38 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | ApplyCommand: use byte arrays for text patches, not stringsThomas Wolf2021-05-267-40/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of converting the patch bytes to strings apply the patch on byte level, like C git does. Converting the input lines and the hunk lines from bytes to strings and then applying the patch based on strings may give surprising results if a patch converts a text file from one encoding to another. Moreover, in the end we don't know which encoding to use to write the result. Previous code just wrote the result as UTF-8, which forcibly changed the encoding if the original input had some other encoding (even if the patch had the same non-UTF-8 encoding). It was also wrong if the input was UTF-8, and the patch should have changed the encoding to something else. So use ByteBuffers instead of Strings. This has the additional advantage that all these ByteBuffers can share the underlying byte arrays of the input and of the patch, so it also reduces memory consumption. Change-Id: I450975f2ba0e7d0bec8973e3113cc2e7aea187ee Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | ApplyCommand: support binary patchesThomas Wolf2021-05-2613-30/+467
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement applying binary patches. Handles both literal and delta patches. Note that C git also runs binary files through the clean and smudge filters. Implement the same safeguards against corrupted patches as in C git: require the full OIDs to be present in the patch file, and apply a binary patch only if both pre- and post-image hashes match. Add tests for applying literal and delta patches. Bug: 371725 Change-Id: I71dc214fe4145d7cc8e4769384fb78c7d0d6c220 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | ApplyCommand: add a stream to apply a delta patchThomas Wolf2021-05-266-0/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new BinaryDeltaInputStream that applies a delta provided by another InputStream to a given base. Because delta application needs random access to the base, the base itself cannot be yet another InputStream. But at least this enables streaming of the result. Add a simple test using delta hunks generated by C git. Bug: 371725 Change-Id: Ibd26fa2f49860737ad5c5387f7f4870d3e85e628 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | ApplyCommand: add streams to read/write binary patch hunksThomas Wolf2021-05-265-0/+383
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add streams that can encode or decode git binary patch data on the fly. Git writes binary patches base-85 encoded, at most 52 un-encoded bytes, with the unencoded data length prefixed in a one-character encoding, and suffixed with a newline character. Add a test for both the new input and the output stream. The test roundtrips binary data of different lengths in different ways. Bug: 371725 Change-Id: Ic3faebaa4637520f5448b3d1acd78d5aaab3907a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | * | ApplyCommand: add a base-85 codecThomas Wolf2021-05-264-0/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an implementation for base-85 encoding and decoding [1]. Git binary patches use this format. Base-85 encoding assembles bytes as 32-bit MSB values, then converts these values to base-85 numbers (always 5 bytes) encoded as printable ASCII characters. Decoding base-85 is the reverse operation. Note that decoding may overflow on invalid input as 85^5 > 2^32. Encodings always have a length that is a multiple of 5. If input length is not divisible by 4, padding bytes are (logically) added, which are ignored when decoding. The encoding for n bytes has thus always exactly length (n + 3) / 4 * 5 in integer arithmetic (truncating division). Includes tests. [1] https://datatracker.ietf.org/doc/html/rfc1924 Bug: 371725 Change-Id: Ib5b9a503cd62cf70e080a4fb38c8cd1eeeaebcfe Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | ApplyCommand: convert to git internal format before applying patchThomas Wolf2021-05-1816-25/+513
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying a patch on Windows failed if the patch had the (normal) single-LF line endings, but the file on disk had the usual Windows CR-LF line endings. Git (and JGit) compute diffs on the git-internal blob, i.e., after CR-LF transformation and clean filtering. Applying patches to files directly is thus incorrect and may fail if CR-LF settings don't match, or if clean/smudge filtering is involved. Change ApplyCommand to run the file content through the check-in filters before applying the patch, and run the result through the check-out filters. This makes patch application succeed even if the patch has single-LFs, but the file has CR-LF and core.autocrlf is true. Add tests for various combinations of line endings in the file and in the patch, and a test to verify the clean/smudge handling. See also [1]. Running the file though clean/smudge may give strange results with LFS-managed files. JGit's DiffFormatter has some extra code and applies the smudge filter again after having run the file through the check-in filters (CR-LF and clean). So JGit can actually produce a diff on LFS-managed files using the normal diff machinery. (If it doesn't run out of memory, that is. After all, LFS is intended for _large_ files.) How such a diff would be applied with either C git or JGit is entirely unclear; neither has any code for this special case. Compare also [2]. Note that C git just doesn't know about LFS and always diffs after the check-in filter chain, so for LFS files, it'll produce a diff of the LFS pointers. [1] https://github.com/git/git/commit/c24f3abac [2] https://github.com/git-lfs/git-lfs/issues/440 Bug: 571585 Change-Id: I8f71ff26313b5773ff1da612b0938ad2f18751f5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | pgm: rewrite parents when --parents flag is passedkylezhao2021-05-262-0/+78
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | According to [1], we should rewrite parents in RevWalkTextBuiltin when variable parents is true. [1] https://git-scm.com/docs/git-rev-list#Documentation/git-rev-list.txt---parents Change-Id: If5dca3b280366969d0488fa895bc37253a797394 Signed-off-by: kylezhao <kylezhao@tencent.com>
| * | SSH config: fix whitespace handlingThomas Wolf2021-05-172-5/+25
| | | | | | | | | | | | | | | | | | | | | Use Character.isWhitespace() instead of Character.isSpaceChar() to treat TABs as whitespace, too. Change-Id: Iffc59c13357d981ede6a1e0feb6ea6ff03fb3064 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | SSH config: fix negated patternsThomas Wolf2021-05-172-59/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negated patterns were handled wrongly. According to the OpenBSD ssh_config man page,[1] a negated pattern never matches. Negated patterns make only sense if there are positive patterns; the negated pattern then can define exceptions for the positive patterns. OpenSshConfigFile did this wrongly. It handled "!foo" as "matching everything but foo", but actually the semantics is "if the input is "foo", this entry doesn't apply. If the input is anything else, other patterns determine whether the entry may apply.". [1] https://man.openbsd.org/ssh_config Change-Id: I50f6e46581b7ece4c949eddf62f4a265573ec29e Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | Fix @since tag for introduction of PUBKEY_ACCEPTED_ALGORITHMSMatthias Sohn2021-05-142-1/+12
| | | | | | | | | | | | | | | | | | This constant was shipped with 5.11.1. Change-Id: I480dbefab1cccca78cefbc709b79e5405f8bf8cd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Merge branch 'stable-5.11'Matthias Sohn2021-05-140-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Prepare 5.11.2-SNAPSHOT builds JGit v5.11.1.202105131744-r Change-Id: I940216261e25d7bb24e912a8971655198762703a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | Prepare 5.11.2-SNAPSHOT buildsMatthias Sohn2021-05-1488-503/+503
| | | | | | | | | | | | | | | | | | | | Change-Id: Idfd81bd3bbcd99034f69fffb1a562bf07b0f8209 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | JGit v5.11.1.202105131744-rv5.11.1.202105131744-rMatthias Sohn2021-05-1388-121/+121
| | | | | | | | | | | | | | | | | | | | Change-Id: Id74eecbde63edbc58b6262ae01ef34d8bebc0f88 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | Merge branch 'stable-5.12'Matthias Sohn2021-05-121-14/+13
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: I1c936183e1fa17ea95ada7849a75bc76af275fa3
* | | | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-05-121-14/+13
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: I6184772bdeca1b9ccecf6e400ae15604ab4f5a69
| * | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-05-121-14/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: I0f1511be5375716d41565e72b271cb956c3e847b
| | * \ \ Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-05-121-14/+13
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: Ifa135077d8d07d2317df3b479822e30d87eca950
| | | * \ \ Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-05-121-14/+13
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.8: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: I9ca7a0237f87d1d4bcaba81e709eaa67902f27e5
| | | | * \ \ Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-05-113-22/+13
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: I7ed3f47cb46e6c1bf483702c8925a24e88658e47
| | | | | * \ \ Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-113-22/+13
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.6: Remove texts which were added by mistake in 00386272 Fix formatting which was broken in 00386272 Change-Id: I45d444b360485564744bf3dfad2c2f5a5e7fcdf6
| | | | | | * | | Remove texts which were added by mistake in 00386272Matthias Sohn2021-05-112-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaed25dac0bc9af8f3fda6138a5f9fe553bff5d39 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | Fix formatting which was broken in 00386272Matthias Sohn2021-05-111-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I10a3e2b117e790f64386a8e9e7663db8e59230d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * | Merge branch 'stable-5.12'Matthias Sohn2021-05-112-49/+12
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: LockFile: create OutputStream only when needed Remove ReftableNumbersNotIncreasingException Change-Id: I9d85187d00771beef908f1136015d059024f4118
* | | | | | | | | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-05-115-71/+247
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: LockFile: create OutputStream only when needed Remove ReftableNumbersNotIncreasingException Change-Id: I7adb5c4fc28e0043a985b5136424f3f756b2f84f
| * | | | | | | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-05-115-71/+247
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: LockFile: create OutputStream only when needed Remove ReftableNumbersNotIncreasingException Change-Id: Id6e0a78caf12c19a01a88d1ddb8a7df2b3590f98
| | * | | | | | | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-05-116-73/+249
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: LockFile: create OutputStream only when needed Remove ReftableNumbersNotIncreasingException Fix stamping to produce stable file timestamps Change-Id: I056382d1d93f3e0a95838bdd1f0be89711c8a722
| | | * | | | | | Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-05-115-72/+248
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.8: LockFile: create OutputStream only when needed Remove ReftableNumbersNotIncreasingException Change-Id: I3274c97cf560398c3c4c27d6759500452f315db0
| | | | * | | | | Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-05-115-72/+256
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: LockFile: create OutputStream only when needed Remove ReftableNumbersNotIncreasingException Change-Id: Ib3f280e0741f87a0ff615d857a5ea39b35527e74
| | | | | * | | | Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-05-114-35/+256
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.6: LockFile: create OutputStream only when needed Change-Id: I7c0e37d2cee0923662a7e39df5a802a84c017e4f
| | | | | | * | | LockFile: create OutputStream only when neededThomas Wolf2021-05-104-146/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create the stream eagerly in lock(); that may cause JGit to exceed OS or JVM limits on open file descriptors if many locks need to be created, for instance when creating many refs. Instead create the output stream only when one really needs to write something. Bug: 573328 Change-Id: If9441ed40494d46f594a896d34a5c4f56f91ebf4 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| | | | | * | | | Remove ReftableNumbersNotIncreasingExceptionHan-Wen Nienhuys2021-03-011-37/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a distributed setting, one can have multiple datacenters use reftables for serving, while the ground truth for the Ref database is administered centrally. In this setting, replication delays combined with compaction can cause update-index ranges to overlap. Such a setting is used at Google, and the JGit code already handles this correctly (modulo a bugfix that applied in change I8f8215b99a). Remove the restriction that was applied at FileReftableDatabase. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I6f9ed0fbd7fbc5220083ab808b22a909215f13a9
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 18:57:48 +0000