opendev/gerrit
Code Issues Proposed changes

Merge changes I66527dd1,Iafcfe3f2,I1f7d77fc,I8a75c32a

Browse Source 
* changes:
  GetMergeList: Also allow caching of responses for non-merges
  Include a magic /MERGE_LIST file for merge commits
  Patch: Add static method to check if file is magic
  Don't compare commit message against auto-merge commit
This commit is contained in:
ekempin
2016-09-21 09:06:58 +00:00
committed by Gerrit Code Review
parent e0b413a170 bf5381df7d
commit b7f970bf12
36 changed files with 808 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/FileInfo.java
View File

@@ -56,6 +56,12 @@ public class FileInfo extends JavaScriptObject {
} else if (Patch.COMMIT_MSG.equals(b.path())) {
return 1;
}
if (Patch.MERGE_LIST.equals(a.path())) {
return -1;
} else if (Patch.MERGE_LIST.equals(b.path())) {
return 1;
}
// Look at file suffixes to check if it makes sense to use a different order
int s1 = a.path().lastIndexOf('.');
int s2 = b.path().lastIndexOf('.');
@@ -76,9 +82,15 @@ public class FileInfo extends JavaScriptObject {
}
public static String getFileName(String path) {
String fileName = Patch.COMMIT_MSG.equals(path)
? "Commit Message"
: path;
String fileName;
if (Patch.COMMIT_MSG.equals(path)) {
fileName = "Commit Message";
} else if (Patch.MERGE_LIST.equals(path)) {
fileName = "Merge List";
} else {
fileName = path;
}
int s = fileName.lastIndexOf('/');
return s >= 0 ? fileName.substring(s + 1) : fileName;
}