Changeset 53076 in webkit

Timestamp:

Jan 11, 2010 7:52:48 AM (14 years ago)

Author:

ddkilzer@apple.com

Message:

Created a unit-tested function to parse the header block of
a Git or SVN diff -- for future refactoring of svn-apply and
svn-unapply.

Patch by Chris Jerdonek <​chris.jerdonek@gmail.com> on 2010-01-11
Reviewed by David Kilzer.

​https://bugs.webkit.org/show_bug.cgi?id=33447

• Scripts/VCSUtils.pm:
  • Added parseDiffHeader().
  • Removed irrelevant comment from gitdiff2svndiff().

• Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl: Added.
  • Added 48 unit tests for parseDiffHeader().

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (2 diffs)
• Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-11  Chris Jerdonek  <chris.jerdonek@gmail.com>
+
+        Reviewed by David Kilzer.
+
+        Created a unit-tested function to parse the header block of
+        a Git or SVN diff -- for future refactoring of svn-apply and
+        svn-unapply.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33447
+
+        * Scripts/VCSUtils.pm:
+          - Added parseDiffHeader().
+          - Removed irrelevant comment from gitdiff2svndiff().
+
+        * Scripts/webkitperl/VCSUtils_unittest/parseDiffHeader.pl: Added.
+          - Added 48 unit tests for parseDiffHeader().
+
 2010-01-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -366 +366 @@
 {
     $_ = shift @_;
-    
-    # \V is any character that is not vertical white space
+
     if (m#^diff --git \w/(.+) \w/([^\r\n]+)#) {
         return "Index: $1$POSTMATCH";
@@ -381 +380 @@
     }
     return $_;
+}
+
+# Parse the next diff header from the given file handle, and advance
+# the file handle so the last line read is the first line after the
+# parsed header block.
+#
+# This subroutine dies if given leading junk.
+#
+# Args:
+#   $fileHandle: advanced so the last line read is the first line of the
+#                next diff header. For SVN-formatted diffs, this is the
+#                "Index:" line.
+#   $line: the line last read from $fileHandle
+#
+# Returns ($headerHashRef, $foundHeaderEnding, $lastReadLine):
+#   $headerHashRef: a hash reference representing a diff header
+#     copiedFromPath: the path in the "from" clause, if any.
+#     copiedFromVersion: the revision number in the "from" clause, if any.
+#     indexPath: the path in the "Index:" line.
+#     svnConvertedText: the header text converted to SVN format.
+#                       Unrecognized Git lines are left alone.
+#     version: the revision number of the source.
+#   $foundHeaderEnding: whether the last header block line was found.
+#                       This is a line beginning with "+++".
+#   $lastReadLine: the line last read from $fileHandle. If EOF has not
+#                  been reached, this is the first line after the
+#                  header ending.
+sub parseDiffHeader($$)
+{
+    my ($fileHandle, $line) = @_;
+
+    my $filter;
+    if ($line =~ m#^diff --git #) {
+        $filter = \&gitdiff2svndiff;
+    }
+    $line = &$filter($line) if $filter;
+
+    my $indexPath;
+    if ($line =~ /^Index: ([^\r\n]+)/) {
+        $indexPath = $1;
+    } else {
+        die("Could not parse first line of diff header: \"$line\".");
+    }
+
+    my %header;
+
+    my $foundHeaderEnding = 0;
+    my $lastReadLine;
+    my $svnConvertedText = $line;
+    while (<$fileHandle>) {
+        # Temporarily strip off any end-of-line characters to simplify
+        # regex matching below.
+        s/([\n\r]+)$//;
+        my $eol = $1;
+
+        $_ = &$filter($_) if $filter;
+
+        # Fix paths on "diff", "---", and "+++" lines to match the
+        # leading index line.
+        s/\S+$/$indexPath/ if /^diff/; # FIXME: Can this ever occur? If so, include
+                                       #        a unit test. Otherwise, remove it.
+        s/^--- \S+/--- $indexPath/;
+        if (/^--- .+\(from (\S+):(\d+)\)$/) {
+            $header{copiedFromPath} = $1;
+            $header{copiedFromVersion} = $2 if ($2 != 0);
+        } elsif (/^--- .+\(revision (\d+)\)$/) {
+            $header{version} = $1 if ($1 != 0);
+        } elsif (s/^\+\+\+ \S+/+++ $indexPath/) {
+            $foundHeaderEnding = 1;
+        }
+
+        $svnConvertedText .= "$_$eol"; # Also restore EOL characters.
+        if ($foundHeaderEnding) {
+            $lastReadLine = <$fileHandle>;
+            last;
+        }
+    } # $lastReadLine is undef if while loop ran out.
+
+    $header{indexPath} = $indexPath;
+    $header{svnConvertedText} = $svnConvertedText;
+
+    return (\%header, $foundHeaderEnding, $lastReadLine);
 }