diff options
Diffstat (limited to 'org.eclipse.jgit.pgm')
5 files changed, 22 insertions, 8 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java index 969a8e0c08..0307a6073e 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java @@ -43,6 +43,8 @@ package org.eclipse.jgit.pgm; +import static org.eclipse.jgit.lib.RefDatabase.ALL; + import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; @@ -175,7 +177,7 @@ class Branch extends TextBuiltin { } private void list() throws Exception { - Map<String, Ref> refs = db.getAllRefs(); + Map<String, Ref> refs = db.getRefDatabase().getRefs(ALL); Ref head = refs.get(Constants.HEAD); // This can happen if HEAD is stillborn if (head != null) { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevParse.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevParse.java index 674c202273..5530ac5c99 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevParse.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevParse.java @@ -44,6 +44,8 @@ package org.eclipse.jgit.pgm; +import static org.eclipse.jgit.lib.RefDatabase.ALL; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -64,7 +66,7 @@ class RevParse extends TextBuiltin { @Override protected void run() throws Exception { if (all) { - Map<String, Ref> allRefs = db.getAllRefs(); + Map<String, Ref> allRefs = db.getRefDatabase().getRefs(ALL); for (final Ref r : allRefs.values()) outw.println(r.getObjectId().name()); } else { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java index 4327403690..847bf7fc1a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java @@ -47,6 +47,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import java.util.Map; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -55,6 +56,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; import org.eclipse.jgit.revwalk.FollowFilter; @@ -164,8 +166,10 @@ abstract class RevWalkTextBuiltin extends TextBuiltin { else if (revLimiter.size() > 1) walk.setRevFilter(AndRevFilter.create(revLimiter)); - if (all) - for (Ref a : db.getAllRefs().values()) { + if (all) { + Map<String, Ref> refs = + db.getRefDatabase().getRefs(RefDatabase.ALL); + for (Ref a : refs.values()) { ObjectId oid = a.getPeeledObjectId(); if (oid == null) oid = a.getObjectId(); @@ -175,6 +179,7 @@ abstract class RevWalkTextBuiltin extends TextBuiltin { // Ignore all refs which are not commits } } + } if (commits.isEmpty()) { final ObjectId head = db.resolve(Constants.HEAD); diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ShowRef.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ShowRef.java index 203c92d4a5..e9d9df6a19 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ShowRef.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ShowRef.java @@ -45,6 +45,8 @@ package org.eclipse.jgit.pgm; +import static org.eclipse.jgit.lib.RefDatabase.ALL; + import java.io.IOException; import java.util.Map; import java.util.SortedMap; @@ -65,8 +67,8 @@ class ShowRef extends TextBuiltin { } } - private Iterable<Ref> getSortedRefs() { - Map<String, Ref> all = db.getAllRefs(); + private Iterable<Ref> getSortedRefs() throws Exception { + Map<String, Ref> all = db.getRefDatabase().getRefs(ALL); if (all instanceof RefMap || (all instanceof SortedMap && ((SortedMap) all).comparator() == null)) return all.values(); diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java index df59bbe686..cd0236cc04 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java @@ -43,6 +43,8 @@ package org.eclipse.jgit.pgm.debug; +import static org.eclipse.jgit.lib.RefDatabase.ALL; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -114,7 +116,7 @@ class RebuildCommitGraph extends TextBuiltin { @Override protected void run() throws Exception { - if (!really && !db.getAllRefs().isEmpty()) { + if (!really && !db.getRefDatabase().getRefs(ALL).isEmpty()) { System.err.println( MessageFormat.format(CLIText.get().fatalThisProgramWillDestroyTheRepository , db.getDirectory().getAbsolutePath(), REALLY)); @@ -241,7 +243,8 @@ class RebuildCommitGraph extends TextBuiltin { private void deleteAllRefs() throws Exception { final RevWalk rw = new RevWalk(db); - for (final Ref r : db.getAllRefs().values()) { + Map<String, Ref> refs = db.getRefDatabase().getRefs(ALL); + for (final Ref r : refs.values()) { if (Constants.HEAD.equals(r.getName())) continue; final RefUpdate u = db.updateRef(r.getName()); |