summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/META-INF/MANIFEST.MF72
-rw-r--r--org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF4
-rw-r--r--org.eclipse.jgit/pom.xml2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java16
4 files changed, 55 insertions, 39 deletions
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index eea13ec7be..eeb9a952a7 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
-Export-Package: org.eclipse.jgit.api;version="3.7.0";
+Export-Package: org.eclipse.jgit.api;version="4.0.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
@@ -19,53 +19,53 @@ Export-Package: org.eclipse.jgit.api;version="3.7.0";
org.eclipse.jgit.submodule,
org.eclipse.jgit.transport,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="3.7.0";
+ org.eclipse.jgit.api.errors;version="4.0.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="3.7.0",
- org.eclipse.jgit.blame;version="3.7.0";
+ org.eclipse.jgit.attributes;version="4.0.0",
+ org.eclipse.jgit.blame;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="3.7.0";
+ org.eclipse.jgit.diff;version="4.0.0";
uses:="org.eclipse.jgit.patch,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="3.7.0";
+ org.eclipse.jgit.dircache;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util,
org.eclipse.jgit.events,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.errors;version="3.7.0";
+ org.eclipse.jgit.errors;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack,
org.eclipse.jgit.transport,
org.eclipse.jgit.dircache",
- org.eclipse.jgit.events;version="3.7.0";
+ org.eclipse.jgit.events;version="4.0.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="3.7.0",
- org.eclipse.jgit.gitrepo;version="3.7.0";
+ org.eclipse.jgit.fnmatch;version="4.0.0",
+ org.eclipse.jgit.gitrepo;version="4.0.0";
uses:="org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.gitrepo.internal;version="3.7.0";x-internal:=true,
- org.eclipse.jgit.ignore;version="3.7.0",
- org.eclipse.jgit.ignore.internal;version="3.7.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="3.7.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.storage.dfs;version="3.7.0";x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.file;version="3.7.0";
+ org.eclipse.jgit.gitrepo.internal;version="4.0.0";x-internal:=true,
+ org.eclipse.jgit.ignore;version="4.0.0",
+ org.eclipse.jgit.ignore.internal;version="4.0.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal;version="4.0.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
+ org.eclipse.jgit.internal.storage.dfs;version="4.0.0";x-friends:="org.eclipse.jgit.test",
+ org.eclipse.jgit.internal.storage.file;version="4.0.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
org.eclipse.jgit.http.server,
org.eclipse.jgit.java7.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.pack;version="3.7.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
- org.eclipse.jgit.lib;version="3.7.0";
+ org.eclipse.jgit.internal.storage.pack;version="4.0.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
+ org.eclipse.jgit.lib;version="4.0.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
@@ -75,41 +75,41 @@ Export-Package: org.eclipse.jgit.api;version="3.7.0";
org.eclipse.jgit.treewalk,
org.eclipse.jgit.transport,
org.eclipse.jgit.submodule",
- org.eclipse.jgit.merge;version="3.7.0";
+ org.eclipse.jgit.merge;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.diff,
org.eclipse.jgit.dircache,
org.eclipse.jgit.api",
- org.eclipse.jgit.nls;version="3.7.0",
- org.eclipse.jgit.notes;version="3.7.0";
+ org.eclipse.jgit.nls;version="4.0.0",
+ org.eclipse.jgit.notes;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="3.7.0";
+ org.eclipse.jgit.patch;version="4.0.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="3.7.0";
+ org.eclipse.jgit.revplot;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="3.7.0";
+ org.eclipse.jgit.revwalk;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
org.eclipse.jgit.revwalk.filter",
- org.eclipse.jgit.revwalk.filter;version="3.7.0";
+ org.eclipse.jgit.revwalk.filter;version="4.0.0";
uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="3.7.0";
+ org.eclipse.jgit.storage.file;version="4.0.0";
uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="3.7.0";
+ org.eclipse.jgit.storage.pack;version="4.0.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="3.7.0";
+ org.eclipse.jgit.submodule;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.transport;version="3.7.0";
+ org.eclipse.jgit.transport;version="4.0.0";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.internal.storage.pack,
@@ -121,26 +121,26 @@ Export-Package: org.eclipse.jgit.api;version="3.7.0";
org.eclipse.jgit.transport.http,
org.eclipse.jgit.errors,
org.eclipse.jgit.storage.pack",
- org.eclipse.jgit.transport.http;version="3.7.0";
+ org.eclipse.jgit.transport.http;version="4.0.0";
uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="3.7.0";
+ org.eclipse.jgit.transport.resolver;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.transport",
- org.eclipse.jgit.treewalk;version="3.7.0";
+ org.eclipse.jgit.treewalk;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
org.eclipse.jgit.dircache",
- org.eclipse.jgit.treewalk.filter;version="3.7.0";
+ org.eclipse.jgit.treewalk.filter;version="4.0.0";
uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="3.7.0";
+ org.eclipse.jgit.util;version="4.0.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.transport.http,
org.eclipse.jgit.storage.file,
org.ietf.jgss",
- org.eclipse.jgit.util.io;version="3.7.0"
+ org.eclipse.jgit.util.io;version="4.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index ddb1e57d56..41b6066630 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: 3.7.0.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="3.7.0.qualifier";roots="."
+Bundle-Version: 4.0.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="4.0.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 36a579ec22..02af2c199b 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -53,7 +53,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>3.7.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java
index b369d0d1f5..73850b7889 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java
@@ -394,4 +394,20 @@ public class BatchRefUpdate {
return ru;
}
}
+
+ @Override
+ public String toString() {
+ StringBuilder r = new StringBuilder();
+ r.append(getClass().getSimpleName()).append('[');
+ if (commands.isEmpty())
+ return r.append(']').toString();
+
+ r.append('\n');
+ for (ReceiveCommand cmd : commands) {
+ r.append(" "); //$NON-NLS-1$
+ r.append(cmd);
+ r.append(" (").append(cmd.getResult()).append(")\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ return r.append(']').toString();
+ }
}