diff options
| author | Jeff Schumacher <jeffschu@google.com> | 2010-07-22 12:55:28 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-07-27 18:13:32 -0700 |
| commit | 396fe6da4593645e1b9bada4fe314f6169ab2d17 (patch) | |
| tree | 7c465cc05f2fec78b2ab3cf29e8ea04831ba0b7c /org.eclipse.jgit/resources | |
| parent | f56a459966c8e5564cb23ccb3c272a0daa05a1aa (diff) | |
| download | jgit-396fe6da4593645e1b9bada4fe314f6169ab2d17.tar.gz jgit-396fe6da4593645e1b9bada4fe314f6169ab2d17.zip | |
Break dissimilar file pairs during diff
File pairs that are very dissimilar during a diff were not being
broken apart into their constituent ADD/DELETE pairs. The leads to
sub-optimal rename detection. Take, for example, this situation:
A file exists at src/a.txt containing "foo". A user renames src/a.txt
to src/b.txt, then adds a new src/a.txt containing "bar".
Even though the old a.txt and the new b.txt are identical, the
rename detection algorithm would not detect it as a rename since
it was already paired in a MODIFY. I added code to split all
MODIFYs below a certain score into their constituent ADD/DELETE
pairs. This allows situations like the one I described above to be
more correctly handled.
Change-Id: I22c04b70581f206bbc68c4cd1ee87a1f663b418e
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index 88c6c8e3a4..1b2b81fce3 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -302,8 +302,10 @@ 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. +renamesBreakingModifies=Breaking apart modified file pairs renamesFindingByContent=Finding renames by content similarity renamesFindingExact=Finding exact renames +renamesRejoiningModifies=Rejoining modified file pairs repositoryAlreadyExists=Repository already exists: {0} repositoryConfigFileInvalid=Repository config file {0} invalid {1} repositoryIsRequired=Repository is required. |