{"thread":{"id":"15144","subject":"[JGIT PATCH] Added forward slash to head/remote/tag prefix Constants","startedAt":"2008-08-21T20:55:22Z","lastAt":"2008-08-22T16:53:27Z","messageCount":2,"participants":["Charles O'Farrell","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"88036","messageId":"1219352122-5865-1-git-send-email-charleso@charleso.org","threadId":"15144","inReplyTo":null,"subject":"[JGIT PATCH] Added forward slash to head/remote/tag prefix Constants","fromName":"Charles O'Farrell","fromEmail":"charleso@charleso.org","sentAt":"2008-08-21T20:55:22Z","receivedAt":"2008-08-21T20:55:22Z","isPatch":true,"sender":{"key":"charleso@charleso.org","avatar":"https://gravatar.com/avatar/ce96d531daa37646a38a81e48113865af86a6d290ad92931f3b217896bdf86ea?d=mp&s=160"},"body":"eg. Constants.HEADS_PREFIX + \"/\" ==> Constants.R_HEADS\n\nThis was always done by every instance anyway and so this will ensure\nit isn't forgotten again.\n\nSigned-off-by: Charles O'Farrell <charleso@charleso.org>\n---\n .../ui/internal/clone/CloneDestinationPage.java    |    8 +++---\n .../egit/ui/internal/clone/GitCloneWizard.java     |   10 ++------\n .../egit/ui/internal/clone/SourceBranchPage.java   |    6 ++--\n .../src/org/spearce/jgit/pgm/Branch.java           |   10 ++++----\n .../src/org/spearce/jgit/pgm/Fetch.java            |    5 ++-\n .../src/org/spearce/jgit/pgm/Push.java             |    3 +-\n .../src/org/spearce/jgit/pgm/Tag.java              |    8 +++---\n .../src/org/spearce/jgit/pgm/TextBuiltin.java      |   23 ++++++++-----------\n .../src/org/spearce/jgit/lib/Constants.java        |    6 ++--\n .../src/org/spearce/jgit/lib/RefDatabase.java      |   12 ++++------\n .../src/org/spearce/jgit/lib/Repository.java       |    2 +-\n org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java |    2 +-\n .../spearce/jgit/transport/FetchHeadRecord.java    |   23 ++++++++-----------\n .../org/spearce/jgit/transport/FetchProcess.java   |    2 +-\n .../spearce/jgit/transport/WalkPushConnection.java |    4 +-\n 15 files changed, 57 insertions(+), 67 deletions(-)\n\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java\nindex 5d5a8ee..ca37679 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java\n@@ -180,8 +180,8 @@ public File getDestinationFile() {\n \tpublic String getInitialBranch() {\n \t\tfinal int ix = initialBranch.getSelectionIndex();\n \t\tif (ix < 0)\n-\t\t\treturn Constants.HEADS_PREFIX + \"/\" + Constants.MASTER;\n-\t\treturn Constants.HEADS_PREFIX + \"/\" + initialBranch.getItem(ix);\n+\t\t\treturn Constants.R_HEADS + Constants.MASTER;\n+\t\treturn Constants.R_HEADS + initialBranch.getItem(ix);\n \t}\n \n \t/**\n@@ -245,8 +245,8 @@ setDescription(NLS.bind(UIText.CloneDestinationPage_description,\n \t\tint newix = 0;\n \t\tfor (final Ref r : branchPage.getSelectedBranches()) {\n \t\t\tString name = r.getName();\n-\t\t\tif (name.startsWith(Constants.HEADS_PREFIX + \"/\"))\n-\t\t\t\tname = name.substring((Constants.HEADS_PREFIX + \"/\").length());\n+\t\t\tif (name.startsWith(Constants.R_HEADS))\n+\t\t\t\tname = name.substring((Constants.R_HEADS).length());\n \t\t\tif (head != null && head.getName().equals(r.getName()))\n \t\t\t\tnewix = initialBranch.getItemCount();\n \t\t\tinitialBranch.add(name);\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java\nindex 50c2ef9..68b801e 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/GitCloneWizard.java\n@@ -37,11 +37,6 @@\n  * Import Git Repository Wizard. A front end to a git clone operation.\n  */\n public class GitCloneWizard extends Wizard implements IImportWizard {\n-\tprivate static final String HEADS_PREFIX = Constants.HEADS_PREFIX;\n-\n-\tprivate static final String REMOTES_PREFIX_S = Constants.REMOTES_PREFIX\n-\t\t\t+ \"/\";\n-\n \tprivate CloneSourcePage cloneSource;\n \n \tprivate SourceBranchPage validSource;\n@@ -86,10 +81,11 @@ public boolean performFinish() {\n \t\t\torigin = new RemoteConfig(db.getConfig(), rn);\n \t\t\torigin.addURI(uri);\n \n-\t\t\tfinal String dst = REMOTES_PREFIX_S + origin.getName();\n+\t\t\tfinal String dst = Constants.R_REMOTES + origin.getName();\n \t\t\tRefSpec wcrs = new RefSpec();\n \t\t\twcrs = wcrs.setForceUpdate(true);\n-\t\t\twcrs = wcrs.setSourceDestination(HEADS_PREFIX + \"/*\", dst + \"/*\");\n+\t\t\twcrs = wcrs.setSourceDestination(Constants.R_HEADS + \"*\", dst\n+\t\t\t\t\t+ \"/*\");\n \n \t\t\tif (validSource.isAllSelected()) {\n \t\t\t\torigin.addFetchRefSpec(wcrs);\ndiff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java\nindex b0aba1e..8b2ba48 100644\n--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java\n+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/SourceBranchPage.java\n@@ -248,7 +248,7 @@ public void run(final IProgressMonitor pm)\n \t\t\t\t\t\thead = null;\n \t\t\t\t\t\tfor (final Ref r : adv) {\n \t\t\t\t\t\t\tfinal String n = r.getName();\n-\t\t\t\t\t\t\tif (!n.startsWith(Constants.HEADS_PREFIX + \"/\"))\n+\t\t\t\t\t\t\tif (!n.startsWith(Constants.R_HEADS))\n \t\t\t\t\t\t\t\tcontinue;\n \t\t\t\t\t\t\tavailable.add(r);\n \t\t\t\t\t\t\tif (idHEAD == null || head != null)\n@@ -294,8 +294,8 @@ public int compare(final Ref o1, final Ref o2) {\n \t\tallSelected = true;\n \t\tfor (final Ref r : available) {\n \t\t\tString n = r.getName();\n-\t\t\tif (n.startsWith(Constants.HEADS_PREFIX + \"/\"))\n-\t\t\t\tn = n.substring((Constants.HEADS_PREFIX + \"/\").length());\n+\t\t\tif (n.startsWith(Constants.R_HEADS))\n+\t\t\t\tn = n.substring((Constants.R_HEADS).length());\n \t\t\tfinal TableItem ti = new TableItem(availTable, SWT.NONE);\n \t\t\tti.setText(n);\n \t\t\tti.setChecked(true);\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java\nindex 837b672..9b6a7e7 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Branch.java\n@@ -101,8 +101,8 @@ private void list() throws Exception {\n \t\t\tString current = head.getName();\n \t\t\tif (current.equals(Constants.HEAD))\n \t\t\t\taddRef(\"(no branch)\", head);\n-\t\t\taddRefs(refs, Constants.HEADS_PREFIX + '/', !remote);\n-\t\t\taddRefs(refs, Constants.REMOTES_PREFIX + '/', remote);\n+\t\t\taddRefs(refs, Constants.R_HEADS, !remote);\n+\t\t\taddRefs(refs, Constants.R_REMOTES, remote);\n \t\t\tfor (final Entry<String, Ref> e : printRefs.entrySet()) {\n \t\t\t\tfinal Ref ref = e.getValue();\n \t\t\t\tprintHead(e.getKey(), current.equals(ref.getName()), ref);\n@@ -150,9 +150,9 @@ private void delete(boolean force) throws IOException {\n \t\t\t\tString err = \"Cannot delete the branch '%s' which you are currently on.\";\n \t\t\t\tthrow die(String.format(err, branch));\n \t\t\t}\n-\t\t\tRefUpdate update = db.updateRef((remote ? Constants.REMOTES_PREFIX\n-\t\t\t\t\t: Constants.HEADS_PREFIX)\n-\t\t\t\t\t+ '/' + branch);\n+\t\t\tRefUpdate update = db.updateRef((remote ? Constants.R_REMOTES\n+\t\t\t\t\t: Constants.R_HEADS)\n+\t\t\t\t\t+ branch);\n \t\t\tupdate.setNewObjectId(head);\n \t\t\tupdate.setForceUpdate(force || remote);\n \t\t\tResult result = update.delete();\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java\nindex 4eff32b..8c5b983 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Fetch.java\n@@ -41,6 +41,7 @@\n \n import org.kohsuke.args4j.Argument;\n import org.kohsuke.args4j.Option;\n+import org.spearce.jgit.lib.Constants;\n import org.spearce.jgit.lib.RefUpdate;\n import org.spearce.jgit.lib.TextProgressMonitor;\n import org.spearce.jgit.transport.FetchResult;\n@@ -102,9 +103,9 @@ private static String longTypeOf(final TrackingRefUpdate u) {\n \t\t\treturn \"[i/o error]\";\n \n \t\tif (r == RefUpdate.Result.NEW) {\n-\t\t\tif (u.getRemoteName().startsWith(REFS_HEADS))\n+\t\t\tif (u.getRemoteName().startsWith(Constants.R_HEADS))\n \t\t\t\treturn \"[new branch]\";\n-\t\t\telse if (u.getLocalName().startsWith(REFS_TAGS))\n+\t\t\telse if (u.getLocalName().startsWith(Constants.R_TAGS))\n \t\t\t\treturn \"[new tag]\";\n \t\t\treturn \"[new]\";\n \t\t}\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java\nindex 6b35ab8..aacbdf9 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Push.java\n@@ -43,6 +43,7 @@\n \n import org.kohsuke.args4j.Argument;\n import org.kohsuke.args4j.Option;\n+import org.spearce.jgit.lib.Constants;\n import org.spearce.jgit.lib.Ref;\n import org.spearce.jgit.lib.TextProgressMonitor;\n import org.spearce.jgit.transport.PushResult;\n@@ -157,7 +158,7 @@ private void printRefUpdateResult(final PushResult result,\n \t\t\t\tfinal Ref oldRef = result.getAdvertisedRef(remoteName);\n \t\t\t\tif (oldRef == null) {\n \t\t\t\t\tfinal String summary;\n-\t\t\t\t\tif (remoteName.startsWith(REFS_TAGS))\n+\t\t\t\t\tif (remoteName.startsWith(Constants.R_TAGS))\n \t\t\t\t\t\tsummary = \"[new tag]\";\n \t\t\t\t\telse\n \t\t\t\t\t\tsummary = \"[new branch]\";\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java\nindex 6c73552..d119ebb 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/Tag.java\n@@ -67,11 +67,11 @@ protected void run() throws Exception {\n \t\t\t\tthrow die(\"Cannot resolve \" + Constants.HEAD);\n \t\t}\n \n-\t\tif (!tagName.startsWith(Constants.TAGS_PREFIX + \"/\"))\n-\t\t\ttagName = Constants.TAGS_PREFIX + \"/\" + tagName;\n+\t\tif (!tagName.startsWith(Constants.R_TAGS))\n+\t\t\ttagName = Constants.R_TAGS + tagName;\n \t\tif (!force && db.resolve(tagName) != null) {\n \t\t\tthrow die(\"fatal: tag '\"\n-\t\t\t\t\t+ tagName.substring(Constants.TAGS_PREFIX.length() + 1)\n+\t\t\t\t\t+ tagName.substring(Constants.R_TAGS.length())\n \t\t\t\t\t+ \"' exists\");\n \t\t}\n \n@@ -84,7 +84,7 @@ protected void run() throws Exception {\n \t\ttag.setType(Constants.typeString(ldr.getType()));\n \t\ttag.setTagger(new PersonIdent(db));\n \t\ttag.setMessage(message.replaceAll(\"\\r\", \"\"));\n-\t\ttag.setTag(tagName.substring(Constants.TAGS_PREFIX.length() + 1));\n+\t\ttag.setTag(tagName.substring(Constants.R_TAGS.length()));\n \t\ttag.tag();\n \t}\n }\ndiff --git a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\nindex 5c066cb..50b1620 100644\n--- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\n+++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\n@@ -38,6 +38,10 @@\n \n package org.spearce.jgit.pgm;\n \n+import static org.spearce.jgit.lib.Constants.R_HEADS;\n+import static org.spearce.jgit.lib.Constants.R_REMOTES;\n+import static org.spearce.jgit.lib.Constants.R_TAGS;\n+\n import java.io.BufferedWriter;\n import java.io.IOException;\n import java.io.OutputStreamWriter;\n@@ -45,7 +49,6 @@\n \n import org.kohsuke.args4j.CmdLineException;\n import org.kohsuke.args4j.Option;\n-import org.spearce.jgit.lib.Constants;\n import org.spearce.jgit.lib.ObjectId;\n import org.spearce.jgit.lib.Repository;\n import org.spearce.jgit.pgm.opt.CmdLineParser;\n@@ -63,12 +66,6 @@\n  * even though it was constructed.\n  */\n public abstract class TextBuiltin {\n-\tprotected static final String REFS_HEADS = Constants.HEADS_PREFIX + \"/\";\n-\n-\tprotected static final String REFS_REMOTES = Constants.REMOTES_PREFIX + \"/\";\n-\n-\tprotected static final String REFS_TAGS = Constants.TAGS_PREFIX + \"/\";\n-\n \tprivate String commandName;\n \n \t@Option(name = \"--help\", usage = \"display this help text\", aliases = { \"-h\" })\n@@ -184,12 +181,12 @@ protected static String abbreviateObject(final ObjectId id) {\n \t}\n \n \tprotected String abbreviateRef(String dst, boolean abbreviateRemote) {\n-\t\tif (dst.startsWith(REFS_HEADS))\n-\t\t\tdst = dst.substring(REFS_HEADS.length());\n-\t\telse if (dst.startsWith(REFS_TAGS))\n-\t\t\tdst = dst.substring(REFS_TAGS.length());\n-\t\telse if (abbreviateRemote && dst.startsWith(REFS_REMOTES))\n-\t\t\tdst = dst.substring(REFS_REMOTES.length());\n+\t\tif (dst.startsWith(R_HEADS))\n+\t\t\tdst = dst.substring(R_HEADS.length());\n+\t\telse if (dst.startsWith(R_TAGS))\n+\t\t\tdst = dst.substring(R_HEADS.length());\n+\t\telse if (abbreviateRemote && dst.startsWith(R_REMOTES))\n+\t\t\tdst = dst.substring(R_REMOTES.length());\n \t\treturn dst;\n \t}\n }\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java\nindex 331c7dc..f316881 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Constants.java\n@@ -208,13 +208,13 @@\n \tpublic static final String MASTER = \"master\";\n \n \t/** Prefix for branch refs */\n-\tpublic static final String HEADS_PREFIX = \"refs/heads\";\n+\tpublic static final String R_HEADS = \"refs/heads/\";\n \n \t/** Prefix for remotes refs */\n-\tpublic static final String REMOTES_PREFIX = \"refs/remotes\";\n+\tpublic static final String R_REMOTES = \"refs/remotes/\";\n \n \t/** Prefix for tag refs */\n-\tpublic static final String TAGS_PREFIX = \"refs/tags\";\n+\tpublic static final String R_TAGS = \"refs/tags/\";\n \n \t/** Logs folder name */\n \tpublic static final String LOGS = \"logs\";\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java\nindex be5a2fe..5c1f060 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java\n@@ -38,6 +38,8 @@\n \n package org.spearce.jgit.lib;\n \n+import static org.spearce.jgit.lib.Constants.R_TAGS;\n+\n import java.io.BufferedReader;\n import java.io.EOFException;\n import java.io.File;\n@@ -55,12 +57,8 @@\n class RefDatabase {\n \tprivate static final String REFS_SLASH = \"refs/\";\n \n-\tprivate static final String HEADS_SLASH = Constants.HEADS_PREFIX + \"/\";\n-\n-\tprivate static final String TAGS_SLASH = Constants.TAGS_PREFIX + \"/\";\n-\n \tprivate static final String[] refSearchPaths = { \"\", REFS_SLASH,\n-\t\t\tTAGS_SLASH, HEADS_SLASH, Constants.REMOTES_PREFIX + \"/\" };\n+\t\t\tR_TAGS, Constants.R_HEADS, Constants.R_REMOTES };\n \n \tprivate final Repository db;\n \n@@ -188,8 +186,8 @@ Ref readRef(final String partialName) throws IOException {\n \tMap<String, Ref> getTags() {\n \t\tfinal Map<String, Ref> tags = new HashMap<String, Ref>();\n \t\tfor (final Ref r : readRefs().values()) {\n-\t\t\tif (r.getName().startsWith(TAGS_SLASH))\n-\t\t\t\ttags.put(r.getName().substring(TAGS_SLASH.length()), r);\n+\t\t\tif (r.getName().startsWith(R_TAGS))\n+\t\t\t\ttags.put(r.getName().substring(R_TAGS.length()), r);\n \t\t}\n \t\treturn tags;\n \t}\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java\nindex 7679e53..f1a8269 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java\n@@ -170,7 +170,7 @@ public void create() throws IOException {\n \n \t\tnew File(gitDir, \"branches\").mkdir();\n \t\tnew File(gitDir, \"remotes\").mkdir();\n-\t\tfinal String master = Constants.HEADS_PREFIX + \"/\" + Constants.MASTER;\n+\t\tfinal String master = Constants.R_HEADS + Constants.MASTER;\n \t\trefs.link(Constants.HEAD, master);\n \n \t\tgetConfig().create();\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java\nindex b3039f2..aa4baf4 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Tag.java\n@@ -202,7 +202,7 @@ public void tag() throws IOException {\n \t\t\tid = objId;\n \t\t}\n \n-\t\tru = objdb.updateRef(Constants.TAGS_PREFIX + \"/\" + getTag());\n+\t\tru = objdb.updateRef(Constants.R_TAGS + getTag());\n \t\tru.setNewObjectId(id);\n \t\tru.setRefLogMessage(\"tagged \" + getTag(), false);\n \t\tif (ru.forceUpdate() == RefUpdate.Result.LOCK_FAILURE)\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java\nindex ead3892..83a16dc 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchHeadRecord.java\n@@ -37,18 +37,15 @@\n \n package org.spearce.jgit.transport;\n \n+import static org.spearce.jgit.lib.Constants.R_HEADS;\n+import static org.spearce.jgit.lib.Constants.R_REMOTES;\n+import static org.spearce.jgit.lib.Constants.R_TAGS;\n+\n import java.io.PrintWriter;\n \n-import org.spearce.jgit.lib.Constants;\n import org.spearce.jgit.lib.ObjectId;\n \n class FetchHeadRecord {\n-\tprivate static final String REFS_HEADS = Constants.HEADS_PREFIX + \"/\";\n-\n-\tprivate static final String REFS_REMOTES = Constants.REMOTES_PREFIX + \"/\";\n-\n-\tprivate static final String REFS_TAGS = Constants.TAGS_PREFIX + \"/\";\n-\n \tObjectId newValue;\n \n \tboolean notForMerge;\n@@ -60,15 +57,15 @@\n \tvoid write(final PrintWriter pw) {\n \t\tfinal String type;\n \t\tfinal String name;\n-\t\tif (sourceName.startsWith(REFS_HEADS)) {\n+\t\tif (sourceName.startsWith(R_HEADS)) {\n \t\t\ttype = \"branch\";\n-\t\t\tname = sourceName.substring(REFS_HEADS.length());\n-\t\t} else if (sourceName.startsWith(REFS_TAGS)) {\n+\t\t\tname = sourceName.substring(R_HEADS.length());\n+\t\t} else if (sourceName.startsWith(R_TAGS)) {\n \t\t\ttype = \"tag\";\n-\t\t\tname = sourceName.substring(REFS_TAGS.length());\n-\t\t} else if (sourceName.startsWith(REFS_REMOTES)) {\n+\t\t\tname = sourceName.substring(R_TAGS.length());\n+\t\t} else if (sourceName.startsWith(R_REMOTES)) {\n \t\t\ttype = \"remote branch\";\n-\t\t\tname = sourceName.substring(REFS_REMOTES.length());\n+\t\t\tname = sourceName.substring(R_REMOTES.length());\n \t\t} else {\n \t\t\ttype = \"\";\n \t\t\tname = sourceName;\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java\nindex e99869c..654572d 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/FetchProcess.java\n@@ -361,6 +361,6 @@ private static boolean isTag(final Ref r) {\n \t}\n \n \tprivate static boolean isTag(final String name) {\n-\t\treturn name.startsWith(Constants.TAGS_PREFIX + \"/\");\n+\t\treturn name.startsWith(Constants.R_TAGS);\n \t}\n }\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java\nindex b417b6e..5e80be8 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/WalkPushConnection.java\n@@ -358,7 +358,7 @@ private static String pickHEAD(final List<RemoteRefUpdate> updates) {\n \t\t//\n \t\tfor (final RemoteRefUpdate u : updates) {\n \t\t\tfinal String n = u.getRemoteName();\n-\t\t\tif (n.equals(Constants.HEADS_PREFIX + \"/\" + Constants.MASTER))\n+\t\t\tif (n.equals(Constants.R_HEADS + Constants.MASTER))\n \t\t\t\treturn n;\n \t\t}\n \n@@ -367,7 +367,7 @@ private static String pickHEAD(final List<RemoteRefUpdate> updates) {\n \t\t//\n \t\tfor (final RemoteRefUpdate u : updates) {\n \t\t\tfinal String n = u.getRemoteName();\n-\t\t\tif (n.startsWith(Constants.HEADS_PREFIX + \"/\"))\n+\t\t\tif (n.startsWith(Constants.R_HEADS))\n \t\t\t\treturn n;\n \t\t}\n \t\treturn updates.get(0).getRemoteName();\n-- \n1.6.0.49.gea35\n"},{"id":"88159","messageId":"20080822165327.GL3483@spearce.org","threadId":"15144","inReplyTo":"1219352122-5865-1-git-send-email-charleso@charleso.org","subject":"Re: [JGIT PATCH] Added forward slash to head/remote/tag prefix Constants","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-08-22T16:53:27Z","receivedAt":"2008-08-22T16:53:27Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Charles O'Farrell <charleso@charleso.org> wrote:\n> eg. Constants.HEADS_PREFIX + \"/\" ==> Constants.R_HEADS\n> \n> This was always done by every instance anyway and so this will ensure\n> it isn't forgotten again.\n\nThanks, applied.  I had to hand-merge a few sections due to Marek's\npush UI going in before your patch, but your patch not having the\nnecessary changes.  Using a different constant name helped make\nthat resolution less painful.\n \n> --- a/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\n> +++ b/org.spearce.jgit.pgm/src/org/spearce/jgit/pgm/TextBuiltin.java\n> @@ -184,12 +181,12 @@ protected static String abbreviateObject(final ObjectId id) {\n>  \t}\n>  \n>  \tprotected String abbreviateRef(String dst, boolean abbreviateRemote) {\n> -\t\tif (dst.startsWith(REFS_HEADS))\n> -\t\t\tdst = dst.substring(REFS_HEADS.length());\n> -\t\telse if (dst.startsWith(REFS_TAGS))\n> -\t\t\tdst = dst.substring(REFS_TAGS.length());\n> -\t\telse if (abbreviateRemote && dst.startsWith(REFS_REMOTES))\n> -\t\t\tdst = dst.substring(REFS_REMOTES.length());\n> +\t\tif (dst.startsWith(R_HEADS))\n> +\t\t\tdst = dst.substring(R_HEADS.length());\n> +\t\telse if (dst.startsWith(R_TAGS))\n> +\t\t\tdst = dst.substring(R_HEADS.length());\n\nThis should be R_TAGS. I fixed it when I applied the patch.\n\n-- \nShawn.\n"}]}