aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-08-081-9/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Fix OpenSshConfigTest#config FileSnapshot: fix bug with timestamp thresholding In LockFile#waitForStatChange wait in units of file time resolution Cache FileStoreAttributeCache per directory Fix FileSnapshot#save(long) and FileSnapshot#save(Instant) Persist minimal racy threshold and allow manual configuration Measure minimum racy interval to auto-configure FileSnapshot Reuse FileUtils to recursively delete files created by tests Fix FileAttributeCache.toString() Add test for racy git detection in FileSnapshot Repeat RefDirectoryTest.testGetRef_DiscoversModifiedLoose 100 times Fix org.eclipse.jdt.core.prefs of org.eclipse.jgit.junit Add missing javadoc in org.eclipse.jgit.junit Enhance RepeatRule to report number of failures at the end Fix FileSnapshotTests for filesystem with high timestamp resolution Retry deleting test files in FileBasedConfigTest Measure filesystem timestamp resolution already in test setup Refactor FileSnapshotTest to use NIO APIs Measure stored timestamp resolution instead of time to touch file Handle CancellationException in FileStoreAttributeCache Fix FileSnapshot#saveNoConfig Use Instant for smudge time in DirCache and DirCacheEntry Use Instant instead of milliseconds for filesystem timestamp handling Workaround SecurityException in FS#getFsTimestampResolution Fix NPE in FS$FileStoreAttributeCache.getFsTimestampResolution FS: ignore AccessDeniedException when measuring timestamp resolution Add debug trace for FileSnapshot Use FileChannel.open to touch file and set mtime to now Persist filesystem timestamp resolution and allow manual configuration Increase bazel timeout for long running tests Bazel: Fix lint warning flagged by buildifier Update bazlets to latest version Bazel: Add missing dependencies for ArchiveCommandTest Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file Add support for nanoseconds and microseconds for Config#getTimeUnit Optionally measure filesystem timestamp resolution asynchronously Delete unused FileTreeIteratorWithTimeControl FileSnapshot#equals: consider UNKNOWN_SIZE Timeout measuring file timestamp resolution after 2 seconds Fix RacyGitTests#testRacyGitDetection Change RacyGitTests to create a racy git situation in a stable way Deprecate Constants.CHARACTER_ENCODING in favor of StandardCharsets.UTF_8 Fix non-deterministic hash of archives created by ArchiveCommand Update Maven plugins ecj, plexus, error-prone Update Maven plugins and cleanup Maven warnings Make inner classes static where possible Fix API problem filters Change-Id: I238adfd3080a5fed9d64c3c757297da6ea893918 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-5.1' into stable-5.2Matthias Sohn2019-08-081-9/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Fix OpenSshConfigTest#config FileSnapshot: fix bug with timestamp thresholding In LockFile#waitForStatChange wait in units of file time resolution Cache FileStoreAttributeCache per directory Fix FileSnapshot#save(long) and FileSnapshot#save(Instant) Persist minimal racy threshold and allow manual configuration Measure minimum racy interval to auto-configure FileSnapshot Reuse FileUtils to recursively delete files created by tests Fix FileAttributeCache.toString() Add test for racy git detection in FileSnapshot Repeat RefDirectoryTest.testGetRef_DiscoversModifiedLoose 100 times Fix org.eclipse.jdt.core.prefs of org.eclipse.jgit.junit Add missing javadoc in org.eclipse.jgit.junit Enhance RepeatRule to report number of failures at the end Fix FileSnapshotTests for filesystem with high timestamp resolution Retry deleting test files in FileBasedConfigTest Measure filesystem timestamp resolution already in test setup Refactor FileSnapshotTest to use NIO APIs Measure stored timestamp resolution instead of time to touch file Handle CancellationException in FileStoreAttributeCache Fix FileSnapshot#saveNoConfig Use Instant for smudge time in DirCache and DirCacheEntry Use Instant instead of milliseconds for filesystem timestamp handling Workaround SecurityException in FS#getFsTimestampResolution Fix NPE in FS$FileStoreAttributeCache.getFsTimestampResolution FS: ignore AccessDeniedException when measuring timestamp resolution Add debug trace for FileSnapshot Use FileChannel.open to touch file and set mtime to now Persist filesystem timestamp resolution and allow manual configuration Increase bazel timeout for long running tests Bazel: Fix lint warning flagged by buildifier Update bazlets to latest version Bazel: Add missing dependencies for ArchiveCommandTest Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file Add support for nanoseconds and microseconds for Config#getTimeUnit Optionally measure filesystem timestamp resolution asynchronously Delete unused FileTreeIteratorWithTimeControl FileSnapshot#equals: consider UNKNOWN_SIZE Timeout measuring file timestamp resolution after 2 seconds Fix RacyGitTests#testRacyGitDetection Change RacyGitTests to create a racy git situation in a stable way Deprecate Constants.CHARACTER_ENCODING in favor of StandardCharsets.UTF_8 Fix non-deterministic hash of archives created by ArchiveCommand Update Maven plugins ecj, plexus, error-prone Update Maven plugins and cleanup Maven warnings Make inner classes static where possible Fix API problem filters Change-Id: Ia57385b2a60f48a5317c8d723721c235d7043a84 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Use Instant instead of milliseconds for filesystem timestamp handlingMatthias Sohn2019-07-181-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables higher file timestamp resolution on filesystems like ext4, Mac APFS (1ns) or NTFS (100ns) providing high timestamp resolution on filesystem level. Note: - on some OSes Java 8,9 truncate milliseconds, see https://bugs.openjdk.java.net/browse/JDK-8177809, fixed in Java 10 - UnixFileAttributes truncates timestamp resolution to microseconds when converting the internal representation to FileTime exposed in the API, see https://bugs.openjdk.java.net/browse/JDK-8181493 - WindowsFileAttributes also provides only microsecond resolution Change-Id: I25ffff31a3c6f725fc345d4ddc2f26da3b88f6f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Make inner classes static where possibleDavid Pursehouse2019-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by Error Prone: An inner class should be static unless it references members of its enclosing class. An inner class that is made non-static unnecessarily uses more memory and does not make the intent of the class clear. See https://errorprone.info/bugpattern/ClassCanBeStatic Change-Id: Ib99d120532630dba63cf400cc1c61c318286fc41 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> (cherry picked from commit ee40efcea44bc0c9a28afe29a80c87636947484e)
* | | diff: add option metaVar for --src-prefix and --dst-prefixAndre Bossert2019-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes exception if using "jgit diff --help". Bug: 544735 Change-Id: I694ff3103da4bc199dd03c40962c5be191eddcd1 Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
* | | pgm: Fix missing braces in Version.run()Matthias Sohn2019-01-211-2/+4
| | | | | | | | | | | | Change-Id: I4c5633846320f0324714f635b2be388b17cf79fa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in Version commandMatthias Sohn2019-01-211-2/+7
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I37e6e3aaba411858042afac02098ce9eaa06f258 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in UploadPack.run()Matthias Sohn2019-01-211-1/+2
| | | | | | | | | | | | Change-Id: I923af9b4ce62d5098828f4322a2a508bf3927bbd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in UploadPack commandMatthias Sohn2019-01-211-8/+9
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Ife1d8e88387a32de63b0ef31f45499babdbdde3c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Tag commandMatthias Sohn2019-01-211-1/+5
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I16b528fad74d0c5346d054b3c29070331d60db7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Status.run()Matthias Sohn2019-01-211-2/+4
| | | | | | | | | | | | Change-Id: Ie30df8ed3d9a1e676f130214a173b622eaf67c6f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Status commandMatthias Sohn2019-01-211-1/+5
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I662a343fbb46c35090bd6f840e5a35a88036a65a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in ShowRef.run()Matthias Sohn2019-01-211-1/+2
| | | | | | | | | | | | Change-Id: I92bc2008c72bd4495dc3df47a9dd7eb242aab30f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in ShowRef commandMatthias Sohn2019-01-211-6/+10
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: If18a5d8013f1cb393af3a5e5a1ec9613ac2151bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Show.run()Matthias Sohn2019-01-211-3/+5
| | | | | | | | | | | | Change-Id: I50097649f1355856e342035d54c55e65270ef507 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Show commandMatthias Sohn2019-01-211-2/+5
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I1c6cc5ecdc44b81e5f3f9b7dc64c3653de5475ba Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Rm commandMatthias Sohn2019-01-211-1/+2
| | | | | | | | | | | | Change-Id: I5ad2f02516917bbd02aa0eb4fb6b05d4b06dc670 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle GitAPIException in Rm commandMatthias Sohn2019-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I55c15a35369e790a3ca946d6db0097a57ac6fae5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in RevParse commandMatthias Sohn2019-01-211-18/+23
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Iae510d8c6af9acd587822a28ad48eab0b2a96ccd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Externalize error messageMatthias Sohn2019-01-212-1/+3
| | | | | | | | | | | | Change-Id: Id9e33104c9681dc9a57674c1648c994a503fa6b8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Reset.run()Matthias Sohn2019-01-211-5/+10
| | | | | | | | | | | | Change-Id: I1e854ab81063601eb4ff159aabc559cb65ce6ece Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle GitAPIException in Reset commandMatthias Sohn2019-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I70dce366081cd1fc4539cf195d6310fef1080eb3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle GitAPIException in Repo commandMatthias Sohn2019-01-211-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I1a636478bfae8cc0635a3e57be252126e69c19cd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Remote commandMatthias Sohn2019-01-211-1/+3
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Ie1985c2570213217c2ea0f376ff99d19bfed4e0c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Reflog commandMatthias Sohn2019-01-211-1/+5
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Id25eb523c12c07cbd14e31edfb8b5d7ec9b3ccf3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in ReceivePack commandMatthias Sohn2019-01-211-2/+9
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I9cecd236a8df8a2c2972d5da6031a121f25b1daa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge: Avoid non-localised literal string warning for "recursive"David Pursehouse2019-01-211-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | Instead of using the literal string, take the name from the RECURSIVE enum value. Change-Id: I9d8f289232dfc8f784287029c41714ddbdee232b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | pgm: Fix missing braces in Push.run()Matthias Sohn2019-01-211-2/+4
| | | | | | | | | | | | Change-Id: I7cc1b3ca022ba131c196d72c1b776de942442b7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Push commandMatthias Sohn2019-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I7a5dc6b1ebaad6f7b8baa35ce68760b79bab8acd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in MergeBase.run()Matthias Sohn2019-01-211-2/+4
| | | | | | | | | | | | Change-Id: I625053ceb5a81bc0014f7cab0f9fb5e5deaacc36 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in MergeBase commandMatthias Sohn2019-01-211-10/+15
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I5f198f71adfbb43ec1af26285658a5d5bdfa1904 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Merge commandMatthias Sohn2019-01-211-10/+18
| | | | | | | | | | | | Change-Id: I39495d832ff4e48a97182faef88871902d3edb11 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Merge commandMatthias Sohn2019-01-211-90/+100
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I7afd038d8def9d2f409c0ed297b9db8ea2fc75c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in LsTree.run()Matthias Sohn2019-01-211-2/+4
| | | | | | | | | | | | Change-Id: Iac1755c2ec8094cd211bbc9f1d819cc8052e20cb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in LsTree commandMatthias Sohn2019-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Ib3ae59eeb90143eca1a0b515c59457a0eb2cc383 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in LsRemote.run()Matthias Sohn2019-01-211-1/+2
| | | | | | | | | | | | Change-Id: I779a6c28f7e8c4ba0527eb872454fd2cc3d81304 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in LsRemote commandMatthias Sohn2019-01-211-6/+11
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: If7dd168f3e8d2b729f1eab48d4e95fe837bb7a33 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in LsFiles commandMatthias Sohn2019-01-211-1/+5
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I7d71e194f0a7e4180094a9b36dbb55dd90c9722e
* | | pgm: Fix missing braces in Log.run()Matthias Sohn2019-01-211-3/+4
| | | | | | | | | | | | Change-Id: I3e4f41150aeeffc8c609ef14ce5b6d428c4595d7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Log commandMatthias Sohn2019-01-211-1/+3
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Ibca80cf2195db01298f2b95f507cfa3de2f403e7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Init commandMatthias Sohn2019-01-211-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Ib8b26a6a02903de63ef58687a4a0820649d59f99 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in IndexPack commandMatthias Sohn2019-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Ie8a8388daecb0500f04197462210606c42f143c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Fetch.run()Matthias Sohn2019-01-201-8/+14
| | | | | | | | | | | | Change-Id: I4655417fd879733a357bf712a486ce0883021198 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle IOException in Fetch commandMatthias Sohn2019-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: If8be68621c7135435cd067ef638460b175786b1b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle GitAPIException in Gc commandMatthias Sohn2019-01-201-5/+10
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I4d3c04b27727762870d3135228768aae177ea3fc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in DiffTree.run()Matthias Sohn2019-01-201-5/+8
| | | | | | | | | | | | Change-Id: Ic75c7e77516ff1c26803e010bf2bdbaf3e9d6ce1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in DiffTree commandMatthias Sohn2019-01-201-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: I087b3e510682c68cae74c069b10050c7acb48a29 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Fix missing braces in Diff.run()Matthias Sohn2019-01-201-4/+6
| | | | | | | | | | | | Change-Id: I326b85f49d9b2f3c753f8a38e3f65ee61ba35db3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | pgm: Handle exceptions in Diff commandMatthias Sohn2019-01-201-1/+4
| | | | | | | | | | | | | | | | | | | | | This avoids we show a stacktrace on the console by default when this type of exception is thrown during the run method is executed. Change-Id: Iba0e4338381519dc55c2892d95181ddfb881adf2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Stop using deprecated methods of RemoteSetUrlCommand/RemoteRemoveCommandDavid Pursehouse2019-01-201-4/+5
| | | | | | | | | | | | | | | Change-Id: I5234474b359a32bdae501b181f0726be2af1ec6a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 01:56:56 +0000