diff options
111 files changed, 2114 insertions, 524 deletions
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 94336588d6..85f665bc03 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.ant.tasks;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 6ad64155e8..aca85bb54f 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant.test</artifactId> diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 10bfbd2eff..4110ab3950 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)" + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)" Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="6.0.1", - org.eclipse.jgit.ant.tasks;version="6.0.1"; +Export-Package: org.eclipse.jgit.ant;version="6.1.0", + org.eclipse.jgit.ant.tasks;version="6.1.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index c3ebfb3f48..19cf64ccd2 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f1cd27dc51..24f3de309d 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ant</artifactId> diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 62fe5a5d81..160b425249 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="6.0.1"; +Export-Package: org.eclipse.jgit.archive;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="6.0.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="6.1.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index deab2fab99..9b0038f77a 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 45f11da6a2..97bbf64147 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.archive</artifactId> diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 8b16d18ce2..0f2260db26 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jgit</groupId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> <artifactId>org.eclipse.jgit.benchmarks</artifactId> <packaging>jar</packaging> diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 63ead27a8f..6e476b3f9d 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -27,88 +27,88 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.archive</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.apache</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ant.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index d703432dc1..23a0360047 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -12,9 +12,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.sha1;version="[6.0.1,6.1.0)", + org.eclipse.jgit.gpg.bc.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.sha1;version="[6.1.0,6.2.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index ad955b0b6e..5bb9ebcf06 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc.test</artifactId> diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 74e3305db2..8f60326a94 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[6.0.1,6.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.1.0,6.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)", @@ -29,9 +29,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="6.0.1", - org.eclipse.jgit.gpg.bc.internal;version="6.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="6.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="6.1.0", + org.eclipse.jgit.gpg.bc.internal;version="6.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="6.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index de4962b2e8..f99ec41ea9 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 4bf82c64ed..1a6a991f43 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.gpg.bc</artifactId> diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c51a87eadf..1a466db641 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor @@ -25,11 +25,11 @@ Import-Package: org.apache.http;version="[4.3.0,5.0.0)", org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="6.0.1"; + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="6.1.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 9d4f5f2ea8..f4f763de0e 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 6e5f26028f..d3075efe45 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.apache</artifactId> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 510c4397de..356b363b32 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="6.0.1", - org.eclipse.jgit.http.server.glue;version="6.0.1"; +Export-Package: org.eclipse.jgit.http.server;version="6.1.0", + org.eclipse.jgit.http.server.glue;version="6.1.0"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="6.0.1"; + org.eclipse.jgit.http.server.resolver;version="6.1.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.servlet;version="[2.5.0,5.0.0)", javax.servlet.http;version="[2.5.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.resolver;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)" + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.resolver;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 7453cb8bd8..b23f4e2797 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b01c7910d2..5eb4bad15a 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3a6517c685..03d7a08940 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,26 +26,26 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.http.server;version="[6.0.1,6.1.0)", - org.eclipse.jgit.http.server.glue;version="[6.0.1,6.1.0)", - org.eclipse.jgit.http.server.resolver;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http.apache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.resolver;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.http.server;version="[6.1.0,6.2.0)", + org.eclipse.jgit.http.server.glue;version="[6.1.0,6.2.0)", + org.eclipse.jgit.http.server.resolver;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http.apache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.resolver;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 7694c441d9..60c67047b9 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index c21f835d2a..fdb37de0a5 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -21,17 +21,17 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.http.server;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.resolver;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.http.server;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.resolver;version="[6.1.0,6.2.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="6.0.1"; +Export-Package: org.eclipse.jgit.junit.http;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 98fde06580..c8eaa8f6a4 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index b66991f9ce..4ab0a7e4f1 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.http</artifactId> diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 8d629eda6a..0404d71b59 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.7.0,2.8.0)", org.apache.sshd.server.subsystem;version="[2.7.0,2.8.0)", org.apache.sshd.sftp;version="[2.7.0,2.8.0)", org.apache.sshd.sftp.server;version="[2.7.0,2.8.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="6.0.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="6.1.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 7132b5b828..791df8ace9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 76bdca16ae..f6fb01751e 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.ssh</artifactId> diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 1f021da61b..88da600e59 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,35 +3,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.merge;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="6.0.1", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.time;version="[6.0.1,6.1.0)", +Import-Package: org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.dircache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.merge;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="6.1.0", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.io;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.time;version="[6.1.0,6.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,2.0.0)" -Export-Package: org.eclipse.jgit.junit;version="6.0.1"; +Export-Package: org.eclipse.jgit.junit;version="6.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -44,4 +44,4 @@ Export-Package: org.eclipse.jgit.junit;version="6.0.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="6.0.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="6.1.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 156e59a863..5f83c4517f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ef2b946dac..1ca223c5d2 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index b2a82c2215..7b8e3d6d26 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,24 +26,24 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.server;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.test;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.server;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.test;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index ef8751e9f9..79ba962baa 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server.test</artifactId> diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 3a4448b9c1..b174e3b41e 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="6.0.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="6.1.0"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="6.0.1"; + org.eclipse.jgit.lfs.server.fs;version="6.1.0"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="6.0.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="6.0.1"; + org.eclipse.jgit.lfs.server.internal;version="6.1.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="6.1.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http.apache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http.apache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 5011a223e1..ea45f021dc 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index c2d6596af3..10fe0cd458 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server</artifactId> diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index b870794b84..b70fca6188 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", +Import-Package: org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.attributes;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="6.0.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="6.1.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index a88ca94860..eceb0ead90 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.test</artifactId> diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index fba58f8394..5369918960 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,31 +3,31 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="6.0.1", - org.eclipse.jgit.lfs.errors;version="6.0.1", - org.eclipse.jgit.lfs.internal;version="6.0.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="6.0.1" +Export-Package: org.eclipse.jgit.lfs;version="6.1.0", + org.eclipse.jgit.lfs.errors;version="6.1.0", + org.eclipse.jgit.lfs.internal;version="6.1.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="6.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", - org.eclipse.jgit.diff;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.hooks;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.pack;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)" + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.attributes;version="[6.1.0,6.2.0)", + org.eclipse.jgit.diff;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.hooks;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.pack;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.io;version="[6.1.0,6.2.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index a715be6868..a40099fd1e 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index eb57db373c..0ab16f425f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index cc1bf85f72..da305ea614 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 874b274f54..223051b840 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index be0266260b..59fde7ed4d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.gpg.bc" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 2909e808cf..e3771983cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 8937a83391..ea90c9964d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.http.apache" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 2292c2eee8..48503db9b2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 6eee7cde11..dde16bc0d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.junit" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -24,7 +24,7 @@ <requires> <import plugin="com.jcraft.jsch"/> - <import plugin="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index dc4159bc83..3f02bb0621 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index f0a488452e..9fce6d333e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.lfs" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index e344c19f35..44108e2039 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index f5889e55ac..3e2e189d14 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.pgm" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -35,9 +35,9 @@ version="0.0.0"/> <requires> - <import feature="org.eclipse.jgit" version="6.0.1" match="equivalent"/> - <import feature="org.eclipse.jgit.lfs" version="6.0.1" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="6.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.1.0" match="equivalent"/> + <import feature="org.eclipse.jgit.lfs" version="6.1.0" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index ae9570440e..29f40142de 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index e12e5997da..88d34b184a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.repository</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index d5d1554cfd..a70632956c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.source" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index a20645e8b6..0b00e4a95e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> @@ -30,7 +30,7 @@ <dependency> <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index ae62fa064a..f6ad4f9b30 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.ssh.apache" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 6f12afab13..28f61dd2d0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index df42e93e46..ea76ea17a9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.ssh.jsch" label="%featureName" - version="6.0.1.qualifier" + version="6.1.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> @@ -23,7 +23,7 @@ </url> <requires> - <import plugin="org.eclipse.jgit" version="6.0.1" match="equivalent"/> + <import plugin="org.eclipse.jgit" version="6.1.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 37ada5d77e..16395ccc69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.jgit.feature</groupId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index d31cd37599..d56f1d4dcd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index 8bee1fc4f6..a4f1700510 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.target</artifactId> diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 80a64bdd82..92e8f5dfe0 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent</name> diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index af00b0ae8a..3d6e909adf 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.diff;version="[6.0.1,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="6.0.1", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.merge;version="[6.0.1,6.1.0)", - org.eclipse.jgit.pgm;version="[6.0.1,6.1.0)", - org.eclipse.jgit.pgm.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.pgm.opt;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)", +Import-Package: org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.diff;version="[6.1.0,6.2.0)", + org.eclipse.jgit.dircache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="6.1.0", + org.eclipse.jgit.internal.storage.file;version="6.1.0", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.merge;version="[6.1.0,6.2.0)", + org.eclipse.jgit.pgm;version="[6.1.0,6.2.0)", + org.eclipse.jgit.pgm.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.pgm.opt;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.io;version="[6.1.0,6.2.0)", org.hamcrest.core;bundle-version="[2.2.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index cd2bb63206..eea5970ab1 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java new file mode 100644 index 0000000000..e7bf48417d --- /dev/null +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DiffToolTest.java @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2021, Simeon Andreev <simeon.danailov.andreev@gmail.com> and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.pgm; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.diff.DiffEntry; +import org.eclipse.jgit.internal.diffmergetool.CommandLineDiffTool; +import org.eclipse.jgit.lib.CLIRepositoryTestCase; +import org.eclipse.jgit.pgm.opt.CmdLineParser; +import org.eclipse.jgit.pgm.opt.SubcommandHandler; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.treewalk.FileTreeIterator; +import org.eclipse.jgit.treewalk.TreeWalk; +import org.junit.Before; +import org.junit.Test; +import org.kohsuke.args4j.Argument; + +/** + * Testing the {@code difftool} command. + */ +public class DiffToolTest extends CLIRepositoryTestCase { + public static class GitCliJGitWrapperParser { + @Argument(index = 0, metaVar = "metaVar_command", required = true, handler = SubcommandHandler.class) + TextBuiltin subcommand; + + @Argument(index = 1, metaVar = "metaVar_arg") + List<String> arguments = new ArrayList<>(); + } + + private String[] runAndCaptureUsingInitRaw(String... args) + throws Exception { + CLIGitCommand.Result result = new CLIGitCommand.Result(); + + GitCliJGitWrapperParser bean = new GitCliJGitWrapperParser(); + CmdLineParser clp = new CmdLineParser(bean); + clp.parseArgument(args); + + TextBuiltin cmd = bean.subcommand; + cmd.initRaw(db, null, null, result.out, result.err); + cmd.execute(bean.arguments.toArray(new String[bean.arguments.size()])); + if (cmd.getOutputWriter() != null) { + cmd.getOutputWriter().flush(); + } + if (cmd.getErrorWriter() != null) { + cmd.getErrorWriter().flush(); + } + return result.outLines().toArray(new String[0]); + } + + private Git git; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + git = new Git(db); + git.commit().setMessage("initial commit").call(); + } + + @Test + public void testTool() throws Exception { + RevCommit commit = createUnstagedChanges(); + List<DiffEntry> changes = getRepositoryChanges(commit); + String[] expectedOutput = getExpectedDiffToolOutput(changes); + + String[] options = { + "--tool", + "-t", + }; + + for (String option : options) { + assertArrayOfLinesEquals("Incorrect output for option: " + option, + expectedOutput, + runAndCaptureUsingInitRaw("difftool", option, + "some_tool")); + } + } + + @Test + public void testToolTrustExitCode() throws Exception { + RevCommit commit = createUnstagedChanges(); + List<DiffEntry> changes = getRepositoryChanges(commit); + String[] expectedOutput = getExpectedDiffToolOutput(changes); + + String[] options = { "--tool", "-t", }; + + for (String option : options) { + assertArrayOfLinesEquals("Incorrect output for option: " + option, + expectedOutput, runAndCaptureUsingInitRaw("difftool", + "--trust-exit-code", option, "some_tool")); + } + } + + @Test + public void testToolNoGuiNoPromptNoTrustExitcode() throws Exception { + RevCommit commit = createUnstagedChanges(); + List<DiffEntry> changes = getRepositoryChanges(commit); + String[] expectedOutput = getExpectedDiffToolOutput(changes); + + String[] options = { "--tool", "-t", }; + + for (String option : options) { + assertArrayOfLinesEquals("Incorrect output for option: " + option, + expectedOutput, runAndCaptureUsingInitRaw("difftool", + "--no-gui", "--no-prompt", "--no-trust-exit-code", + option, "some_tool")); + } + } + + @Test + public void testToolCached() throws Exception { + RevCommit commit = createStagedChanges(); + List<DiffEntry> changes = getRepositoryChanges(commit); + String[] expectedOutput = getExpectedDiffToolOutput(changes); + + String[] options = { "--cached", "--staged", }; + + for (String option : options) { + assertArrayOfLinesEquals("Incorrect output for option: " + option, + expectedOutput, runAndCaptureUsingInitRaw("difftool", + option, "--tool", "some_tool")); + } + } + + @Test + public void testToolHelp() throws Exception { + CommandLineDiffTool[] defaultTools = CommandLineDiffTool.values(); + List<String> expectedOutput = new ArrayList<>(); + expectedOutput.add("git difftool --tool=<tool> may be set to one of the following:"); + for (CommandLineDiffTool defaultTool : defaultTools) { + String toolName = defaultTool.name(); + expectedOutput.add(toolName); + } + String[] userDefinedToolsHelp = { + "user-defined:", + "The following tools are valid, but not currently available:", + "Some of the tools listed above only work in a windowed", + "environment. If run in a terminal-only session, they will fail.", + }; + expectedOutput.addAll(Arrays.asList(userDefinedToolsHelp)); + + String option = "--tool-help"; + assertArrayOfLinesEquals("Incorrect output for option: " + option, + expectedOutput.toArray(new String[0]), runAndCaptureUsingInitRaw("difftool", option)); + } + + private RevCommit createUnstagedChanges() throws Exception { + writeTrashFile("a", "Hello world a"); + writeTrashFile("b", "Hello world b"); + git.add().addFilepattern(".").call(); + RevCommit commit = git.commit().setMessage("files a & b").call(); + writeTrashFile("a", "New Hello world a"); + writeTrashFile("b", "New Hello world b"); + return commit; + } + + private RevCommit createStagedChanges() throws Exception { + RevCommit commit = createUnstagedChanges(); + git.add().addFilepattern(".").call(); + return commit; + } + + private List<DiffEntry> getRepositoryChanges(RevCommit commit) + throws Exception { + TreeWalk tw = new TreeWalk(db); + tw.addTree(commit.getTree()); + FileTreeIterator modifiedTree = new FileTreeIterator(db); + tw.addTree(modifiedTree); + List<DiffEntry> changes = DiffEntry.scan(tw); + return changes; + } + + private String[] getExpectedDiffToolOutput(List<DiffEntry> changes) { + String[] expectedToolOutput = new String[changes.size()]; + for (int i = 0; i < changes.size(); ++i) { + DiffEntry change = changes.get(i); + String newPath = change.getNewPath(); + String oldPath = change.getOldPath(); + String newIdName = change.getNewId().name(); + String oldIdName = change.getOldId().name(); + String expectedLine = "M\t" + newPath + " (" + newIdName + ")" + + "\t" + oldPath + " (" + oldIdName + ")"; + expectedToolOutput[i] = expectedLine; + } + return expectedToolOutput; + } + + private static void assertArrayOfLinesEquals(String failMessage, + String[] expected, String[] actual) { + assertEquals(failMessage, toString(expected), toString(actual)); + } +} diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index ffaafc13c8..fa0f452c59 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -14,47 +14,49 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", org.eclipse.jetty.util;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.archive;version="[6.0.1,6.1.0)", - org.eclipse.jgit.awtui;version="[6.0.1,6.1.0)", - org.eclipse.jgit.blame;version="[6.0.1,6.1.0)", - org.eclipse.jgit.diff;version="[6.0.1,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.gitrepo;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.io;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.server;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs.server.s3;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.merge;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.notes;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revplot;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.pack;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http.apache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.resolver;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.sshd;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.archive;version="[6.1.0,6.2.0)", + org.eclipse.jgit.awtui;version="[6.1.0,6.2.0)", + org.eclipse.jgit.blame;version="[6.1.0,6.2.0)", + org.eclipse.jgit.diff;version="[6.1.0,6.2.0)", + org.eclipse.jgit.dircache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.gitrepo;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.io;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.server;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs.server.s3;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.merge;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.notes;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revplot;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.pack;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http.apache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.resolver;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.sshd;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.io;version="[6.1.0,6.2.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="6.0.1"; +Export-Package: org.eclipse.jgit.console;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="6.0.1"; + org.eclipse.jgit.pgm;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -66,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="6.0.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="6.0.1"; + org.eclipse.jgit.pgm.debug;version="6.1.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="6.0.1"; + org.eclipse.jgit.pgm.internal;version="6.1.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="6.0.1"; + org.eclipse.jgit.pgm.opt;version="6.1.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 26269d752d..a61df467ac 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin index e645255e96..8c44764c63 100644 --- a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin +++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin @@ -12,6 +12,7 @@ org.eclipse.jgit.pgm.ConvertRefStorage org.eclipse.jgit.pgm.Daemon org.eclipse.jgit.pgm.Describe org.eclipse.jgit.pgm.Diff +org.eclipse.jgit.pgm.DiffTool org.eclipse.jgit.pgm.DiffTree org.eclipse.jgit.pgm.Fetch org.eclipse.jgit.pgm.Gc diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 28ebaa2cb0..739b53763f 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 97450033ee..d51daafde3 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -58,6 +58,9 @@ couldNotCreateBranch=Could not create branch {0}: {1} dateInfo=Date: {0} deletedBranch=Deleted branch {0} deletedRemoteBranch=Deleted remote branch {0} +diffToolHelpSetToFollowing='git difftool --tool=<tool>' may be set to one of the following:\n{0}\n\tuser-defined:\n{1}\nThe following tools are valid, but not currently available:\n{2}\nSome of the tools listed above only work in a windowed\nenvironment. If run in a terminal-only session, they will fail. +diffToolLaunch=Viewing ({0}/{1}): '{2}'\nLaunch '{3}' [Y/n]? +diffToolDied=external diff died, stopping at {0} doesNotExist={0} does not exist dontOverwriteLocalChanges=error: Your local changes to the following file would be overwritten by merge: everythingUpToDate=Everything up-to-date @@ -145,6 +148,7 @@ metaVar_s3StorageClass=STORAGE-CLASS metaVar_seconds=SECONDS metaVar_service=SERVICE metaVar_tagLocalUser=<GPG key ID> +metaVar_tool=TOOL metaVar_treeish=tree-ish metaVar_uriish=uri-ish metaVar_url=URL @@ -249,6 +253,8 @@ usage_DiffAlgorithms=Test performance of jgit's diff algorithms usage_DisplayTheVersionOfJgit=Display the version of jgit usage_Gc=Cleanup unnecessary files and optimize the local repository usage_Glog=View commit history as a graph +usage_DiffGuiTool=When git-difftool is invoked with the -g or --gui option the default diff tool will be read from the configured diff.guitool variable instead of diff.tool. +usage_noGui=The --no-gui option can be used to override -g or --gui setting. usage_IndexPack=Build pack index file for an existing packed archive usage_LFSDirectory=Directory to store large objects usage_LFSPort=Server http port @@ -295,6 +301,7 @@ usage_ShowRef=List references in a local repository usage_Status=Show the working tree status usage_StopTrackingAFile=Stop tracking a file usage_TextHashFunctions=Scan repository to compute maximum number of collisions for hash functions +usage_ToolForDiff=Use the diff tool specified by <tool>. Run git difftool --tool-help for the list of valid <tool> settings.\nIf a diff tool is not specified, git difftool will use the configuration variable diff.tool. usage_UpdateRemoteRepositoryFromLocalRefs=Update remote repository from local refs usage_UseAll=Use all refs found in refs/ usage_UseTags=Use any tag including lightweight tags @@ -341,6 +348,7 @@ usage_deleteFullyMergedBranch=delete fully merged branch usage_date=date format, one of default, rfc, local, iso, short, raw (as defined by git-log(1) ), locale or localelocal (jgit extensions) usage_detectRenames=detect renamed files usage_diffAlgorithm=the diff algorithm to use. Currently supported are: 'myers', 'histogram' +usage_DiffTool=git difftool is a Git command that allows you to compare and edit files between revisions using common diff tools.\ngit difftool is a frontend to git diff and accepts the same options and arguments. usage_directoriesToExport=directories to export usage_disableTheServiceInAllRepositories=disable the service in all repositories usage_displayAListOfAllRegisteredJgitCommands=Display a list of all registered jgit commands @@ -395,6 +403,8 @@ usage_pathToXml=path to the repo manifest XML file usage_performFsckStyleChecksOnReceive=perform fsck style checks on receive usage_portNumberToListenOn=port number to listen on usage_printOnlyBranchesThatContainTheCommit=print only branches that contain the commit +usage_prompt=Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings. +usage_noPrompt=Do not prompt before launching a diff tool. usage_pruneStaleTrackingRefs=prune stale tracking refs usage_pushUrls=push URLs are manipulated usage_quiet=don't show progress messages @@ -422,6 +432,8 @@ usage_srcPrefix=show the source prefix instead of "a/" usage_sshDriver=Selects the built-in ssh library to use, JSch or Apache MINA sshd. usage_symbolicVersionForTheProject=Symbolic version for the project usage_tags=fetch all tags +usage_trustExitCode=git-difftool invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use --trust-exit-code to make git-difftool exit when an invoked diff tool returns a non-zero exit code.\ngit-difftool will forward the exit code of the invoked tool when --trust-exit-code is used. +usage_noTrustExitCode=This option can be used to override --trust-exit-code setting. usage_notags=do not fetch tags usage_tagAnnotated=create an annotated tag, unsigned unless -s or -u are given, or config tag.gpgSign is true usage_tagDelete=delete tag @@ -430,6 +442,7 @@ usage_tagMessage=create an annotated tag with the given message, unsigned unless usage_tagSign=create a signed annotated tag usage_tagNoSign=suppress signing the tag usage_tagVerify=Verify the GPG signature +usage_toolHelp=Print a list of diff tools that may be used with --tool. usage_untrackedFilesMode=show untracked files usage_updateRef=reference to update usage_updateRemoteRefsFromAnotherRepository=Update remote refs from another repository diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java new file mode 100644 index 0000000000..d26842c641 --- /dev/null +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTool.java @@ -0,0 +1,255 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.pgm; + +import static org.eclipse.jgit.lib.Constants.HEAD; + +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.text.MessageFormat; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jgit.diff.DiffEntry; +import org.eclipse.jgit.diff.DiffFormatter; +import org.eclipse.jgit.dircache.DirCacheIterator; +import org.eclipse.jgit.errors.AmbiguousObjectException; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.RevisionSyntaxException; +import org.eclipse.jgit.internal.diffmergetool.DiffTools; +import org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectReader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.TextProgressMonitor; +import org.eclipse.jgit.lib.internal.BooleanTriState; +import org.eclipse.jgit.pgm.internal.CLIText; +import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; +import org.eclipse.jgit.treewalk.AbstractTreeIterator; +import org.eclipse.jgit.treewalk.CanonicalTreeParser; +import org.eclipse.jgit.treewalk.FileTreeIterator; +import org.eclipse.jgit.treewalk.filter.TreeFilter; +import org.eclipse.jgit.util.StringUtils; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; + +@Command(name = "difftool", common = true, usage = "usage_DiffTool") +class DiffTool extends TextBuiltin { + private DiffFormatter diffFmt; + + private DiffTools diffTools; + + @Argument(index = 0, metaVar = "metaVar_treeish") + private AbstractTreeIterator oldTree; + + @Argument(index = 1, metaVar = "metaVar_treeish") + private AbstractTreeIterator newTree; + + @Option(name = "--tool", aliases = { + "-t" }, metaVar = "metaVar_tool", usage = "usage_ToolForDiff") + private String toolName; + + @Option(name = "--cached", aliases = { "--staged" }, usage = "usage_cached") + private boolean cached; + + private BooleanTriState prompt = BooleanTriState.UNSET; + + @Option(name = "--prompt", usage = "usage_prompt") + void setPrompt(@SuppressWarnings("unused") boolean on) { + prompt = BooleanTriState.TRUE; + } + + @Option(name = "--no-prompt", aliases = { "-y" }, usage = "usage_noPrompt") + void noPrompt(@SuppressWarnings("unused") boolean on) { + prompt = BooleanTriState.FALSE; + } + + @Option(name = "--tool-help", usage = "usage_toolHelp") + private boolean toolHelp; + + private BooleanTriState gui = BooleanTriState.UNSET; + + @Option(name = "--gui", aliases = { "-g" }, usage = "usage_DiffGuiTool") + void setGui(@SuppressWarnings("unused") boolean on) { + gui = BooleanTriState.TRUE; + } + + @Option(name = "--no-gui", usage = "usage_noGui") + void noGui(@SuppressWarnings("unused") boolean on) { + gui = BooleanTriState.FALSE; + } + + private BooleanTriState trustExitCode = BooleanTriState.UNSET; + + @Option(name = "--trust-exit-code", usage = "usage_trustExitCode") + void setTrustExitCode(@SuppressWarnings("unused") boolean on) { + trustExitCode = BooleanTriState.TRUE; + } + + @Option(name = "--no-trust-exit-code", usage = "usage_noTrustExitCode") + void noTrustExitCode(@SuppressWarnings("unused") boolean on) { + trustExitCode = BooleanTriState.FALSE; + } + + @Option(name = "--", metaVar = "metaVar_paths", handler = PathTreeFilterHandler.class) + private TreeFilter pathFilter = TreeFilter.ALL; + + @Override + protected void init(Repository repository, String gitDir) { + super.init(repository, gitDir); + diffFmt = new DiffFormatter(new BufferedOutputStream(outs)); + diffTools = new DiffTools(repository); + } + + @Override + protected void run() { + try { + if (toolHelp) { + showToolHelp(); + } else { + boolean showPrompt = diffTools.isInteractive(); + if (prompt != BooleanTriState.UNSET) { + showPrompt = prompt == BooleanTriState.TRUE; + } + String toolNamePrompt = toolName; + if (showPrompt) { + if (StringUtils.isEmptyOrNull(toolNamePrompt)) { + toolNamePrompt = diffTools.getDefaultToolName(gui); + } + } + // get the changed files + List<DiffEntry> files = getFiles(); + if (files.size() > 0) { + compare(files, showPrompt, toolNamePrompt); + } + } + outw.flush(); + } catch (RevisionSyntaxException | IOException e) { + throw die(e.getMessage(), e); + } finally { + diffFmt.close(); + } + } + + private void compare(List<DiffEntry> files, boolean showPrompt, + String toolNamePrompt) throws IOException { + for (int fileIndex = 0; fileIndex < files.size(); fileIndex++) { + DiffEntry ent = files.get(fileIndex); + String mergedFilePath = ent.getNewPath(); + if (mergedFilePath.equals(DiffEntry.DEV_NULL)) { + mergedFilePath = ent.getOldPath(); + } + // check if user wants to launch compare + boolean launchCompare = true; + if (showPrompt) { + launchCompare = isLaunchCompare(fileIndex + 1, files.size(), + mergedFilePath, toolNamePrompt); + } + if (launchCompare) { + switch (ent.getChangeType()) { + case MODIFY: + outw.println("M\t" + ent.getNewPath() //$NON-NLS-1$ + + " (" + ent.getNewId().name() + ")" //$NON-NLS-1$ //$NON-NLS-2$ + + "\t" + ent.getOldPath() //$NON-NLS-1$ + + " (" + ent.getOldId().name() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + int ret = diffTools.compare(ent.getNewPath(), + ent.getOldPath(), ent.getNewId().name(), + ent.getOldId().name(), toolName, prompt, gui, + trustExitCode); + if (ret != 0) { + throw die(MessageFormat.format( + CLIText.get().diffToolDied, mergedFilePath)); + } + break; + default: + break; + } + } else { + break; + } + } + } + + @SuppressWarnings("boxing") + private boolean isLaunchCompare(int fileIndex, int fileCount, + String fileName, String toolNamePrompt) throws IOException { + boolean launchCompare = true; + outw.println(MessageFormat.format(CLIText.get().diffToolLaunch, + fileIndex, fileCount, fileName, toolNamePrompt)); + outw.flush(); + BufferedReader br = new BufferedReader(new InputStreamReader(ins)); + String line = null; + if ((line = br.readLine()) != null) { + if (!line.equalsIgnoreCase("Y")) { //$NON-NLS-1$ + launchCompare = false; + } + } + return launchCompare; + } + + private void showToolHelp() throws IOException { + StringBuilder availableToolNames = new StringBuilder(); + for (String name : diffTools.getAvailableTools().keySet()) { + availableToolNames.append(String.format("\t\t%s\n", name)); //$NON-NLS-1$ + } + StringBuilder notAvailableToolNames = new StringBuilder(); + for (String name : diffTools.getNotAvailableTools().keySet()) { + notAvailableToolNames.append(String.format("\t\t%s\n", name)); //$NON-NLS-1$ + } + StringBuilder userToolNames = new StringBuilder(); + Map<String, ExternalDiffTool> userTools = diffTools + .getUserDefinedTools(); + for (String name : userTools.keySet()) { + userToolNames.append(String.format("\t\t%s.cmd %s\n", //$NON-NLS-1$ + name, userTools.get(name).getCommand())); + } + outw.println(MessageFormat.format( + CLIText.get().diffToolHelpSetToFollowing, availableToolNames, + userToolNames, notAvailableToolNames)); + } + + private List<DiffEntry> getFiles() + throws RevisionSyntaxException, AmbiguousObjectException, + IncorrectObjectTypeException, IOException { + diffFmt.setRepository(db); + if (cached) { + if (oldTree == null) { + ObjectId head = db.resolve(HEAD + "^{tree}"); //$NON-NLS-1$ + if (head == null) { + die(MessageFormat.format(CLIText.get().notATree, HEAD)); + } + CanonicalTreeParser p = new CanonicalTreeParser(); + try (ObjectReader reader = db.newObjectReader()) { + p.reset(reader, head); + } + oldTree = p; + } + newTree = new DirCacheIterator(db.readDirCache()); + } else if (oldTree == null) { + oldTree = new DirCacheIterator(db.readDirCache()); + newTree = new FileTreeIterator(db); + } else if (newTree == null) { + newTree = new FileTreeIterator(db); + } + + TextProgressMonitor pm = new TextProgressMonitor(errw); + pm.setDelayStart(2, TimeUnit.SECONDS); + diffFmt.setProgressMonitor(pm); + diffFmt.setPathFilter(pathFilter); + + List<DiffEntry> files = diffFmt.scan(oldTree, newTree); + return files; + } + +} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java index 8e49a76a33..7fe5b0fa45 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java @@ -136,6 +136,9 @@ public class CLIText extends TranslationBundle { /***/ public String dateInfo; /***/ public String deletedBranch; /***/ public String deletedRemoteBranch; + /***/ public String diffToolHelpSetToFollowing; + /***/ public String diffToolLaunch; + /***/ public String diffToolDied; /***/ public String doesNotExist; /***/ public String dontOverwriteLocalChanges; /***/ public String everythingUpToDate; diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 3fd0f528bb..df97e3a1ca 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.0.1,6.1.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.1.0,6.2.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.transport.sshd;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.0.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.1.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 808de5359e..3fae07b9de 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 1bd3fad485..848d22fd52 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache.agent</artifactId> diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 8ff9735f47..df99ea3cfd 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -21,16 +21,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", org.apache.sshd.core;version="[2.7.0,2.8.0)", org.apache.sshd.server;version="[2.7.0,2.8.0)", org.apache.sshd.server.forward;version="[2.7.0,2.8.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit.ssh;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.sshd;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit.ssh;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.sshd;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index a88ddafc45..55a975188b 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache.test</artifactId> diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 81e01ccadc..d874c73bc9 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.0.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.1.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,17 +23,17 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.0.1";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="6.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="6.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="6.0.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="6.0.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="6.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="6.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="6.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="6.0.1" + org.eclipse.jgit.transport.sshd.agent;version="6.1.0" Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.7.0,2.8.0)", org.apache.sshd.client;version="[2.7.0,2.8.0)", @@ -83,12 +83,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.7.0,2.8.0)", org.apache.sshd.sftp.client;version="[2.7.0,2.8.0)", org.apache.sshd.sftp.common;version="[2.7.0,2.8.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.fnmatch;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.fnmatch;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index b770b90344..3de224288a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 340cca158d..ea17425124 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.apache</artifactId> diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 52e69bd6e2..d2bf04752a 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,18 +3,18 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit.ssh;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit.ssh;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 6f199e679b..c1e522a9a8 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId> diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index ed997fb5cd..3c53d4f625 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[6.0.1,6.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.1.0,6.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.0.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.io;version="[6.1.0,6.2.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 3c3f2b153e..817e0aa177 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 2a5f9b8dfe..62d363adc5 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ssh.jsch</artifactId> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 0469113443..95c03a0a4a 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -16,60 +16,61 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api;version="[6.0.1,6.1.0)", - org.eclipse.jgit.api.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.archive;version="[6.0.1,6.1.0)", - org.eclipse.jgit.attributes;version="[6.0.1,6.1.0)", - org.eclipse.jgit.awtui;version="[6.0.1,6.1.0)", - org.eclipse.jgit.blame;version="[6.0.1,6.1.0)", - org.eclipse.jgit.diff;version="[6.0.1,6.1.0)", - org.eclipse.jgit.dircache;version="[6.0.1,6.1.0)", - org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.events;version="[6.0.1,6.1.0)", - org.eclipse.jgit.fnmatch;version="[6.0.1,6.1.0)", - org.eclipse.jgit.gitrepo;version="[6.0.1,6.1.0)", - org.eclipse.jgit.hooks;version="[6.0.1,6.1.0)", - org.eclipse.jgit.ignore;version="[6.0.1,6.1.0)", - org.eclipse.jgit.ignore.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.fsck;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.io;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.0.1,6.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit;version="[6.0.1,6.1.0)", - org.eclipse.jgit.junit.time;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lfs;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.logging;version="[6.0.1,6.1.0)", - org.eclipse.jgit.merge;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.notes;version="[6.0.1,6.1.0)", - org.eclipse.jgit.patch;version="[6.0.1,6.1.0)", - org.eclipse.jgit.pgm;version="[6.0.1,6.1.0)", - org.eclipse.jgit.pgm.internal;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revplot;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.file;version="[6.0.1,6.1.0)", - org.eclipse.jgit.storage.pack;version="[6.0.1,6.1.0)", - org.eclipse.jgit.submodule;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.http;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport.resolver;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.treewalk.filter;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.io;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util.sha1;version="[6.0.1,6.1.0)", + org.eclipse.jgit.annotations;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api;version="[6.1.0,6.2.0)", + org.eclipse.jgit.api.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.archive;version="[6.1.0,6.2.0)", + org.eclipse.jgit.attributes;version="[6.1.0,6.2.0)", + org.eclipse.jgit.awtui;version="[6.1.0,6.2.0)", + org.eclipse.jgit.blame;version="[6.1.0,6.2.0)", + org.eclipse.jgit.diff;version="[6.1.0,6.2.0)", + org.eclipse.jgit.dircache;version="[6.1.0,6.2.0)", + org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.events;version="[6.1.0,6.2.0)", + org.eclipse.jgit.fnmatch;version="[6.1.0,6.2.0)", + org.eclipse.jgit.gitrepo;version="[6.1.0,6.2.0)", + org.eclipse.jgit.hooks;version="[6.1.0,6.2.0)", + org.eclipse.jgit.ignore;version="[6.1.0,6.2.0)", + org.eclipse.jgit.ignore.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.fsck;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.io;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[6.1.0,6.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit;version="[6.1.0,6.2.0)", + org.eclipse.jgit.junit.time;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lfs;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.logging;version="[6.1.0,6.2.0)", + org.eclipse.jgit.merge;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.notes;version="[6.1.0,6.2.0)", + org.eclipse.jgit.patch;version="[6.1.0,6.2.0)", + org.eclipse.jgit.pgm;version="[6.1.0,6.2.0)", + org.eclipse.jgit.pgm.internal;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revplot;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.file;version="[6.1.0,6.2.0)", + org.eclipse.jgit.storage.pack;version="[6.1.0,6.2.0)", + org.eclipse.jgit.submodule;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.http;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport.resolver;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.treewalk.filter;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.io;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util.sha1;version="[6.1.0,6.2.0)", org.hamcrest;version="[1.1.0,3.0.0)", org.hamcrest.collection;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 3cab362f3e..29fd8d4dce 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java new file mode 100644 index 0000000000..b141a86f76 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalDiffToolTest.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2020-2021, Simeon Andreev <simeon.danailov.andreev@gmail.com> and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.diffmergetool; + +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DIFFTOOL_SECTION; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CMD; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_GUITOOL; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PATH; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PROMPT; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_TRUST_EXIT_CODE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; + +import org.eclipse.jgit.lib.internal.BooleanTriState; +import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.junit.Test; + +/** + * Testing external diff tools. + */ +public class ExternalDiffToolTest extends ExternalToolTest { + + @Test + public void testToolNames() { + DiffTools manager = new DiffTools(db); + Set<String> actualToolNames = manager.getToolNames(); + Set<String> expectedToolNames = Collections.emptySet(); + assertEquals("Incorrect set of external diff tool names", + expectedToolNames, actualToolNames); + } + + @Test + public void testAllTools() { + DiffTools manager = new DiffTools(db); + Set<String> actualToolNames = manager.getAvailableTools().keySet(); + Set<String> expectedToolNames = new LinkedHashSet<>(); + CommandLineDiffTool[] defaultTools = CommandLineDiffTool.values(); + for (CommandLineDiffTool defaultTool : defaultTools) { + String toolName = defaultTool.name(); + expectedToolNames.add(toolName); + } + assertEquals("Incorrect set of external diff tools", expectedToolNames, + actualToolNames); + } + + @Test + public void testOverridePredefinedToolPath() { + String toolName = CommandLineDiffTool.guiffy.name(); + String customToolPath = "/usr/bin/echo"; + + FileBasedConfig config = db.getConfig(); + config.setString(CONFIG_DIFFTOOL_SECTION, toolName, CONFIG_KEY_CMD, + "echo"); + config.setString(CONFIG_DIFFTOOL_SECTION, toolName, CONFIG_KEY_PATH, + customToolPath); + + DiffTools manager = new DiffTools(db); + Map<String, ExternalDiffTool> tools = manager.getUserDefinedTools(); + ExternalDiffTool diffTool = tools.get(toolName); + assertNotNull("Expected tool \"" + toolName + "\" to be user defined", + diffTool); + + String toolPath = diffTool.getPath(); + assertEquals("Expected external diff tool to have an overriden path", + customToolPath, toolPath); + } + + @Test + public void testUserDefinedTools() { + FileBasedConfig config = db.getConfig(); + String customToolname = "customTool"; + config.setString(CONFIG_DIFFTOOL_SECTION, customToolname, + CONFIG_KEY_CMD, "echo"); + config.setString(CONFIG_DIFFTOOL_SECTION, customToolname, + CONFIG_KEY_PATH, "/usr/bin/echo"); + config.setString(CONFIG_DIFFTOOL_SECTION, customToolname, + CONFIG_KEY_PROMPT, "--no-prompt"); + config.setString(CONFIG_DIFFTOOL_SECTION, customToolname, + CONFIG_KEY_GUITOOL, "--no-gui"); + config.setString(CONFIG_DIFFTOOL_SECTION, customToolname, + CONFIG_KEY_TRUST_EXIT_CODE, "--no-trust-exit-code"); + DiffTools manager = new DiffTools(db); + Set<String> actualToolNames = manager.getUserDefinedTools().keySet(); + Set<String> expectedToolNames = new LinkedHashSet<>(); + expectedToolNames.add(customToolname); + assertEquals("Incorrect set of external diff tools", expectedToolNames, + actualToolNames); + } + + @Test + public void testNotAvailableTools() { + DiffTools manager = new DiffTools(db); + Set<String> actualToolNames = manager.getNotAvailableTools().keySet(); + Set<String> expectedToolNames = Collections.emptySet(); + assertEquals("Incorrect set of not available external diff tools", + expectedToolNames, actualToolNames); + } + + @Test + public void testCompare() { + DiffTools manager = new DiffTools(db); + + String newPath = ""; + String oldPath = ""; + String newId = ""; + String oldId = ""; + String toolName = ""; + BooleanTriState prompt = BooleanTriState.UNSET; + BooleanTriState gui = BooleanTriState.UNSET; + BooleanTriState trustExitCode = BooleanTriState.UNSET; + + int expectedCompareResult = 0; + int compareResult = manager.compare(newPath, oldPath, newId, oldId, + toolName, prompt, gui, trustExitCode); + assertEquals("Incorrect compare result for external diff tool", + expectedCompareResult, compareResult); + } + + @Test + public void testDefaultTool() throws Exception { + FileBasedConfig config = db.getConfig(); + // the default diff tool is configured without a subsection + String subsection = null; + config.setString("diff", subsection, "tool", "customTool"); + + DiffTools manager = new DiffTools(db); + BooleanTriState gui = BooleanTriState.UNSET; + String defaultToolName = manager.getDefaultToolName(gui); + assertEquals( + "Expected configured difftool to be the default external diff tool", + "my_default_toolname", defaultToolName); + + gui = BooleanTriState.TRUE; + String defaultGuiToolName = manager.getDefaultToolName(gui); + assertEquals( + "Expected configured difftool to be the default external diff tool", + "my_gui_tool", defaultGuiToolName); + + config.setString("diff", subsection, "guitool", "customGuiTool"); + manager = new DiffTools(db); + defaultGuiToolName = manager.getDefaultToolName(gui); + assertEquals( + "Expected configured difftool to be the default external diff guitool", + "my_gui_tool", defaultGuiToolName); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalToolTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalToolTest.java new file mode 100644 index 0000000000..c7c8eca714 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/diffmergetool/ExternalToolTest.java @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2020-2021, Simeon Andreev <simeon.danailov.andreev@gmail.com> and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.diffmergetool; + +import java.io.File; +import java.nio.file.Files; + +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FS_POSIX; +import org.junit.After; +import org.junit.Assume; +import org.junit.Before; + +/** + * Base test case for external merge and diff tool tests. + */ +public abstract class ExternalToolTest extends RepositoryTestCase { + + protected static final String DEFAULT_CONTENT = "line1"; + + protected File localFile; + + protected File remoteFile; + + protected File mergedFile; + + protected File baseFile; + + protected File commandResult; + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + + localFile = writeTrashFile("localFile.txt", DEFAULT_CONTENT + "\n"); + localFile.deleteOnExit(); + remoteFile = writeTrashFile("remoteFile.txt", DEFAULT_CONTENT + "\n"); + remoteFile.deleteOnExit(); + mergedFile = writeTrashFile("mergedFile.txt", ""); + mergedFile.deleteOnExit(); + baseFile = writeTrashFile("baseFile.txt", ""); + baseFile.deleteOnExit(); + commandResult = writeTrashFile("commandResult.txt", ""); + commandResult.deleteOnExit(); + } + + @After + @Override + public void tearDown() throws Exception { + Files.delete(localFile.toPath()); + Files.delete(remoteFile.toPath()); + Files.delete(mergedFile.toPath()); + Files.delete(baseFile.toPath()); + Files.delete(commandResult.toPath()); + + super.tearDown(); + } + + + protected static void assumePosixPlatform() { + Assume.assumeTrue( + "This test can run only in Linux tests", + FS.DETECTED instanceof FS_POSIX); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java index 4f1314057f..070d666ee5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java @@ -290,6 +290,31 @@ public class DfsBlockCacheTest { assertEquals(1, cache.getMissCount()[0]); } + @SuppressWarnings("resource") + @Test + public void highConcurrencyParallelReads_oneRepoParallelReverseIndex() + throws Exception { + InMemoryRepository r1 = createRepoWithBitmap("test"); + resetCache(); + + DfsReader reader = (DfsReader) r1.newObjectReader(); + reader.getOptions().setLoadRevIndexInParallel(true); + for (DfsPackFile pack : r1.getObjectDatabase().getPacks()) { + // Only load non-garbage pack with bitmap. + if (pack.isGarbage()) { + continue; + } + asyncRun(() -> pack.getBitmapIndex(reader)); + asyncRun(() -> pack.getPackIndex(reader)); + asyncRun(() -> pack.getBitmapIndex(reader)); + } + waitForExecutorPoolTermination(); + + assertEquals(1, cache.getMissCount()[PackExt.BITMAP_INDEX.ordinal()]); + assertEquals(1, cache.getMissCount()[PackExt.INDEX.ordinal()]); + assertEquals(1, cache.getMissCount()[0]); + } + private void resetCache() { resetCache(32); } diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 57a8bee99a..14511cd6ab 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.awtui;version="6.0.1" -Import-Package: org.eclipse.jgit.errors;version="[6.0.1,6.1.0)", - org.eclipse.jgit.lib;version="[6.0.1,6.1.0)", - org.eclipse.jgit.nls;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revplot;version="[6.0.1,6.1.0)", - org.eclipse.jgit.revwalk;version="[6.0.1,6.1.0)", - org.eclipse.jgit.transport;version="[6.0.1,6.1.0)", - org.eclipse.jgit.util;version="[6.0.1,6.1.0)" +Export-Package: org.eclipse.jgit.awtui;version="6.1.0" +Import-Package: org.eclipse.jgit.errors;version="[6.1.0,6.2.0)", + org.eclipse.jgit.lib;version="[6.1.0,6.2.0)", + org.eclipse.jgit.nls;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revplot;version="[6.1.0,6.2.0)", + org.eclipse.jgit.revwalk;version="[6.1.0,6.2.0)", + org.eclipse.jgit.transport;version="[6.1.0,6.2.0)", + org.eclipse.jgit.util;version="[6.1.0,6.2.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 335c15766b..3128bcd83e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index c4a3e2a587..2dd9c80ec3 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index e9bb78daa8..91e905b2ff 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.0.1.qualifier +Bundle-Version: 6.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="6.0.1", - org.eclipse.jgit.api;version="6.0.1"; +Export-Package: org.eclipse.jgit.annotations;version="6.1.0", + org.eclipse.jgit.api;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="6.0.1"; + org.eclipse.jgit.api.errors;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="6.0.1"; + org.eclipse.jgit.attributes;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="6.0.1"; + org.eclipse.jgit.blame;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="6.0.1"; + org.eclipse.jgit.diff;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -42,44 +42,48 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="6.0.1"; + org.eclipse.jgit.dircache;version="6.1.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="6.0.1"; + org.eclipse.jgit.errors;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="6.0.1"; + org.eclipse.jgit.events;version="6.1.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="6.0.1", - org.eclipse.jgit.gitrepo;version="6.0.1"; + org.eclipse.jgit.fnmatch;version="6.1.0", + org.eclipse.jgit.gitrepo;version="6.1.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="6.0.1";x-internal:=true, - org.eclipse.jgit.hooks;version="6.0.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="6.0.1", - org.eclipse.jgit.ignore.internal;version="6.0.1"; + org.eclipse.jgit.gitrepo.internal;version="6.1.0";x-internal:=true, + org.eclipse.jgit.hooks;version="6.1.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="6.1.0", + org.eclipse.jgit.ignore.internal;version="6.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="6.0.1"; + org.eclipse.jgit.internal;version="6.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.fsck;version="6.0.1"; + org.eclipse.jgit.internal.diffmergetool;version="6.1.0"; + x-friends:="org.eclipse.jgit.test, + org.eclipse.jgit.pgm.test, + org.eclipse.jgit.pgm", + org.eclipse.jgit.internal.fsck;version="6.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="6.0.1"; + org.eclipse.jgit.internal.revwalk;version="6.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="6.0.1"; + org.eclipse.jgit.internal.storage.dfs;version="6.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="6.0.1"; + org.eclipse.jgit.internal.storage.file;version="6.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -88,32 +92,32 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="6.0.1"; + org.eclipse.jgit.internal.storage.io;version="6.1.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.pack;version="6.0.1"; + org.eclipse.jgit.internal.storage.pack;version="6.1.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="6.0.1"; + org.eclipse.jgit.internal.storage.reftable;version="6.1.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="6.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="6.0.1"; + org.eclipse.jgit.internal.submodule;version="6.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="6.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="6.0.1"; + org.eclipse.jgit.internal.transport.http;version="6.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="6.0.1"; + org.eclipse.jgit.internal.transport.parser;version="6.1.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="6.0.1"; + org.eclipse.jgit.internal.transport.ssh;version="6.1.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.lib;version="6.0.1"; + org.eclipse.jgit.lib;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -127,10 +131,10 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="6.0.1"; + org.eclipse.jgit.lib.internal;version="6.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.logging;version="6.0.1", - org.eclipse.jgit.merge;version="6.0.1"; + org.eclipse.jgit.logging;version="6.1.0", + org.eclipse.jgit.merge;version="6.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -139,40 +143,40 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="6.0.1", - org.eclipse.jgit.notes;version="6.0.1"; + org.eclipse.jgit.nls;version="6.1.0", + org.eclipse.jgit.notes;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="6.0.1"; + org.eclipse.jgit.patch;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="6.0.1"; + org.eclipse.jgit.revplot;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="6.0.1"; + org.eclipse.jgit.revwalk;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="6.0.1"; + org.eclipse.jgit.revwalk.filter;version="6.1.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="6.0.1"; + org.eclipse.jgit.storage.file;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="6.0.1"; + org.eclipse.jgit.storage.pack;version="6.1.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="6.0.1"; + org.eclipse.jgit.submodule;version="6.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="6.0.1"; + org.eclipse.jgit.transport;version="6.1.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -185,21 +189,21 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="6.0.1"; + org.eclipse.jgit.transport.http;version="6.1.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="6.0.1"; + org.eclipse.jgit.transport.resolver;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="6.0.1"; + org.eclipse.jgit.treewalk;version="6.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="6.0.1"; + org.eclipse.jgit.treewalk.filter;version="6.1.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="6.0.1"; + org.eclipse.jgit.util;version="6.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -212,12 +216,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="6.0.1"; + org.eclipse.jgit.util.io;version="6.1.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="6.0.1", - org.eclipse.jgit.util.time;version="6.0.1" + org.eclipse.jgit.util.sha1;version="6.1.0", + org.eclipse.jgit.util.time;version="6.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 302c4548a3..99e5acd68a 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="6.0.1.qualifier";roots="." +Bundle-Version: 6.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="6.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e78227250f..d3501715c8 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineDiffTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineDiffTool.java new file mode 100644 index 0000000000..509515c37a --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/CommandLineDiffTool.java @@ -0,0 +1,221 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +/** + * Pre-defined command line diff tools. + * + * Adds same diff tools as also pre-defined in C-Git + * <p> + * see "git-core\mergetools\" + * </p> + * <p> + * see links to command line parameter description for the tools + * </p> + * + * <pre> + * araxis + * bc + * bc3 + * codecompare + * deltawalker + * diffmerge + * diffuse + * ecmerge + * emerge + * examdiff + * guiffy + * gvimdiff + * gvimdiff2 + * gvimdiff3 + * kdiff3 + * kompare + * meld + * opendiff + * p4merge + * tkdiff + * vimdiff + * vimdiff2 + * vimdiff3 + * winmerge + * xxdiff + * </pre> + * + */ +@SuppressWarnings("nls") +public enum CommandLineDiffTool { + /** + * See: <a href= + * "https://www.araxis.com/merge/documentation-windows/command-line.en">https://www.araxis.com/merge/documentation-windows/command-line.en</a> + */ + araxis("compare", "-wait -2 \"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://www.scootersoftware.com/v4help/index.html?command_line_reference.html">https://www.scootersoftware.com/v4help/index.html?command_line_reference.html</a> + */ + bc("bcomp", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://www.scootersoftware.com/v4help/index.html?command_line_reference.html">https://www.scootersoftware.com/v4help/index.html?command_line_reference.html</a> + */ + bc3("bcompare", bc), + /** + * See: <a href= + * "https://www.devart.com/codecompare/docs/index.html?comparing_via_command_line.htm">https://www.devart.com/codecompare/docs/index.html?comparing_via_command_line.htm</a> + */ + codecompare("CodeCompare", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://www.deltawalker.com/integrate/command-line">https://www.deltawalker.com/integrate/command-line</a> + */ + deltawalker("DeltaWalker", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html">https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html</a> + */ + diffmerge("diffmerge", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://diffuse.sourceforge.net/manual.html#introduction-usage">http://diffuse.sourceforge.net/manual.html#introduction-usage</a> + */ + diffuse("diffuse", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://www.elliecomputing.com/en/OnlineDoc/ecmerge_en/44205167.asp">http://www.elliecomputing.com/en/OnlineDoc/ecmerge_en/44205167.asp</a> + */ + ecmerge("ecmerge", "--default --mode=diff2 \"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://www.gnu.org/software/emacs/manual/html_node/emacs/Overview-of-Emerge.html">https://www.gnu.org/software/emacs/manual/html_node/emacs/Overview-of-Emerge.html</a> + */ + emerge("emacs", "-f emerge-files-command \"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://www.prestosoft.com/ps.asp?page=htmlhelp/edp/command_line_options">https://www.prestosoft.com/ps.asp?page=htmlhelp/edp/command_line_options</a> + */ + examdiff("ExamDiff", "\"$LOCAL\" \"$REMOTE\" -nh"), + /** + * See: <a href= + * "https://www.guiffy.com/help/GuiffyHelp/GuiffyCmd.html">https://www.guiffy.com/help/GuiffyHelp/GuiffyCmd.html</a> + */ + guiffy("guiffy", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://vimdoc.sourceforge.net/htmldoc/diff.html">http://vimdoc.sourceforge.net/htmldoc/diff.html</a> + */ + gvimdiff("gviewdiff", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://vimdoc.sourceforge.net/htmldoc/diff.html">http://vimdoc.sourceforge.net/htmldoc/diff.html</a> + */ + gvimdiff2(gvimdiff), + /** + * See: <a href= + * "http://vimdoc.sourceforge.net/htmldoc/diff.html">http://vimdoc.sourceforge.net/htmldoc/diff.html</a> + */ + gvimdiff3(gvimdiff), + /** + * See: <a href= + * "http://kdiff3.sourceforge.net/doc/documentation.html">http://kdiff3.sourceforge.net/doc/documentation.html</a> + */ + kdiff3("kdiff3", + "--L1 \"$MERGED (A)\" --L2 \"$MERGED (B)\" \"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://docs.kde.org/trunk5/en/kdesdk/kompare/commandline-options.html">https://docs.kde.org/trunk5/en/kdesdk/kompare/commandline-options.html</a> + */ + kompare("kompare", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "ttp://meldmerge.org/help/file-mode.html">http://meldmerge.org/help/file-mode.html</a> + */ + meld("meld", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://www.manpagez.com/man/1/opendiff/">http://www.manpagez.com/man/1/opendiff/</a> + * <p> + * Hint: check the ' | cat' for the call + * </p> + */ + opendiff("opendiff", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "https://www.perforce.com/manuals/v15.1/cmdref/p4_merge.html">https://www.perforce.com/manuals/v15.1/cmdref/p4_merge.html</a> + */ + p4merge("p4merge", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://linux.math.tifr.res.in/manuals/man/tkdiff.html">http://linux.math.tifr.res.in/manuals/man/tkdiff.html</a> + */ + tkdiff("tkdiff", "\"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://vimdoc.sourceforge.net/htmldoc/diff.html">http://vimdoc.sourceforge.net/htmldoc/diff.html</a> + */ + vimdiff("viewdiff", gvimdiff), + /** + * See: <a href= + * "http://vimdoc.sourceforge.net/htmldoc/diff.html">http://vimdoc.sourceforge.net/htmldoc/diff.html</a> + */ + vimdiff2(vimdiff), + /** + * See: <a href= + * "http://vimdoc.sourceforge.net/htmldoc/diff.html">http://vimdoc.sourceforge.net/htmldoc/diff.html</a> + */ + vimdiff3(vimdiff), + /** + * See: <a href= + * "http://manual.winmerge.org/Command_line.html">http://manual.winmerge.org/Command_line.html</a> + * <p> + * Hint: check how 'mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"' + * works + * </p> + */ + winmerge("WinMergeU", "-u -e \"$LOCAL\" \"$REMOTE\""), + /** + * See: <a href= + * "http://furius.ca/xxdiff/doc/xxdiff-doc.html">http://furius.ca/xxdiff/doc/xxdiff-doc.html</a> + */ + xxdiff("xxdiff", + "-R 'Accel.Search: \"Ctrl+F\"' -R 'Accel.SearchForward: \"Ctrl+G\"' \"$LOCAL\" \"$REMOTE\""); + + CommandLineDiffTool(String path, String parameters) { + this.path = path; + this.parameters = parameters; + } + + CommandLineDiffTool(CommandLineDiffTool from) { + this(from.getPath(), from.getParameters()); + } + + CommandLineDiffTool(String path, CommandLineDiffTool from) { + this(path, from.getParameters()); + } + + private final String path; + + private final String parameters; + + /** + * @return path + */ + public String getPath() { + return path; + } + + /** + * @return parameters as one string + */ + public String getParameters() { + return parameters; + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffToolConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffToolConfig.java new file mode 100644 index 0000000000..551f634f2d --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffToolConfig.java @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DIFFTOOL_SECTION; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DIFF_SECTION; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CMD; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_GUITOOL; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PATH; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PROMPT; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_TOOL; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_TRUST_EXIT_CODE; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Config.SectionParser; +import org.eclipse.jgit.lib.internal.BooleanTriState; + +/** + * Keeps track of difftool related configuration options. + */ +public class DiffToolConfig { + + /** Key for {@link Config#get(SectionParser)}. */ + public static final Config.SectionParser<DiffToolConfig> KEY = DiffToolConfig::new; + + private final String toolName; + + private final String guiToolName; + + private final boolean prompt; + + private final BooleanTriState trustExitCode; + + private final Map<String, ExternalDiffTool> tools; + + private DiffToolConfig(Config rc) { + toolName = rc.getString(CONFIG_DIFF_SECTION, null, CONFIG_KEY_TOOL); + guiToolName = rc.getString(CONFIG_DIFF_SECTION, null, + CONFIG_KEY_GUITOOL); + prompt = rc.getBoolean(CONFIG_DIFFTOOL_SECTION, CONFIG_KEY_PROMPT, + true); + String trustStr = rc.getString(CONFIG_DIFFTOOL_SECTION, null, + CONFIG_KEY_TRUST_EXIT_CODE); + if (trustStr != null) { + trustExitCode = Boolean.parseBoolean(trustStr) + ? BooleanTriState.TRUE + : BooleanTriState.FALSE; + } else { + trustExitCode = BooleanTriState.UNSET; + } + tools = new HashMap<>(); + Set<String> subsections = rc.getSubsections(CONFIG_DIFFTOOL_SECTION); + for (String name : subsections) { + String cmd = rc.getString(CONFIG_DIFFTOOL_SECTION, name, + CONFIG_KEY_CMD); + String path = rc.getString(CONFIG_DIFFTOOL_SECTION, name, + CONFIG_KEY_PATH); + if ((cmd != null) || (path != null)) { + tools.put(name, new UserDefinedDiffTool(name, path, cmd)); + } + } + } + + /** + * @return the default diff tool name (diff.tool) + */ + public String getDefaultToolName() { + return toolName; + } + + /** + * @return the default GUI diff tool name (diff.guitool) + */ + public String getDefaultGuiToolName() { + return guiToolName; + } + + /** + * @return the diff tool "prompt" option (difftool.prompt) + */ + public boolean isPrompt() { + return prompt; + } + + /** + * @return the diff tool "trust exit code" option (difftool.trustExitCode) + */ + public boolean isTrustExitCode() { + return trustExitCode == BooleanTriState.TRUE; + } + + /** + * @return the tools map + */ + public Map<String, ExternalDiffTool> getTools() { + return tools; + } + + /** + * @return the tool names + */ + public Set<String> getToolNames() { + return tools.keySet(); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java new file mode 100644 index 0000000000..39729a4eec --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/DiffTools.java @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +import java.util.TreeMap; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.internal.BooleanTriState; + +/** + * Manages diff tools. + */ +public class DiffTools { + + private final DiffToolConfig config; + + private Map<String, ExternalDiffTool> predefinedTools; + + private Map<String, ExternalDiffTool> userDefinedTools; + + /** + * Creates the external diff-tools manager for given repository. + * + * @param repo + * the repository + */ + public DiffTools(Repository repo) { + config = repo.getConfig().get(DiffToolConfig.KEY); + setupPredefinedTools(); + setupUserDefinedTools(); + } + + /** + * Compare two versions of a file. + * + * @param newPath + * the new file path + * @param oldPath + * the old file path + * @param newId + * the new object ID + * @param oldId + * the old object ID + * @param toolName + * the selected tool name (can be null) + * @param prompt + * the prompt option + * @param gui + * the GUI option + * @param trustExitCode + * the "trust exit code" option + * @return the return code from executed tool + */ + public int compare(String newPath, String oldPath, String newId, + String oldId, String toolName, BooleanTriState prompt, + BooleanTriState gui, BooleanTriState trustExitCode) { + return 0; + } + + /** + * @return the tool names + */ + public Set<String> getToolNames() { + return config.getToolNames(); + } + + /** + * @return the user defined tools + */ + public Map<String, ExternalDiffTool> getUserDefinedTools() { + return Collections.unmodifiableMap(userDefinedTools); + } + + /** + * @return the available predefined tools + */ + public Map<String, ExternalDiffTool> getAvailableTools() { + return Collections.unmodifiableMap(predefinedTools); + } + + /** + * @return the NOT available predefined tools + */ + public Map<String, ExternalDiffTool> getNotAvailableTools() { + return Collections.unmodifiableMap(new TreeMap<>()); + } + + /** + * @param gui + * use the diff.guitool setting ? + * @return the default tool name + */ + public String getDefaultToolName(BooleanTriState gui) { + return gui != BooleanTriState.UNSET ? "my_gui_tool" //$NON-NLS-1$ + : "my_default_toolname"; //$NON-NLS-1$ + } + + /** + * @return is interactive (config prompt enabled) ? + */ + public boolean isInteractive() { + return false; + } + + private void setupPredefinedTools() { + predefinedTools = new TreeMap<>(); + for (CommandLineDiffTool tool : CommandLineDiffTool.values()) { + predefinedTools.put(tool.name(), new PreDefinedDiffTool(tool)); + } + } + + private void setupUserDefinedTools() { + userDefinedTools = new TreeMap<>(); + Map<String, ExternalDiffTool> userTools = config.getTools(); + for (String name : userTools.keySet()) { + ExternalDiffTool userTool = userTools.get(name); + // if difftool.<name>.cmd is defined we have user defined tool + if (userTool.getCommand() != null) { + userDefinedTools.put(name, userTool); + } else if (userTool.getPath() != null) { + // if difftool.<name>.path is defined we just overload the path + // of predefined tool + PreDefinedDiffTool predefTool = (PreDefinedDiffTool) predefinedTools + .get(name); + if (predefTool != null) { + predefTool.setPath(userTool.getPath()); + } + } + } + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java new file mode 100644 index 0000000000..f2d7e828cb --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +/** + * The external tool interface. + */ +public interface ExternalDiffTool { + + /** + * @return the tool name + */ + String getName(); + + /** + * @return the tool path + */ + String getPath(); + + /** + * @return the tool command + */ + String getCommand(); + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/PreDefinedDiffTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/PreDefinedDiffTool.java new file mode 100644 index 0000000000..1c69fb4911 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/PreDefinedDiffTool.java @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +/** + * The pre-defined diff tool. + */ +public class PreDefinedDiffTool extends UserDefinedDiffTool { + + /** + * Create a pre-defined diff tool + * + * @param name + * the name + * @param path + * the path + * @param parameters + * the tool parameters as one string that is used together with + * path as command + */ + public PreDefinedDiffTool(String name, String path, String parameters) { + super(name, path, parameters); + } + + /** + * Creates the pre-defined diff tool + * + * @param tool + * the command line diff tool + * + */ + public PreDefinedDiffTool(CommandLineDiffTool tool) { + this(tool.name(), tool.getPath(), tool.getParameters()); + } + + /** + * @param path + */ + @Override + public void setPath(String path) { + // handling of spaces in path + if (path.contains(" ")) { //$NON-NLS-1$ + // add quotes before if needed + if (!path.startsWith("\"")) { //$NON-NLS-1$ + path = "\"" + path; //$NON-NLS-1$ + } + // add quotes after if needed + if (!path.endsWith("\"")) { //$NON-NLS-1$ + path = path + "\""; //$NON-NLS-1$ + } + } + super.setPath(path); + } + + /** + * {@inheritDoc} + * + * @return the concatenated path and command of the pre-defined diff tool + */ + @Override + public String getCommand() { + return getPath() + " " + super.getCommand(); //$NON-NLS-1$ + } + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedDiffTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedDiffTool.java new file mode 100644 index 0000000000..012296eb35 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/UserDefinedDiffTool.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.diffmergetool; + +/** + * The user-defined diff tool. + */ +public class UserDefinedDiffTool implements ExternalDiffTool { + + /** + * the diff tool name + */ + private final String name; + + /** + * the diff tool path + */ + private String path; + + /** + * the diff tool command + */ + private final String cmd; + + /** + * Creates the diff tool + * + * @param name + * the name + * @param path + * the path + * @param cmd + * the command + */ + public UserDefinedDiffTool(String name, String path, String cmd) { + this.name = name; + this.path = path; + this.cmd = cmd; + } + + /** + * @return the diff tool name + */ + @Override + public String getName() { + return name; + } + + /** + * The path of the diff tool. + * + * <p> + * The path to a pre-defined external diff tool can be overridden by + * specifying {@code difftool.<tool>.path} in a configuration file. + * </p> + * <p> + * For a user defined diff tool (that does not override a pre-defined diff + * tool), the path is ignored when invoking the tool. + * </p> + * + * @return the diff tool path + * + * @see <a href= + * "https://git-scm.com/docs/git-difftool">https://git-scm.com/docs/git-difftool</a> + */ + @Override + public String getPath() { + return path; + } + + /** + * The command of the diff tool. + * + * <p> + * A pre-defined external diff tool can be overridden using the tools name + * in a configuration file. The overwritten tool is then a user defined tool + * and the command of the diff tool is specified with + * {@code difftool.<tool>.cmd}. This command must work without prepending + * the value of {@link #getPath()} and can sometimes include tool + * parameters. + * </p> + * + * @return the diff tool command + * + * @see <a href= + * "https://git-scm.com/docs/git-difftool">https://git-scm.com/docs/git-difftool</a> + */ + @Override + public String getCommand() { + return cmd; + } + + /** + * Overrides the path for the given tool. Equivalent to setting + * {@code difftool.<tool>.path}. + * + * @param path + * the new diff tool path + * + * @see <a href= + * "https://git-scm.com/docs/git-difftool">https://git-scm.com/docs/git-difftool</a> + */ + public void setPath(String path) { + this.path = path; + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index bb76df1d5d..f7a2c94d48 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -1061,7 +1061,8 @@ public final class DfsPackFile extends BlockBasedFile { } in = new BufferedInputStream(in, bs); bmidx = PackBitmapIndex.read(in, () -> idx(ctx), - () -> getReverseIdx(ctx)); + () -> getReverseIdx(ctx), + ctx.getOptions().shouldLoadRevIndexInParallel()); } finally { size = rc.position(); ctx.stats.readBitmapIdxBytes += size; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java index 89de53460c..146f76167d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java @@ -34,6 +34,8 @@ public class DfsReaderOptions { private int streamPackBufferSize; + private boolean loadRevIndexInParallel; + /** * Create a default reader configuration. */ @@ -113,6 +115,28 @@ public class DfsReaderOptions { } /** + * Check if reverse index should be loaded in parallel. + * + * @return true if reverse index is loaded in parallel for bitmap index. + */ + public boolean shouldLoadRevIndexInParallel() { + return loadRevIndexInParallel; + } + + /** + * Enable (or disable) parallel loading of reverse index. + * + * @param loadRevIndexInParallel + * whether to load reverse index in parallel. + * @return {@code this} + */ + public DfsReaderOptions setLoadRevIndexInParallel( + boolean loadRevIndexInParallel) { + this.loadRevIndexInParallel = loadRevIndexInParallel; + return this; + } + + /** * Update properties by setting fields from the configuration. * <p> * If a property is not defined in the configuration, then it is left diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java index 8401f0718a..8fb17fcf21 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndex.java @@ -95,7 +95,7 @@ public abstract class PackBitmapIndex { */ public static PackBitmapIndex read(InputStream fd, PackIndex packIndex, PackReverseIndex reverseIndex) throws IOException { - return new PackBitmapIndexV1(fd, () -> packIndex, () -> reverseIndex); + return new PackBitmapIndexV1(fd, packIndex, reverseIndex); } /** @@ -114,6 +114,8 @@ public abstract class PackBitmapIndex { * @param reverseIndexSupplier * the supplier for pack reverse index for the corresponding pack * file. + * @param loadParallelRevIndex + * whether reverse index should be loaded in parallel * @return a copy of the index in-memory. * @throws java.io.IOException * the stream cannot be read. @@ -122,10 +124,11 @@ public abstract class PackBitmapIndex { */ public static PackBitmapIndex read(InputStream fd, SupplierWithIOException<PackIndex> packIndexSupplier, - SupplierWithIOException<PackReverseIndex> reverseIndexSupplier) + SupplierWithIOException<PackReverseIndex> reverseIndexSupplier, + boolean loadParallelRevIndex) throws IOException { return new PackBitmapIndexV1(fd, packIndexSupplier, - reverseIndexSupplier); + reverseIndexSupplier, loadParallelRevIndex); } /** Footer checksum applied on the bottom of the pack file. */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java index 6846e3bcad..21aba3e6a3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java @@ -17,6 +17,12 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.internal.JGitText; @@ -40,6 +46,23 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex { private static final int MAX_XOR_OFFSET = 126; + private static final ExecutorService executor = Executors + .newCachedThreadPool(new ThreadFactory() { + private final ThreadFactory baseFactory = Executors + .defaultThreadFactory(); + + private final AtomicInteger threadNumber = new AtomicInteger(0); + + @Override + public Thread newThread(Runnable runnable) { + Thread thread = baseFactory.newThread(runnable); + thread.setName("JGit-PackBitmapIndexV1-" //$NON-NLS-1$ + + threadNumber.getAndIncrement()); + thread.setDaemon(true); + return thread; + } + }); + private final PackIndex packIndex; private final PackReverseIndex reverseIndex; private final EWAHCompressedBitmap commits; @@ -49,15 +72,28 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex { private final ObjectIdOwnerMap<StoredBitmap> bitmaps; + PackBitmapIndexV1(final InputStream fd, PackIndex packIndex, + PackReverseIndex reverseIndex) throws IOException { + this(fd, () -> packIndex, () -> reverseIndex, false); + } + PackBitmapIndexV1(final InputStream fd, SupplierWithIOException<PackIndex> packIndexSupplier, - SupplierWithIOException<PackReverseIndex> reverseIndexSupplier) + SupplierWithIOException<PackReverseIndex> reverseIndexSupplier, + boolean loadParallelRevIndex) throws IOException { // An entry is object id, xor offset, flag byte, and a length encoded // bitmap. The object id is an int32 of the nth position sorted by name. super(new ObjectIdOwnerMap<StoredBitmap>()); this.bitmaps = getBitmaps(); + // Optionally start loading reverse index in parallel to loading bitmap + // from storage. + Future<PackReverseIndex> reverseIndexFuture = null; + if (loadParallelRevIndex) { + reverseIndexFuture = executor.submit(reverseIndexSupplier::get); + } + final byte[] scratch = new byte[32]; IO.readFully(fd, scratch, 0, scratch.length); @@ -164,7 +200,18 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex { bitmaps.add(sb); } - this.reverseIndex = reverseIndexSupplier.get(); + PackReverseIndex computedReverseIndex; + if (loadParallelRevIndex && reverseIndexFuture != null) { + try { + computedReverseIndex = reverseIndexFuture.get(); + } catch (InterruptedException | ExecutionException e) { + // Fallback to loading reverse index through a supplier. + computedReverseIndex = reverseIndexSupplier.get(); + } + } else { + computedReverseIndex = reverseIndexSupplier.get(); + } + this.reverseIndex = computedReverseIndex; } /** {@inheritDoc} */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 24eebc6a19..4b21e4be4e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -1,7 +1,8 @@ /* * Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com> * Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com> - * Copyright (C) 2012, 2020, Robin Rosenberg and others + * Copyright (C) 2012-2013, Robin Rosenberg + * Copyright (C) 2018-2021, Andre Bossert <andre.bossert@siemens.com> and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -29,6 +30,48 @@ public final class ConfigConstants { /** The "diff" section */ public static final String CONFIG_DIFF_SECTION = "diff"; + /** + * The "tool" key within "diff" section + * + * @since 6.1 + */ + public static final String CONFIG_KEY_TOOL = "tool"; + + /** + * The "guitool" key within "diff" section + * + * @since 6.1 + */ + public static final String CONFIG_KEY_GUITOOL = "guitool"; + + /** + * The "difftool" section + * + * @since 6.1 + */ + public static final String CONFIG_DIFFTOOL_SECTION = "difftool"; + + /** + * The "prompt" key within "difftool" section + * + * @since 6.1 + */ + public static final String CONFIG_KEY_PROMPT = "prompt"; + + /** + * The "trustExitCode" key within "difftool" section + * + * @since 6.1 + */ + public static final String CONFIG_KEY_TRUST_EXIT_CODE = "trustExitCode"; + + /** + * The "cmd" key within "difftool.*." section + * + * @since 6.1 + */ + public static final String CONFIG_KEY_CMD = "cmd"; + /** The "dfs" section */ public static final String CONFIG_DFS_SECTION = "dfs"; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BooleanTriState.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BooleanTriState.java new file mode 100644 index 0000000000..44d3bb36e0 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BooleanTriState.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2021 Simeon Andreev <simeon.danailov.andreev@gmail.com> and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib.internal; + +/** + * A boolean value that can also have an unset state. + */ +public enum BooleanTriState { + /** + * Value equivalent to {@code true}. + */ + TRUE, + /** + * Value equivalent to {@code false}. + */ + FALSE, + /** + * Value is not set. + */ + UNSET; +} @@ -18,7 +18,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>6.0.1-SNAPSHOT</version> + <version>6.1.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> |