opendev/gerrit
Code Issues Proposed changes

Limit file list to files that were touched in new patch set

Browse Source 
When comparing two patch sets only files that were touched in the new
patch set should be listed. At the moment the file list contains all
files that were changed between the commits of the compared patch sets.

E.g. if a rebase was done which touched many files this made the patch
set comparison pretty useless since the file list grew way too big.

Change-Id: I6c512a69d8632a4ce57ef23928411bf0829aeb70
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2014-05-12 10:43:20 +02:00
parent eb85036e0a
commit 67a2e7ead8
3 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
View File

@@ -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<PatchListEntry> 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<PatchListEntry> 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) {