]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'js/rename' 40/1140/1
authorShawn O. Pearce <spearce@spearce.org>
Fri, 16 Jul 2010 17:22:15 +0000 (10:22 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 16 Jul 2010 17:22:15 +0000 (10:22 -0700)
* 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

1  2 
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java

index e4a603cbbad322e4c29122746ae69acdf4b97753,50fadfa81270037517c8c8c61af69961dfc1adb6..ca1832e571a08d231409e40a512a191e00a4b094
@@@ -299,17 -298,12 +300,21 @@@ remoteDoesNotHaveSpec=Remote does not h
  remoteDoesNotSupportSmartHTTPPush=remote does not support smart HTTP push
  remoteHungUpUnexpectedly=remote hung up unexpectedly
  remoteNameCantBeNull=Remote name can't be null.
+ renamesAlreadyFound=Renames have already been found.
+ renamesFindingByContent=Finding renames by content similarity
+ renamesFindingExact=Finding exact renames
  repositoryAlreadyExists=Repository already exists: {0}
+ repositoryIsRequired=Repository is required.
  repositoryNotFound=repository not found: {0}
 +repositoryState_applyMailbox=Apply mailbox
 +repositoryState_bisecting=Bisecting
 +repositoryState_conflicts=Conflicts
 +repositoryState_merged=Merged
 +repositoryState_normal=Normal
 +repositoryState_rebase=Rebase
 +repositoryState_rebaseInteractive=Rebase interactive
 +repositoryState_rebaseOrApplyMailbox=Rebase/Apply mailbox
 +repositoryState_rebaseWithMerge=Rebase w/merge
  requiredHashFunctionNotAvailable=Required hash function {0} not available.
  resolvingDeltas=Resolving deltas
  serviceNotPermitted={0} not permitted
index 94cf1e48bda3992a192d5c2d493d08a1c3570e19,f46461be6925190766d5762e31e537d841457771..71e5e4a899dcf9d728218af697e86866095a1535
@@@ -358,17 -357,12 +359,21 @@@ public class JGitText extends Translati
        /***/ 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;
 +      /***/ public String repositoryState_conflicts;
 +      /***/ public String repositoryState_merged;
 +      /***/ public String repositoryState_normal;
 +      /***/ public String repositoryState_rebase;
 +      /***/ public String repositoryState_rebaseInteractive;
 +      /***/ public String repositoryState_rebaseOrApplyMailbox;
 +      /***/ public String repositoryState_rebaseWithMerge;
        /***/ public String requiredHashFunctionNotAvailable;
        /***/ public String resolvingDeltas;
        /***/ public String serviceNotPermitted;