| commit | 0f123852c40b5985c292677d290fba799ce7096e | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Sat Apr 29 08:20:32 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Apr 29 08:20:32 2017 +0000 |
| tree | b5d7662e34fa6d0cecf4877fe573502581b24dcd | |
| parent | a837a05bd7ad91f96de2561780b00620acc6b5d2 [diff] | |
| parent | 77fbd2189f4dc89e900d403c96e97d59353dc47d [diff] |
Merge "GET edit info: Expose base patch set number"
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EditInfo.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EditInfo.java index 9dc92a8..46ef879 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EditInfo.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/EditInfo.java
@@ -18,6 +18,7 @@ public class EditInfo { public CommitInfo commit; + public int basePatchSetNumber; public String baseRevision; public Map<String, FetchInfo> fetch; public Map<String, FileInfo> files;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java index 41af77d..78baef7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java
@@ -51,6 +51,7 @@ EditInfo out = new EditInfo(); out.commit = fillCommit(edit.getEditCommit()); out.baseRevision = edit.getBasePatchSet().getRevision().get(); + out.basePatchSetNumber = edit.getBasePatchSet().getPatchSetId(); if (downloadCommands) { out.fetch = fillFetchMap(edit); }