~vcs-imports/jgit/master : changes

~vcs-imports/jgit/master » Changes from revision 3872

From Revision 3872 to 3853

Rev	Summary	Authors	Date
3872	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Respect "unshallow" lines in protocol v2 Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I14bd522d2f6bafb1b41e3c730d6dbef827e3e88a Signed-off-by: Jonathan Nieder <jrn@google.com>	Jonathan Nieder	5 years ago
3871	Avoid expensive getAllRefsByPeeledObjectId() in PlotWalk con... Avoid expensive getAllRefsByPeeledObjectId() in PlotWalk constructor Instead, do it when we return the first PlotCommit from next(). On a repository with many refs, getAllRefsByPeeledObjectId() can take a while. Doing a late initialization simplifies the handling of a PlotWalk. EGit, for instance, creates and configures an instance, and then does the real walk in a background job. With late initialization, the potentially expensive getAllRefsByPeeledObjectId() also occurs in that background job. Bug: 485743 Change-Id: I84c020cf8f7afda6f181778786612b8e6ddd7ed8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>	Thomas Wolf	5 years ago
3870	Update Maven plugins Update Maven plugins - build-helper-maven-plugin 3.0.0 - eclipse-jarsigner-plugin 1.1.5 - jacoco-maven-plugin 0.8.1 - maven-clean-plugin 3.1.0 - maven-jar-plugin 3.1.2 - maven-pmd-plugin 3.10.0 - maven-resources-plugin 3.1.0 - maven-shade-plugin 3.1.1 - maven-site-plugin 3.7.1 - maven-surefire-plugin 2.21.0 - maven-surefire-report-plugin 2.21.0 - plexus-compiler-javac 2.8.4 - spotbugs-maven-plugin 3.1.3.1 - tycho 1.2.0 (leftover) - wagon-ssh 3.1.0 Change-Id: I8eba2ee448437a775542ef6a7c59661727aa207c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	Matthias Sohn	5 years ago
3869	Upgrade Tycho to 1.2.0 Upgrade Tycho to 1.2.0 Change-Id: I2f1c81839d2d78ddfd10b3992d1145546d10fa8c Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	Michael Keppler	5 years ago
3868	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Prepare 5.0.1-SNAPSHOT builds JGit v5.0.0.201806131550-r JGit v5.0.0.201806131210-r Downgrade Apache httpclient to 4.5.2.v20170210-0925 RefUpdateTest: Refactor to not use deprecated Repository#getAllRefs Propagate failure of ssh command to caller of SshSupport Make JGit describe behaves same as c-git for lightweight tags Fix issues with LFS on GitHub (SSH) Change-Id: I0471440919adfdbfc72996711d9e0bbd1f3cf477 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	Matthias Sohn	5 years ago
3867	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Empty merge. The stable-4.9 branch was merged directly into stable-5.0 by [1], and then there were separate merges up through stable-4.10 to stable-4.11 by [2] and [3]. When stable-4.11 was merged in to stable-5.0 in [4] it was an empty merge, since the change had already been brought in by [1]. [1] https://git.eclipse.org/r/#/c/124301/-1..2 [2] https://git.eclipse.org/r/#/c/124320/-1..1 [3] https://git.eclipse.org/r/#/c/124321/-1..1 [4] https://git.eclipse.org/r/#/c/124332/-1..1 Change-Id: I91304b1bdad41837814d221971750b2b64bdcf6a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	David Pursehouse	5 years ago
3866	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Fix Javadoc typo Change-Id: Ib864f5871f8e99d2a776b7ae9f782ec3eb312d50 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	David Pursehouse	5 years ago
3865	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Ensure Jsch checks all configured algorithms RawTextTest#testBinary: use array comparison to compare arrays LFS: Better SSH authentication token timeout handling Ensure DirectoryStream is closed promptly Validate branch names on branch creation Change-Id: Ic4f6a24b6ccee6730eee3fd5dcb0d1f3e291c478 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	Matthias Sohn	5 years ago
3864	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Use constant for ".lock" Simplify locking of FileRepository's index snapshot Refactor FileRepository.detectIndexChange() Change-Id: Ifd427711359bcf38b2c877b2143d45bff0c9895a Signed-off-by: Jonathan Nieder <jrn@google.com>	Jonathan Nieder	5 years ago
3863	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Update to latest Photon Orbit R20180606145124 Ensure index change event is fired when index snapshot changed Change-Id: I8724fc92999d2bc0f8bde5e401156738dd9f1ee6 Signed-off-by: Jonathan Nieder <jrn@google.com>	Jonathan Nieder	5 years ago
3862	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Update maven plugins to fix Zip Slip vulnerability Prepare 5.0.0-SNAPSHOT builds JGit v5.0.0.201806050710-rc3 Change-Id: Icb1f34d3f49938fefa25d86857aa5048e54dcc7a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	David Pursehouse	5 years ago
3861	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Teach UploadPack "filter" in protocol v2 fetch Refactor test of capabilities output Refactor v2 advertisement into own function Refactor parsing of "filter" into its own method Disallow unknown args to "fetch" in protocol v2 Teach UploadPack shallow fetch in protocol v2 Refactor unshallowCommits to local variable Add protocol v2 support in http Give info/refs services more control over response Change-Id: I1683902222e076e1091795e94790a264550afb7b Signed-off-by: Jonathan Nieder <jrn@google.com>	Jonathan Nieder	5 years ago
3860	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Chain RemoteAddCommand methods Change-Id: I20d3cef5b5579c72ffd6809b7f6a8d787d631aaa Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	David Pursehouse	5 years ago
3859	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Update target platforms to Orbit R20180531190352-Photon Prepare 5.0.0-SNAPSHOT builds JGit v5.0.0.201805301535-rc2 Change-Id: Ie149c2fee6c552b7a595f029c267292840734192 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	David Pursehouse	5 years ago
3858	Allow overriding DfsPackDescription comparator for scanning ... Allow overriding DfsPackDescription comparator for scanning packs Provide a factory for comparators that use the default heuristics except with a different ordering of PackSources. Change-Id: I0809b64deb3d0486040076946fdbdad650d69240	Dave Borowitz	5 years ago
3857	Move DfsPackDescription comparators to common location Move DfsPackDescription comparators to common location There are several ways of comparing DfsPackDescriptions for different purposes, such as object lookup search order and reftable ordering. Some of these are later compounded into comparators on other objects, so they appear in the code as Comparator<DfsReftable>, for example. Put all the DfsPackDescription comparators in static methods on DfsPackDescription itself. Stop implementing Comparable, to avoid giving the impression that there is always one true and correct way of sorting packs. Change-Id: Ia5ca65249c13373f7ef5b8a5d1ad50a26577706c	Dave Borowitz	5 years ago
3856	Use Comparators for PackSource Use Comparators for PackSource Rather than requiring callers to do their own computations based on the package-private "category" number, provide an actual Comparator<PackSource> instance, and explicitly discourage usage of default Enum comparison. Construct the default comparator using a builder pattern based on defining equivalence classes. This gives us the same behavior as the old category field in PackSource, with an abstraction that does not leak the implementation detail of comparing rank numbers. Change-Id: I6757211397ab1bc181d61298e073f88b69dbefc3	Dave Borowitz	5 years ago
3855	DfsPackDescription: Disallow null PackSource DfsPackDescription: Disallow null PackSource In normal operation, the source of a pack should never be null; the DFS implementation should always know where a pack came from. Existing implementations in InMemoryRepository and at Google always have the source available at construction time. The problem with null PackSources in the previous implementation was it made the DfsPackDescription#compareTo method intransitive. Specifically, it skips comparing the sources at all if either operand is null. Suppose we have three descriptions A, B, and C, where all fields are equal except the PackSource, and: * A's source is INSERT * B's source is null * C's source is RECEIVE In this case, A.compareTo(B) == 0, and B.compareTo(C) == 0, since all fields are equal except the source, which is skipped. But A.compareTo(C) != 0, since A and B have different sources. Avoid this problem in compareTo by enforcing that the source is never null. We could of course assign an arbitrary category number to a null source in order to make comparison transitive[1], but it's simpler to implement and reason about if the field is non-nullable, and there is no real-world use case to make it null. Although a non-null source is required at construction time, the field is currently still mutable: DfsPackDecscription#setPackSource is used by DfsInserterTest to mark packs as garbage. This could probably be avoided as well, allowing us to convert packSource to a final field, but doing so is beyond the scope of this change. [1] The astute reader will notice this is already done by DfsObjDatabase#reftableComparator(). In fact, the reason that different comparator implementations non-obviously have different semantics for this nullable field is another reason why it's clearer to avoid null entirely. Change-Id: I85a2aaf3fd6d4868f241f7972a0349f087830ffa	Dave Borowitz	5 years ago
3854	Test commit with huge commit message Test commit with huge commit message Tests that even a commit with a huge message can be committed and read if the WindowCache's streamFileThreshold is configured large enough. Bug: 535092 Change-Id: Id8090c608625010caf11dff7971b47882b5fd20f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>	Thomas Wolf	5 years ago
3853	Merge branch 'stable-5.0' Merge branch 'stable-5.0' * stable-5.0: Fix description property in feature.properties of pgm source feature Update SUA Change-Id: I891a7b8b922ecae49872eb642d6917e8c85c2f51 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	Matthias Sohn	5 years ago

Older »