opendev/gerrit
Code Issues Proposed changes

Implement web interface for patches diff

Browse Source 
Support diff between patches in the change screen. Allow changing
patches base comparison.

All displayed patches can now have their files listed and compared
to target branch or to a specific patch of the change.

Bug issue: 194
Change-Id: I617cbe647338b8a4fb71788f04ab6e2c952780fc
This commit is contained in:
monica.dionisio
2011-05-04 11:18:03 -03:00
committed by Shawn O. Pearce
parent 283a13df29
commit 237174c276
9 changed files with 239 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
View File

@@ -156,16 +156,15 @@ public abstract class PatchScreen extends Screen implements
patchSetDetail = detail;
fileList = patchTable;
// If we have any diff side stored, make sure they are applicable to the
// current change, discard them otherwise.
//
Change.Id thisChangeId = id.getParentKey().getParentKey();
if (currentChangeId != null && !currentChangeId.equals(thisChangeId)) {
if (patchTable != null) {
diffSideA = patchTable.getPatchSetIdToCompareWith();
} else {
diffSideA = null;
diffSideB = null;
}
if (diffSideA == null) {
historyOpen = null;
}
currentChangeId = thisChangeId;
idSideA = diffSideA; // null here means we're diff'ing from the Base
idSideB = diffSideB != null ? diffSideB : id.getParentKey();
this.patchIndex = patchIndex;