opendev/gerrit
Code Issues Proposed changes

Add more information to MergeableInfo to indicate a merged commit

Browse Source 
Add two fields contentMerged and commitMerged into MergeableInfo.
contentMerged is true if the content of the commit is merged,
commitMerged is true if the commit itself is merged.

Also add more tests for CheckMergeability class.

Change-Id: Ia756644411f217b8d8bae06f44f14a24597544bd
This commit is contained in:
Zhen Chen
2016-07-26 16:54:59 -07:00
parent 93a4c8e42d
commit 8f00d55d11
10 changed files with 522 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergeableInfo.java
View File

@@ -22,6 +22,8 @@ public class MergeableInfo {
public SubmitType submitType;
public String strategy;
public boolean mergeable;
public boolean commitMerged;
public boolean contentMerged;
public List<String> conflicts;
public List<String> mergeableInto;
}