aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-07-16 10:22:15 -0700
committerShawn O. Pearce <spearce@spearce.org>2010-07-16 10:22:15 -0700
commit6e155d5f415e7f62f3f25e082dbee558e5be0b2d (patch)
tree3e793afd4e2d1cdce5c6cd55c0ebfdcf51c088d1 /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
parent0b46e70155e1a14edc77f32e030094fb499887cf (diff)
parent31311cacfd311f9a78bdf012a9f6ba1907b9964a (diff)
downloadjgit-6e155d5f415e7f62f3f25e082dbee558e5be0b2d.tar.gz
jgit-6e155d5f415e7f62f3f25e082dbee558e5be0b2d.zip
Merge branch 'js/rename'
* js/rename: Implemented file path based tie breaking to exact rename detection Added more test cases for RenameDetector Added very small optimization to exact rename detection Fixed Misleading Javadoc Added file path similarity to scoring metric in rename detection Fixed potential div by zero bug Added file size based rename detection optimization Create FileHeader from DiffEntry log: Implement --follow Cache the diff configuration section log: Add whitespace ignore options Format submodule links during differences Redo DiffFormatter API to be easier to use log, diff: Add rename detection support Implement similarity based rename detection Added a preliminary version of rename detection Refactored code out of FileHeader to facilitate rename detection
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index 94cf1e48bd..71e5e4a899 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -66,6 +66,7 @@ public class JGitText extends TranslationBundle {
/***/ public String URINotSupported;
/***/ public String URLNotFound;
/***/ public String aNewObjectIdIsRequired;
+ /***/ public String abbreviationLengthMustBeNonNegative;
/***/ public String advertisementCameBefore;
/***/ public String advertisementOfCameBefore;
/***/ public String amazonS3ActionFailed;
@@ -358,7 +359,11 @@ public class JGitText extends TranslationBundle {
/***/ public String remoteDoesNotSupportSmartHTTPPush;
/***/ public String remoteHungUpUnexpectedly;
/***/ public String remoteNameCantBeNull;
+ /***/ public String renamesAlreadyFound;
+ /***/ public String renamesFindingByContent;
+ /***/ public String renamesFindingExact;
/***/ public String repositoryAlreadyExists;
+ /***/ public String repositoryIsRequired;
/***/ public String repositoryNotFound;
/***/ public String repositoryState_applyMailbox;
/***/ public String repositoryState_bisecting;
@@ -376,6 +381,7 @@ public class JGitText extends TranslationBundle {
/***/ public String shortReadOfBlock;
/***/ public String shortReadOfOptionalDIRCExtensionExpectedAnotherBytes;
/***/ public String shortSkipOfBlock;
+ /***/ public String similarityScoreMustBeWithinBounds;
/***/ public String smartHTTPPushDisabled;
/***/ public String sourceDestinationMustMatch;
/***/ public String sourceIsNotAWildcard;