aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | ConfigTest: Move pathToString to FileUtilsDavid Pursehouse2017-12-063-10/+17
| | | | | | | | | | | | | | | | | | | | | | ConfigTest#pathToString is not visible to FileBasedConfigTest when bulding with bazel. Move it to FileUtils rather than messing about with the bazel build rules to make it visible. Change-Id: Idcfd4822699dac9dc4a426088a929a9cd31bf53f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | FileBasedConfig: support for relative includesMarc Strapetz2017-12-043-3/+114
| | | | | | | | | | | | | | | | | | Relative include.path are now resolved against the config's parent directory. include.path starting with ~/ are resolved against the user's home directory Change-Id: I91911ef404126618b1ddd3589294824a0ad919e6 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* | Config: extract method to read included configMarc Strapetz2017-12-041-17/+40
| | | | | | | | | | Change-Id: I2c55af3e5fe29e0ce8e3d05e4b54ec961d3f863a Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* | ConfigTest: fix on WindowsMarc Strapetz2017-12-041-4/+12
| | | | | | | | | | Change-Id: I37a2ef611aef97faf1b891a9660c1745435a915d Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-4.9'David Pursehouse2017-12-040-0/+0
|\| | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.2-SNAPSHOT builds JGit v4.9.1.201712030800-r Silence API warnings for reintroduced ResolveMerger#processEntry Change-Id: I8a703815a9b3d8b7e06e308cc46a8c458731c013
| * Prepare 4.9.2-SNAPSHOT buildsMatthias Sohn2017-12-0356-333/+333
| | | | | | | | Change-Id: I5879ad4aee94ff6783b5589728912117f2495dd3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.9.1.201712030800-rv4.9.1.201712030800-rMatthias Sohn2017-12-0356-59/+59
| | | | | | | | | | Change-Id: I8bf477778c9dac41cb65233a9e7d590531a836b7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Silence API warnings for reintroduced ResolveMerger#processEntryMatthias Sohn2017-12-031-0/+17
| | | | | | | | | | | | | | | | | | | | This was silenced before but suppression was unintentionally lost in merge commit 6858339c1e2878d5c5dc6cc9b422f9802be950ae. This method was removed in 4.9.0 and reintroduced in 4.9.1 to avoid breaking EMF compare versions which were built against older versions. See: abf420302bb03b119c19ddf29ef0c968f77c318d Change-Id: I152d58ac885e044bcab682b9423f6cc83b667989 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Make local assert methods private in test classesDavid Pursehouse2017-12-013-6/+6
| | | | | | | | | | Change-Id: I1bed28a1eac3c7f84cc40841853b9540c72be265 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Upgrade error_prone_core to 2.1.3David Pursehouse2017-12-011-1/+1
| | | | | | | | | | Change-Id: I45619f8089a3cd1390e57158c4bf808c84330a50 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge branch 'stable-4.9'Matthias Sohn2017-11-302-0/+130
|\| | | | | | | | | | | | | | | | | * stable-4.9: GC: Delete stale temporary packs and indexes Change-Id: I49b37845ee8a465404b801a2d8de0205a2e7ba30 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * GC: Delete stale temporary packs and indexesHector Caballero2017-11-242-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a GC operation is interrupted, temporary packs and indexes can be left on the pack folder. In big, busy repositories this can lead to significant amounts of wasted disk space if this interruption is done with a certain frequency. Remove stale temporary packs and indexes at the end of the GC process so they do not accumulate. To avoid interfering with a possible concurrent JGit GC process in the same repository, only delete temporary files that are older than one day. Change-Id: If9b6c1e57fac8a6a0ecc0a703089634caba4caae Signed-off-by: Hector Caballero <hector.caballero@ericsson.com>
* | Update Jetty to 9.4.8.v20171121Matthias Sohn2017-11-2912-110/+110
| | | | | | | | Change-Id: I4ea421758e3469a59fa4fbbf46ce86757dd267e9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Break down DfsBlockCache stats by pack file extension."Shawn Pearce2017-11-285-72/+172
|\ \
| * | Break down DfsBlockCache stats by pack file extension.Minh Thai2017-11-275-72/+172
| | | | | | | | | | | | | | | Change-Id: Iaecf0580279b33e3e2439784528cae7b69fb28bc Signed-off-by: Minh Thai <mthai@google.com>
* | | RepoCommand: Skip RemoteReader when encountering a full SHA-1Jonathan Nieder2017-11-281-2/+1
|/ / | | | | | | | | | | | | | | | | | | | | There is no point in calling back to the RemoteReader to resolve a 40-digit hex SHA-1 to itself. We already skip that call when not ignoring remote failures; skip it when ignoring remote failures, too. This should simplify RemoteReader implementations. Reported-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I7566968ed1f39b1ad73574fa903faf3ee308eb87
* | Upgrade spotbugs-maven-plugin to 3.1.0-RC8David Pursehouse2017-11-261-1/+1
| | | | | | | | | | Change-Id: I650d1a527063204aa9696fe99b4f59bfa7e5fb97 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Performance improvement on writing a large indexStephen Lawson2017-11-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index header consists of a 4-byte version number. The current supported version numbers are 2 and 3. The code checks if any entries are extended. If it finds any entries that are extended it picks version '3', otherwise it chooses version '2'. DirCache.java -Changed the 'extended' check to exit early when any entry is considered 'extended' in the index. (Of course, I maybe missing a bitwise optimization that is made in the Java bytecode.) Change-Id: If70db9454befe683319b974ebd3774060be9445d Signed-off-by: Stephen Lawson <slawson@ptc.com>
* | Upgrade maven-compiler-plugin to 3.7.0David Pursehouse2017-11-231-1/+1
| | | | | | | | | | Change-Id: I9c4a591b809cee702b2d064d74c9809c023c78c8 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Fix discouraged access warnings in RefsUnreadableInMemoryRepositoryMatthias Sohn2017-11-241-1/+2
| | | | | | | | Change-Id: I16e291f533625c80b1d39f7cbaf40efbdfcc2c3c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-4.9'Matthias Sohn2017-11-2424-103/+330
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Ignore warning for minor version change without API change Silence boxing warning Prepare 4.5.5-SNAPSHOT builds JGit v4.5.4.201711221230-r Fix LockFile semantics when running on NFS Honor trustFolderStats also when reading packed-refs Prepare 4.5.4-SNAPSHOT builds JGit v4.5.3.201708160445-r Change-Id: Icc33d2e36f140e8714fce088379673a8834ae9de
| * Ignore warning for minor version change without API changeMatthias Sohn2017-11-2417-13/+177
| | | | | | | | | | | | | | | | - this is a new warning option in Eclipse 4.7 and higher - we always change version of all bundles in a release to keep release engineering simple Change-Id: Ic7523d77b67b2802f1bab3bc70af250d712a034f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2017-11-247-63/+176
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Silence boxing warning Prepare 4.5.5-SNAPSHOT builds JGit v4.5.4.201711221230-r Fix LockFile semantics when running on NFS Honor trustFolderStats also when reading packed-refs Prepare 4.5.4-SNAPSHOT builds JGit v4.5.3.201708160445-r Change-Id: I7cf2e48934195430b3945b6d74b092f93a3ccd36 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2017-11-226-12/+160
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Silence boxing warning Prepare 4.5.5-SNAPSHOT builds JGit v4.5.4.201711221230-r Fix LockFile semantics when running on NFS Honor trustFolderStats also when reading packed-refs Prepare 4.5.4-SNAPSHOT builds JGit v4.5.3.201708160445-r Change-Id: Iaa99ec84594baf733c993c2d6768281ff14f545a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Merge branch 'stable-4.6' into stable-4.7Matthias Sohn2017-11-227-44/+158
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.6: Silence boxing warning Prepare 4.5.5-SNAPSHOT builds JGit v4.5.4.201711221230-r Fix LockFile semantics when running on NFS Honor trustFolderStats also when reading packed-refs Prepare 4.5.4-SNAPSHOT builds JGit v4.5.3.201708160445-r Change-Id: I8f6bc09540727c6273d22775a9f9ca382a729c9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Silence boxing warningMatthias Sohn2017-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I36c40eb91ce0c51f89b47911fa14beffcbc0a7cd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Merge branch 'stable-4.5' into stable-4.6Matthias Sohn2017-11-228-40/+195
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.5: Prepare 4.5.5-SNAPSHOT builds JGit v4.5.4.201711221230-r Fix LockFile semantics when running on NFS Honor trustFolderStats also when reading packed-refs Prepare 4.5.4-SNAPSHOT builds JGit v4.5.3.201708160445-r Change-Id: Ie9c8e0d9172c8d53f075c284bf2a9677980d8dfb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Prepare 4.5.5-SNAPSHOT buildsMatthias Sohn2017-11-2256-302/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71f946f2875716670a2d74c21a8ab38a1f53a25c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * JGit v4.5.4.201711221230-rv4.5.4.201711221230-rMatthias Sohn2017-11-2256-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1079da239c5b3fde1ba8d2acc4e465a46297b4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Fix LockFile semantics when running on NFSChristian Halstrick2017-11-225-3/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running on NFS there was a chance that JGits LockFile semantic is broken because File#createNewFile() may allow multiple clients to create the same file in parallel. This change provides a fix which is only used when the new config option core.supportsAtomicCreateNewFile is set to false. The default for this option is true. This option can only be set in the global or the system config file. The repository config file is not taken into account in this case. If the config option core.supportsAtomicCreateNewFile is true then File#createNewFile() is trusted and the behaviour doesn't change. But if core.supportsAtomicCreateNewFile is set to false then after successful creation of the lock file a hardlink to that lock file is created and the attribute nlink of the lock file is checked to be 2. If multiple clients manage to create the same lock file nlink would be greater than 2 showing the error. This expensive workaround is described in https://www.time-travellers.org/shane/papers/NFS_considered_harmful.html section III.d) "Exclusive File Creation" Change-Id: I3d2cc48d8eb280d5f7039eb94da37804f903be6a
| | | | | * Honor trustFolderStats also when reading packed-refsChristian Halstrick2017-11-211-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Then list of packed refs was cached in RefDirectory based on mtime of the packed-refs file. This may fail on NFS when attributes are cached. A cached mtime of the packed-refs file could cause JGit to trust the cached content of this file and to overlook that the file is modified. Honor the config option trustFolderStats and always read the packed-refs content if the option is false. By default this option is set to true and this fix is not active. Change-Id: I2b65cfaa8f4aba2efbf8a5e865d3f09f927e2eec
| | | | | * Prepare 4.5.4-SNAPSHOT buildsMatthias Sohn2017-08-2656-302/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8b902bf2bf590b41f2e246c5ecf1592e1c411f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * JGit v4.5.3.201708160445-rv4.5.3.201708160445-rMatthias Sohn2017-08-1656-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d57144976e3683e180d3a42edc6c3bf2905e87c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | Merge branch 'stable-4.9'David Pursehouse2017-11-222-4/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Yet another work-around for a Jsch bug: timeouts Change-Id: I7cf227c62a3c06f91cee1a6c61719b6fe50da883 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | Yet another work-around for a Jsch bug: timeoutsThomas Wolf2017-11-202-4/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jsch 0.1.54 passes on the values from ~/.ssh/config for "ServerAliveInterval" and "ConnectTimeout" as read from the config file to java.net.Socket.setSoTimeout(). That method expects milliseconds, but the values in the config file are seconds! The missing conversion in Jsch means that the timeout is set way too low, and if the server doesn't respond within that very short time frame, Jsch kills the connection and then throws an exception with a message such as "session is down" or "timeout in waiting for rekeying process". As a work-around, do the conversion to milliseconds in the Jsch-facing Config interface of OpenSshConfig. That way Jsch already gets these values as milliseconds. Bug: 526867 Change-Id: Ibc9b93f7722fffe10f3e770dfe7fdabfb3b97e74 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | Config: Handle leading/trailing single whitespacesDave Borowitz2017-11-202-3/+71
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I468106acd2006d0a174c76dfd4bce231f1c7a6f8
* | | | | | Merge branch 'stable-4.9'David Pursehouse2017-11-203-9/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix NPE in TransportGitSsh.ExtSession.exec() Add missing help text for rev-parse's --verify option Remove final modifier on args4j argument field in RevParse Change-Id: I5ac9e2f185f2210ee76970501710b99b12e93e75 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | Fix NPE in TransportGitSsh.ExtSession.exec()Matthias Sohn2017-11-201-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 527383 Change-Id: I965860b4e0e9aa1adf6a1bb0735940cbd22adced Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Add missing help text for rev-parse's --verify optionMatthias Sohn2017-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3345f52e0c2a555e4c5edb7effe4be4af4cca10a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Remove final modifier on args4j argument field in RevParseRüdiger Herrmann2017-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Args4J does no longer allow to use final fields to reference arguments or options [1]. Change RevParse to be compatibel with this change. [1] https://github.com/kohsuke/args4j/commit/6e11f89d40dcc518c0e5eb9eef5d74f05d58e6af See-also: a0558b709448cea01cc0725fff73408d9b223c72 Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de> Change-Id: I33b233f195c06855d9e094c8c9ba804fbe7b1438
* | | | | | Merge changes from topic 'includeDeletes'Shawn Pearce2017-11-164-1/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add flag for keeping ref tombstones in GC reftable Preserve ref tombstone when compact top retable stack
| * | | | | | Add flag for keeping ref tombstones in GC reftableMinh Thai2017-11-153-1/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A tombstone will prevent a delayed reference update from resurrecting the deleted reference. Change-Id: Id9f4df43d435a299ff16cef614821439edef9b11 Signed-off-by: Minh Thai <mthai@google.com>
| * | | | | | Preserve ref tombstone when compact top retable stackMinh Thai2017-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07f5ad572b4642a7cdd76d92aa98f3b6c63d9fa2 Signed-off-by: Minh Thai <mthai@google.com>
* | | | | | | Remove unused import from ReftableCompactorTestMatthias Sohn2017-11-151-1/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib6d7fb6b56a94be307b07fefacf5d9c77fce0447 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | TreeWalk: Make getEolStreamType(OperationType) publicDavid Pursehouse2017-11-155-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and deprecate getEolStreamType(). This resolves a TODO that was apparently supposed to be done in version 4.4. Change-Id: I5c9861aedabdc3f99dcf47519b3959a979e6a591
* | | | | | TreeWalk: Fix indentationDavid Pursehouse2017-11-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I040aaaf4e3f1e3458e0ece52d1d046f501272fc2 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | Merge "ObjectDirectory: Add pack directory getter"David Pursehouse2017-11-1411-18/+22
|\ \ \ \ \ \
| * | | | | | ObjectDirectory: Add pack directory getterHector Caballero2017-11-1411-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, in order to get the pack directory it was necessary to resolve it from the object directory. This resolution is already done when creating the object directory, so simplify the call by just adding a getter to the pack directory. Change-Id: I69e783141dc6739024e8b3d5acc30843edd651a7 Signed-off-by: Hector Caballero <hector.caballero@ericsson.com>
* | | | | | | Merge "Add return tag"David Pursehouse2017-11-141-2/+3
|\| | | | | |
| * | | | | | Add return tagHector Caballero2017-11-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse was complaining about the missing tag for the return type. Change-Id: I43c7e823c3090b19dc8202c1e4d7968e1fa8e6bb Signed-off-by: Hector Caballero <hector.caballero@ericsson.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 03:26:13 +0000