summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorTomasz Zarna2011-08-24 04:17:32 (EDT)
committer Tomasz Zarna2011-08-24 04:17:32 (EDT)
commitc35c23db8d75f0cfbd7538d64fb43dc80bb52e7e (patch)
treebb24e8a9e7af6a1dbd2f50c5aa667a206f798413
parent930875a81a690f732fb5ac26304d6fb212aa2582 (diff)
downloadjgit-c35c23db8d75f0cfbd7538d64fb43dc80bb52e7e.zip
jgit-c35c23db8d75f0cfbd7538d64fb43dc80bb52e7e.tar.gz
jgit-c35c23db8d75f0cfbd7538d64fb43dc80bb52e7e.tar.bz2
Use JGitText.refAlreadyExists instead of "ref exists"refs/changes/57/4057/2
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java3
5 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 480a659..de95b89 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -359,7 +359,7 @@ rawLogMessageDoesNotParseAsLogEntry=Raw log message does not parse as log entry
readTimedOut=Read timed out
readingObjectsFromLocalRepositoryFailed=reading objects from local repository failed: {0}
receivingObjects=Receiving objects
-refAlreadExists=Ref {0} already exists
+refAlreadyExists=Ref {0} already exists
refNotResolved=Ref {0} can not be resolved
refUpdateReturnCodeWas=RefUpdate return code was: {0}
reflogsNotYetSupportedByRevisionParser=reflogs not yet supported by revision parser
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index 8496c7e..7dbe158 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -419,7 +419,7 @@ public class JGitText extends TranslationBundle {
/***/ public String readTimedOut;
/***/ public String readingObjectsFromLocalRepositoryFailed;
/***/ public String receivingObjects;
- /***/ public String refAlreadExists;
+ /***/ public String refAlreadyExists;
/***/ public String refNotResolved;
/***/ public String refUpdateReturnCodeWas;
/***/ public String reflogsNotYetSupportedByRevisionParser;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java
index ece1648..a07fdfc 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java
@@ -130,7 +130,7 @@ public class CreateBranchCommand extends GitCommand<Ref> {
&& refToCheck.getName().startsWith(Constants.R_HEADS);
if (!force && exists)
throw new RefAlreadyExistsException(MessageFormat.format(
- JGitText.get().refAlreadExists, name));
+ JGitText.get().refAlreadyExists, name));
ObjectId startAt = getStartPoint();
String startPointFullName = null;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
index 04b7791..6a1cabf 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
@@ -106,7 +106,7 @@ public class RenameBranchCommand extends GitCommand<Ref> {
String fullNewName;
if (repo.getRef(newName) != null)
throw new RefAlreadyExistsException(MessageFormat.format(
- JGitText.get().refAlreadExists, newName));
+ JGitText.get().refAlreadyExists, newName));
if (oldName != null) {
Ref ref = repo.getRef(oldName);
if (ref == null)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 40435b8..c6fe4d1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -947,7 +947,8 @@ public class ReceivePack {
// A well behaved client shouldn't have sent us a
// create command for a ref we advertised to it.
//
- cmd.setResult(Result.REJECTED_OTHER_REASON, "ref exists");
+ cmd.setResult(Result.REJECTED_OTHER_REASON, MessageFormat
+ .format(JGitText.get().refAlreadyExists, ref));
continue;
}
}