Browse Source

Make Repository.shortenRefName static

The method has no reason to be non-static.

Change-Id: I1c09e074395d49cee0e6e53679b499d1f0c351ea
stable-0.10
Robin Stocker 14 years ago
parent
commit
2fb0f5cfc0
  1. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java
  2. 5
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RefRename.java
  3. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java

@ -150,7 +150,7 @@ class Branch extends TextBuiltin {
startBranch = startRef.getName(); startBranch = startRef.getName();
else else
startBranch = startAt.name(); startBranch = startAt.name();
startBranch = db.shortenRefName(startBranch); startBranch = Repository.shortenRefName(startBranch);
String newRefName = newHead; String newRefName = newHead;
if (!newRefName.startsWith(Constants.R_HEADS)) if (!newRefName.startsWith(Constants.R_HEADS))
newRefName = Constants.R_HEADS + newRefName; newRefName = Constants.R_HEADS + newRefName;

5
org.eclipse.jgit/src/org/eclipse/jgit/lib/RefRename.java

@ -77,14 +77,13 @@ public abstract class RefRename {
source = src; source = src;
destination = dst; destination = dst;
Repository repo = destination.getRepository();
String cmd = ""; String cmd = "";
if (source.getName().startsWith(Constants.R_HEADS) if (source.getName().startsWith(Constants.R_HEADS)
&& destination.getName().startsWith(Constants.R_HEADS)) && destination.getName().startsWith(Constants.R_HEADS))
cmd = "Branch: "; cmd = "Branch: ";
setRefLogMessage(cmd + "renamed " setRefLogMessage(cmd + "renamed "
+ repo.shortenRefName(source.getName()) + " to " + Repository.shortenRefName(source.getName()) + " to "
+ repo.shortenRefName(destination.getName())); + Repository.shortenRefName(destination.getName()));
} }
/** @return identity of the user making the change in the reflog. */ /** @return identity of the user making the change in the reflog. */

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

@ -1119,7 +1119,7 @@ public abstract class Repository {
* *
* @return a more user friendly ref name * @return a more user friendly ref name
*/ */
public String shortenRefName(String refName) { public static String shortenRefName(String refName) {
if (refName.startsWith(Constants.R_HEADS)) if (refName.startsWith(Constants.R_HEADS))
return refName.substring(Constants.R_HEADS.length()); return refName.substring(Constants.R_HEADS.length());
if (refName.startsWith(Constants.R_TAGS)) if (refName.startsWith(Constants.R_TAGS))

Loading…
Cancel
Save