gerrit-merge.patch

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
index 31ae9a1..964a96e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
@@ -1422,7 +1422,8 @@ public class ChangeScreen extends Screen {
       diffBase.addItem(Util.C.autoMerge(), DiffType.AUTO_MERGE.name());
       diffBase.addItem(Util.C.firstParent(), DiffType.FIRST_PARENT.name());
       if (diffType != null) {
-        selectedIdx = diffType == DiffType.AUTO_MERGE ? diffBase.getItemCount() - 2 : diffBase.getItemCount() -1;
+        selectedIdx =
+            diffBase.getItemCount() - (diffType == DiffType.AUTO_MERGE ? 2 : 1);
       }
     } else {
       diffBase.addItem(Util.C.baseDiffItem(), "");
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffApi.java
index e87d759..b0d0b58 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffApi.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffApi.java
@@ -61,7 +61,7 @@ public class DiffApi {
         .view("files").id(path)
         .view("diff");
     if (diffType != null) {
-      call.addParameter("type", diffType.name());
+      call.addParameter("type", diffType);
     }
     return new DiffApi(call);
   }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
index 5e8dae3..d7254d1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
@@ -95,8 +95,7 @@ public class Header extends Composite {
   private PreferencesAction prefsAction;
   private ReviewedState reviewedState;
 
-  Header(
-      KeyCommandSet keys,
+  Header(KeyCommandSet keys,
       PatchSet.Id base,
       PatchSet.Id patchSetId,
       DiffType diffType,
@@ -145,7 +144,8 @@ public class Header extends Composite {
 
   @Override
   protected void onLoad() {
-    DiffApi.list(patchSetId, base, DiffType.FIRST_PARENT, new GerritCallback<NativeMap<FileInfo>>() {
+    DiffApi.list(patchSetId, base, diffType,
+        new GerritCallback<NativeMap<FileInfo>>() {
       @Override
       public void onSuccess(NativeMap<FileInfo> result) {
         JsArray<FileInfo> files = result.values();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
index 4bac40a..5e967fd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
@@ -69,7 +69,7 @@ class PatchSetSelectBox extends Composite {
       DisplaySide side,
       Change.Id changeId,
       PatchSet.Id revision,
-      DiffType difType,
+      DiffType diffType,
       String path) {
     initWidget(uiBinder.createAndBindUi(this));
     icon.setTitle(PatchUtil.C.addFileCommentToolTip());
@@ -80,7 +80,7 @@ class PatchSetSelectBox extends Composite {
     this.sideA = side == DisplaySide.A;
     this.changeId = changeId;
     this.revision = revision;
-    this.diffType = difType;
+    this.diffType = diffType;
     this.idActive = (sideA && revision == null) ? null : revision;
     this.path = path;
   }
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java
index ca356f5..7f3965a 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java
@@ -148,7 +148,8 @@ class PatchSetDetailFactory extends Handler<PatchSetDetail> {
 
         list = listFor(keyFor(diffPrefs.ignoreWhitespace));
       } else { // OK, means use base to compare
-        list = patchListCache.get(control.getChange(), patchSet, DiffType.AUTO_MERGE);
+        list = patchListCache.get(control.getChange(), patchSet,
+            DiffType.AUTO_MERGE);
       }
     } catch (PatchListNotAvailableException e) {
       throw new NoSuchEntityException();
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
index 7f4fd12..4f2ed31 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
@@ -188,7 +188,7 @@ public final class PatchSet {
   protected String groups;
 
   /** Certificate sent with a push that created this patch set. */
-  @Column(id = 7, notNull = false)
+  @Column(id = 7, notNull = false, length = Integer.MAX_VALUE)
   protected String pushCertficate;
 
   protected PatchSet() {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
index 5006d57..7f7eb22 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
@@ -45,8 +45,8 @@ public class FileInfoJson {
     this.patchListCache = patchListCache;
   }
 
-  Map<String, FileInfo> toFileInfoMap(Change change, PatchSet patchSet, DiffType difftype)
-      throws PatchListNotAvailableException {
+  Map<String, FileInfo> toFileInfoMap(Change change, PatchSet patchSet,
+      DiffType difftype) throws PatchListNotAvailableException {
     return toFileInfoMap(change, patchSet.getRevision(), null, difftype);
   }
 
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 a8d05fa..2a67946 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
@@ -63,7 +63,8 @@ public class PatchListKey implements Serializable {
     this(a, b, ws, DiffType.AUTO_MERGE);
   }
 
-  public PatchListKey(AnyObjectId a, AnyObjectId b, Whitespace ws, DiffType dt) {
+  public PatchListKey(AnyObjectId a, AnyObjectId b, Whitespace ws,
+      DiffType dt) {
     oldId = a != null ? a.copy() : null;
     newId = b.copy();
     whitespace = ws;
@@ -98,6 +99,7 @@ public class PatchListKey implements Serializable {
     }
 
     h = h * 31 + newId.hashCode();
+    h = h * 31 + difftype.name().hashCode();
     h = h * 31 + whitespace.name().hashCode();
 
     return h;
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 6ed0ac6..7c3653f 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
@@ -179,10 +179,10 @@ public class PatchListLoader implements Callable<PatchList> {
 
       Set<String> paths = null;
       if (key.getOldId() != null) {
-        PatchListKey newKey =
-            new PatchListKey(null, key.getNewId(), key.getWhitespace(), key.getDiffType());
-        PatchListKey oldKey =
-            new PatchListKey(null, key.getOldId(), key.getWhitespace(), key.getDiffType());
+        PatchListKey newKey = new PatchListKey(null, key.getNewId(),
+            key.getWhitespace(), key.getDiffType());
+        PatchListKey oldKey = new PatchListKey(null, key.getOldId(),
+            key.getWhitespace(), key.getDiffType());
         paths = FluentIterable
             .from(patchListCache.get(newKey, project).getPatches())
             .append(patchListCache.get(oldKey, project).getPatches())