fixes #193 - allow to parse copy commands from a diff

wumpz · wumpz · commit aff6bfed2953 · 2024-09-24T21:46:04.000+02:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java
@@ -30,6 +30,8 @@ public final class UnifiedDiffFile {
     private String toFile;
     private String renameFrom;
     private String renameTo;
+    private String copyFrom;
+    private String copyTo;
     private String toTimestamp;
     private String index;
     private String newFileMode;
@@ -119,6 +121,22 @@ public void setRenameTo(String renameTo) {
         this.renameTo = renameTo;
     }
 
+    public String getCopyFrom() {
+        return copyFrom;
+    }
+
+    public void setCopyFrom(String copyFrom) {
+        this.copyFrom = copyFrom;
+    }
+
+    public String getCopyTo() {
+        return copyTo;
+    }
+
+    public void setCopyTo(String copyTo) {
+        this.copyTo = copyTo;
+    }
+
     public static UnifiedDiffFile from(String fromFile, String toFile, Patch<String> patch) {
         UnifiedDiffFile file = new UnifiedDiffFile();
         file.setFromFile(fromFile);
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -51,6 +51,9 @@ public final class UnifiedDiffReader {
     private final UnifiedDiffLine TO_FILE = new UnifiedDiffLine(true, "^\\+\\+\\+\\s", this::processToFile);
     private final UnifiedDiffLine RENAME_FROM = new UnifiedDiffLine(true, "^rename\\sfrom\\s(.+)$", this::processRenameFrom);
     private final UnifiedDiffLine RENAME_TO = new UnifiedDiffLine(true, "^rename\\sto\\s(.+)$", this::processRenameTo);
+    
+    private final UnifiedDiffLine COPY_FROM = new UnifiedDiffLine(true, "^copy\\sfrom\\s(.+)$", this::processCopyFrom);
+    private final UnifiedDiffLine COPY_TO = new UnifiedDiffLine(true, "^copy\\sto\\s(.+)$", this::processCopyTo);
 
     private final UnifiedDiffLine NEW_FILE_MODE = new UnifiedDiffLine(true, "^new\\sfile\\smode\\s(\\d+)", this::processNewFileMode);
 
@@ -103,6 +106,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 if (validLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
                             FROM_FILE, TO_FILE,
                             RENAME_FROM, RENAME_TO,
+                                  COPY_FROM, COPY_TO,
                             NEW_FILE_MODE, DELETED_FILE_MODE,
                             OLD_MODE, NEW_MODE,
                             BINARY_ADDED, BINARY_DELETED,
@@ -122,6 +126,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                     if (!processLine(line, DIFF_COMMAND, SIMILARITY_INDEX, INDEX,
                             FROM_FILE, TO_FILE,
                             RENAME_FROM, RENAME_TO,
+                            COPY_FROM, COPY_TO,
                             NEW_FILE_MODE, DELETED_FILE_MODE,
                             OLD_MODE, NEW_MODE,
                             BINARY_ADDED , BINARY_DELETED,
@@ -344,6 +349,14 @@ private void processRenameFrom(MatchResult match, String line) {
     private void processRenameTo(MatchResult match, String line) {
         actualFile.setRenameTo(match.group(1));
     }
+    
+    private void processCopyFrom(MatchResult match, String line) {
+        actualFile.setCopyFrom(match.group(1));
+    }
+
+    private void processCopyTo(MatchResult match, String line) {
+        actualFile.setCopyTo(match.group(1));
+    }
 
     private void processNewFileMode(MatchResult match, String line) {
         //initFileIfNecessary();
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -435,4 +435,15 @@ public void testParseIssue182mode() throws IOException {
         assertThat(file1.getOldMode()).isEqualTo("100644");
         assertThat(file1.getNewMode()).isEqualTo("100755");
     }
+    
+    @Test
+    public void testParseIssue193Copy() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_parsing_issue193.diff"));
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getCopyFrom()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.pcf");
+        assertThat(file1.getCopyTo()).isEqualTo("modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue193.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_parsing_issue193.diff
@@ -0,0 +1,26 @@
+diff --git src://modules/configuration/config/web/pcf/account/AccountContactCV.pcf dst://modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf
+similarity index 99%
+copy from modules/configuration/config/web/pcf/account/AccountContactCV.pcf
+copy to modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf
+index 13efef5778..1a08b0befc 100644
+--- src://modules/configuration/config/web/pcf/account/AccountContactCV.pcf
++++ dst://modules/configuration/config/web/pcf/account/AccountContactCV.default.pcf
+@@ -1,16 +1,17 @@
+ <?xml version="1.0"?>
+ <PCF
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:noNamespaceSchemaLocation="../../../../../pcf.xsd">
+   <CardViewPanel
+-    id="AccountContactCV">
++    id="AccountContactCV"
++    mode="default">
+     <Require
+       name="acctContact"
+       type="AccountContact"/>
+     <Require
+       name="showAddressTools"
+       type="boolean"/>
+     <Require
+       name="showRolesTab"
+       type="boolean"/>
+     <Variable
