opendev/gerrit
Code Issues Proposed changes

Filter MERGE_LIST magic file from Prolog facts

Browse Source 
MERGE_LIST is magic file just like COMMIT_MSG.  Using the general
isMagic function to filter out the paths.

Change-Id: I4799817d24f770f0e76874b499de653b970320e4
This commit is contained in:
Kenny Ho
2018-11-14 18:09:51 -05:00
parent 48827f6916
commit 5d33f73866
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/gerrit/PRED_commit_delta_4.java
View File

@@ -102,7 +102,7 @@ public class PRED_commit_delta_4 extends Predicate.P4 {
String oldName = patch.getOldName(); String oldName = patch.getOldName();
Patch.ChangeType changeType = patch.getChangeType(); Patch.ChangeType changeType = patch.getChangeType();
if (newName.equals("/COMMIT_MSG")) { if (Patch.isMagic(newName)) {
continue; continue;
} }

3
java/gerrit/PRED_commit_edits_2.java
View File

@@ -14,6 +14,7 @@
package gerrit; package gerrit;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry; import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.patch.Text; import com.google.gerrit.server.patch.Text;
@@ -90,7 +91,7 @@ public class PRED_commit_edits_2 extends Predicate.P2 {
String newName = entry.getNewName(); String newName = entry.getNewName();
String oldName = entry.getOldName(); String oldName = entry.getOldName();
if (newName.equals("/COMMIT_MSG")) { if (Patch.isMagic(newName)) {
continue; continue;
} }