motiejus
/
jgit
1
Fork 0
Code Releases Activity

RenameDetector: Only scan deletes if adds exist 

If there are only deletes, don't need perform rename or copy
detection.  There are no adds (aka destinations) for the deletes
to match against.

Change-Id: I00fb90c509fa26a053de561dd8506cc1e0f5799a
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-11-11 15:02:57 -08:00
parent 05653bda04
commit bc9bca064d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java
View File

@ -357,9 +357,17 @@ public List<DiffEntry> compute(ContentSource.Pair reader, ProgressMonitor pm)
if (pm == null) if (pm == null)
pm = NullProgressMonitor.INSTANCE; pm = NullProgressMonitor.INSTANCE;
if (0 < breakScore)
breakModifies(reader, pm); breakModifies(reader, pm);
if (!added.isEmpty() && !deleted.isEmpty())
findExactRenames(pm); findExactRenames(pm);
if (!added.isEmpty() && !deleted.isEmpty())
findContentRenames(reader, pm); findContentRenames(reader, pm);
if (0 < breakScore && !added.isEmpty() && !deleted.isEmpty())
rejoinModifies(pm); rejoinModifies(pm);
entries.addAll(added); entries.addAll(added);
@ -383,9 +391,6 @@ public void reset() {
private void breakModifies(ContentSource.Pair reader, ProgressMonitor pm) private void breakModifies(ContentSource.Pair reader, ProgressMonitor pm)
throws IOException { throws IOException {
if (breakScore <= 0)
return;
ArrayList<DiffEntry> newEntries = new ArrayList<DiffEntry>(entries.size()); ArrayList<DiffEntry> newEntries = new ArrayList<DiffEntry>(entries.size());
pm.beginTask(JGitText.get().renamesBreakingModifies, entries.size()); pm.beginTask(JGitText.get().renamesBreakingModifies, entries.size());
@ -469,9 +474,6 @@ private void findContentRenames(ContentSource.Pair reader,
ProgressMonitor pm) ProgressMonitor pm)
throws IOException { throws IOException {
int cnt = Math.max(added.size(), deleted.size()); int cnt = Math.max(added.size(), deleted.size());
if (cnt == 0)
return;
if (getRenameLimit() == 0 || cnt <= getRenameLimit()) { if (getRenameLimit() == 0 || cnt <= getRenameLimit()) {
SimilarityRenameDetector d; SimilarityRenameDetector d;
@ -489,9 +491,6 @@ private void findContentRenames(ContentSource.Pair reader,
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void findExactRenames(ProgressMonitor pm) { private void findExactRenames(ProgressMonitor pm) {
if (added.isEmpty() || deleted.isEmpty())
return;
pm.beginTask(JGitText.get().renamesFindingExact, // pm.beginTask(JGitText.get().renamesFindingExact, //
added.size() + added.size() + deleted.size() added.size() + added.size() + deleted.size()
+ added.size() * deleted.size()); + added.size() * deleted.size());