Browse Source

Unwind loop that iterates over fetch connection refs.

Create separate loops based on whether the ref specs
collection is empty or not.

Change-Id: I2861b45fe083675e12ff47f591e104f8cf6dd216
Signed-off-by: Kevin Sawicki <kevin@github.com>
stable-1.1
Kevin Sawicki 13 years ago
parent
commit
b127fa19eb
  1. 31
      org.eclipse.jgit/src/org/eclipse/jgit/api/LsRemoteCommand.java

31
org.eclipse.jgit/src/org/eclipse/jgit/api/LsRemoteCommand.java

@ -73,7 +73,9 @@ public class LsRemoteCommand extends GitCommand<Collection<Ref>> {
private String remote = Constants.DEFAULT_REMOTE_NAME; private String remote = Constants.DEFAULT_REMOTE_NAME;
private boolean heads; private boolean heads;
private boolean tags; private boolean tags;
private String uploadPack; private String uploadPack;
/** /**
@ -118,7 +120,7 @@ public class LsRemoteCommand extends GitCommand<Collection<Ref>> {
/** /**
* The full path of git-upload-pack on the remote host * The full path of git-upload-pack on the remote host
* *
* @param uploadPack * @param uploadPack
*/ */
public void setUploadPack(String uploadPack) { public void setUploadPack(String uploadPack) {
@ -134,32 +136,27 @@ public class LsRemoteCommand extends GitCommand<Collection<Ref>> {
try { try {
Collection<RefSpec> refSpecs = new ArrayList<RefSpec>(1); Collection<RefSpec> refSpecs = new ArrayList<RefSpec>(1);
if (tags) { if (tags)
refSpecs.add(new RefSpec( refSpecs.add(new RefSpec(
"refs/tags/*:refs/remotes/origin/tags/*")); "refs/tags/*:refs/remotes/origin/tags/*"));
} if (heads)
if (heads) {
refSpecs.add(new RefSpec( refSpecs.add(new RefSpec(
"refs/heads/*:refs/remotes/origin/*")); "refs/heads/*:refs/remotes/origin/*"));
}
Collection<Ref> refs; Collection<Ref> refs;
Map<String, Ref> refmap = new HashMap<String, Ref>(); Map<String, Ref> refmap = new HashMap<String, Ref>();
FetchConnection fc = transport.openFetch(); FetchConnection fc = transport.openFetch();
try { try {
refs = fc.getRefs(); refs = fc.getRefs();
for (Ref r : refs) { if (refSpecs.isEmpty())
boolean found = refSpecs.isEmpty(); for (Ref r : refs)
for (RefSpec rs : refSpecs) {
if (rs.matchSource(r)) {
found = true;
break;
}
}
if (found) {
refmap.put(r.getName(), r); refmap.put(r.getName(), r);
} else
for (Ref r : refs)
} for (RefSpec rs : refSpecs)
if (rs.matchSource(r)) {
refmap.put(r.getName(), r);
break;
}
} finally { } finally {
fc.close(); fc.close();
} }

Loading…
Cancel
Save