Changeset 52739 in webkit

Timestamp:

Jan 4, 2010 8:12:27 AM (14 years ago)

Author:

vestbo@webkit.org

Message:

Add support for Git's "diff.mnemonicprefix" config option to WebKitTools

Reviewed by David Kilzer.

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

• Scripts/VCSUtils.pm:
• Scripts/svn-apply:
• Scripts/svn-unapply:
• Scripts/test-webkitperl: Run gitdiff2svndiff test
• Scripts/webkitperl/VCSUtils_unittest/gitdiff2svndiff.pl: Added.
• Scripts/webkitpy/diff_parser.py:
• Scripts/webkitpy/diff_parser_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (1 diff)
• Scripts/svn-apply (modified) (1 diff)
• Scripts/svn-unapply (modified) (1 diff)
• Scripts/test-webkitperl (modified) (1 diff)
• Scripts/webkitperl/VCSUtils_unittest/gitdiff2svndiff.pl (added)
• Scripts/webkitpy/diff_parser.py (modified) (2 diffs)
• Scripts/webkitpy/diff_parser_unittest.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by David Kilzer.
+
+        Add support for Git's "diff.mnemonicprefix" config option to WebKitTools
+
+        https://bugs.webkit.org/show_bug.cgi?id=32820
+
+        * Scripts/VCSUtils.pm:
+        * Scripts/svn-apply:
+        * Scripts/svn-unapply:
+        * Scripts/test-webkitperl: Run gitdiff2svndiff test
+        * Scripts/webkitperl/VCSUtils_unittest/gitdiff2svndiff.pl: Added.
+        * Scripts/webkitpy/diff_parser.py:
+        * Scripts/webkitpy/diff_parser_unittest.py:
+
 2010-01-04  Chris Jerdonek  <chris.jerdonek@gmail.com>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -363 +363 @@
 {
     $_ = shift @_;
-    if (m#^diff --git a/(.+) b/(.+)#) {
+    if (m#^diff --git \w/(.+) \w/(.+)#) {
         return "Index: $1";
     } elsif (m#^index [0-9a-f]{7}\.\.[0-9a-f]{7} [0-9]{6}#) {
         return "===================================================================";
-    } elsif (m#^--- a/(.+)#) {
+    } elsif (m#^--- \w/(.+)#) {
         return "--- $1";
-    } elsif (m#^\+\+\+ b/(.+)#) {
+    } elsif (m#^\+\+\+ \w/(.+)#) {
         return "+++ $1";
     }

trunk/WebKitTools/Scripts/svn-apply

@@ -134 +134 @@
     s/([\n\r]+)$//mg;
     my $eol = $1;
-    if (!defined($indexPath) && m#^diff --git a/#) {
+    if (!defined($indexPath) && m#^diff --git \w/#) {
         $filter = \&gitdiff2svndiff;
     }

trunk/WebKitTools/Scripts/svn-unapply

@@ -105 +105 @@
     s/([\n\r]+)$//mg;
     my $eol = $1;
-    if (!defined($indexPath) && m#^diff --git a/#) {
+    if (!defined($indexPath) && m#^diff --git \w/#) {
         $filter = \&gitdiff2svndiff;
     }

trunk/WebKitTools/Scripts/test-webkitperl

@@ -44 +44 @@
     "fixChangeLogPatch.pl",
     "generatePatchCommand.pl",
+    "gitdiff2svndiff.pl",
     "runPatchCommand.pl",
 );

trunk/WebKitTools/Scripts/webkitpy/diff_parser.py

@@ -49 +49 @@
       line: A string representing a line of the diff.
     """
-    conversion_patterns = (("^diff --git a/(.+) b/(?P<FilePath>.+)", lambda matched: "Index: " + matched.group('FilePath') + "\n"),
+    conversion_patterns = (("^diff --git \w/(.+) \w/(?P<FilePath>.+)", lambda matched: "Index: " + matched.group('FilePath') + "\n"),
                            ("^new file.*", lambda matched: "\n"),
                            ("^index [0-9a-f]{7}\.\.[0-9a-f]{7} [0-9]{6}", lambda matched: "===================================================================\n"),
-                           ("^--- a/(?P<FilePath>.+)", lambda matched: "--- " + matched.group('FilePath') + "\n"),
-                           ("^\+\+\+ b/(?P<FilePath>.+)", lambda matched: "+++ " + matched.group('FilePath') + "\n"))
+                           ("^--- \w/(?P<FilePath>.+)", lambda matched: "--- " + matched.group('FilePath') + "\n"),
+                           ("^\+\+\+ \w/(?P<FilePath>.+)", lambda matched: "+++ " + matched.group('FilePath') + "\n"))
 
     for pattern, conversion in conversion_patterns:
@@ -70 +70 @@
                        converter from git to SVN.
     """
-    if match(r"^diff --git a/", first_diff_line):
+    if match(r"^diff --git \w/", first_diff_line):
         return git_diff_to_svn_diff
     return lambda input: input

trunk/WebKitTools/Scripts/webkitpy/diff_parser_unittest.py

@@ -29 +29 @@
 import unittest
 import diff_parser
+import re
 
 
@@ -83 +84 @@
 +61a373ee739673a9dcd7bac62b9f182e
 \ No newline at end of file
-'''.splitlines()
+'''
 
-
-    def test_diff_parser(self):
-        parser = diff_parser.DiffParser(self._PATCH)
+    def test_diff_parser(self, parser = None):
+        if not parser:
+            parser = diff_parser.DiffParser(self._PATCH.splitlines())
         self.assertEquals(3, len(parser.files))
 
@@ -127 +128 @@
         self.assertEquals((0, 1), diff.lines[0][0:2])
 
+    def test_git_mnemonicprefix(self):
+        p = re.compile(r' ([a|b])/')
+
+        prefixes = [
+            { 'a' : 'i', 'b' : 'w' }, # git-diff (compares the (i)ndex and the (w)ork tree)
+            { 'a' : 'c', 'b' : 'w' }, # git-diff HEAD (compares a (c)ommit and the (w)ork tree)
+            { 'a' : 'c', 'b' : 'i' }, # git diff --cached (compares a (c)ommit and the (i)ndex)
+            { 'a' : 'o', 'b' : 'w' }, # git-diff HEAD:file1 file2 (compares an (o)bject and a (w)ork tree entity)
+            { 'a' : '1', 'b' : '2' }, # git diff --no-index a b (compares two non-git things (1) and (2))
+        ]
+
+        for prefix in prefixes:
+            patch = p.sub(lambda x: " %s/" % prefix[x.group(1)], self._PATCH)
+            self.test_diff_parser(diff_parser.DiffParser(patch.splitlines()))
 
 if __name__ == '__main__':