diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java index 4088cd1284..70a0a602ba 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java @@ -149,16 +149,11 @@ public class PatchListCacheIT extends AbstractDaemonTest { pushHead(git, "refs/for/master", false); ObjectId b = getCurrentRevisionId(c.getChangeId()); - // Compare Change 1,1 with Change 1,2 - // expected: +FILE_B - // actual: +FILE_B, -FILE_C - // -FILE_C is wrongly returned, it is not contained in Change 1,2 - // but was only added in Change 1,1 + // Compare Change 1,1 with Change 1,2 (+FILE_B) List entries = getPatches(a, b); - assertEquals(3, entries.size()); + assertEquals(2, entries.size()); assertModified(Patch.COMMIT_MSG, entries.get(0)); assertAdded(FILE_B, entries.get(1)); - assertDeleted(FILE_C, entries.get(2)); } @Test @@ -189,17 +184,11 @@ public class PatchListCacheIT extends AbstractDaemonTest { pushHead(git, "refs/for/master", false); ObjectId b = getCurrentRevisionId(c.getChangeId()); - // Compare Change 1,1 with Change 1,2 - // expected: +FILE_C - // actual: +FILE_B, +FILE_C - // +FILE_B is wrongly returned, it is neither contained in Change 1,1 - // nor in Change 1,2, but was only changed due to the rebase - // on Change 2,1 + // Compare Change 1,1 with Change 1,2 (+FILE_C) List entries = getPatches(a, b); - assertEquals(3, entries.size()); + assertEquals(2, entries.size()); assertModified(Patch.COMMIT_MSG, entries.get(0)); - assertAdded(FILE_B, entries.get(1)); - assertAdded(FILE_C, entries.get(2)); + assertAdded(FILE_C, entries.get(1)); } private static void assertAdded(String expectedNewName, PatchListEntry e) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java index c36fbc0096..ff038403cc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java @@ -34,7 +34,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; public class PatchListKey implements Serializable { - static final long serialVersionUID = 16L; + static final long serialVersionUID = 17L; private transient ObjectId oldId; private transient ObjectId newId; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java index 8a73503ae0..744c379402 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java @@ -15,7 +15,9 @@ package com.google.gerrit.server.patch; +import com.google.common.base.Function; import com.google.common.cache.CacheLoader; +import com.google.common.collect.FluentIterable; import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.RefNames; @@ -58,23 +60,28 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; public class PatchListLoader extends CacheLoader { static final Logger log = LoggerFactory.getLogger(PatchListLoader.class); private final GitRepositoryManager repoManager; + private final PatchListCache patchListCache; @Inject - PatchListLoader(GitRepositoryManager mgr) { + PatchListLoader(GitRepositoryManager mgr, PatchListCache plc) { repoManager = mgr; + patchListCache = plc; } @Override - public PatchList load(final PatchListKey key) throws Exception { + public PatchList load(final PatchListKey key) throws IOException, + PatchListNotAvailableException { final Repository repo = repoManager.openRepository(key.projectKey); try { return readPatchList(key, repo); @@ -100,8 +107,8 @@ public class PatchListLoader extends CacheLoader { } } - private PatchList readPatchList(final PatchListKey key, - final Repository repo) throws IOException { + private PatchList readPatchList(final PatchListKey key, final Repository repo) + throws IOException, PatchListNotAvailableException { final RawTextComparator cmp = comparatorFor(key.getWhitespace()); final ObjectReader reader = repo.newObjectReader(); try { @@ -121,18 +128,8 @@ public class PatchListLoader extends CacheLoader { final boolean againstParent = b.getParentCount() > 0 && b.getParent(0) == a; - RevCommit aCommit; - RevTree aTree; - if (a instanceof RevCommit) { - aCommit = (RevCommit) a; - aTree = aCommit.getTree(); - } else if (a instanceof RevTree) { - aCommit = null; - aTree = (RevTree) a; - } else { - throw new IOException("Unexpected type: " + a.getClass()); - } - + RevCommit aCommit = a instanceof RevCommit ? (RevCommit) a : null; + RevTree aTree = rw.parseTree(a); RevTree bTree = b.getTree(); DiffFormatter df = new DiffFormatter(DisabledOutputStream.INSTANCE); @@ -141,15 +138,32 @@ public class PatchListLoader extends CacheLoader { df.setDetectRenames(true); List diffEntries = df.scan(aTree, bTree); - final int cnt = diffEntries.size(); - final PatchListEntry[] entries = new PatchListEntry[1 + cnt]; - entries[0] = newCommitMessage(cmp, repo, reader, // - againstParent ? null : aCommit, b); + Set paths = key.getOldId() != null + ? FluentIterable.from(patchListCache.get( + new PatchListKey(key.projectKey, null, key.getNewId(), + key.getWhitespace())).getPatches()) + .transform(new Function() { + @Override + public String apply(PatchListEntry entry) { + return entry.getNewName(); + } + }) + .toSet() + : null; + int cnt = diffEntries.size(); + List entries = new ArrayList<>(); + entries.add(newCommitMessage(cmp, repo, reader, // + againstParent ? null : aCommit, b)); for (int i = 0; i < cnt; i++) { - FileHeader fh = df.toFileHeader(diffEntries.get(i)); - entries[1 + i] = newEntry(aTree, fh); + DiffEntry diffEntry = diffEntries.get(i); + if (paths == null || paths.contains(diffEntry.getNewPath()) + || paths.contains(diffEntry.getOldPath())) { + FileHeader fh = df.toFileHeader(diffEntry); + entries.add(newEntry(aTree, fh)); + } } - return new PatchList(a, b, againstParent, entries); + return new PatchList(a, b, againstParent, + entries.toArray(new PatchListEntry[entries.size()])); } finally { reader.release(); }