Changeset 53040 in webkit

Timestamp:

Jan 9, 2010 2:50:53 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-09 Chris Jerdonek <​chris.jerdonek@gmail.com>

Reviewed by David Kilzer.

Modified VCSUtils::gitdiff2svndiff() to accept strings that
end in vertical white space.

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

• Scripts/VCSUtils.pm:
• Scripts/webkitperl/VCSUtils_unittest/gitdiff2svndiff.pl:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-09  Chris Jerdonek  <chris.jerdonek@gmail.com>
+
+        Reviewed by David Kilzer.
+
+        Modified VCSUtils::gitdiff2svndiff() to accept strings that
+        end in vertical white space.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33415
+
+        * Scripts/VCSUtils.pm:
+        * Scripts/webkitperl/VCSUtils_unittest/gitdiff2svndiff.pl:
+
 2010-01-08  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/VCSUtils.pm

@@ -33 +33 @@
 
 use Cwd qw();  # "qw()" prevents warnings about redefining getcwd() with "use POSIX;"
+use English; # for $POSTMATCH, etc.
 use File::Basename;
 use File::Spec;
@@ -360 +361 @@
 }
 
+# Convert a line of a git-formatted patch to SVN format, while
+# preserving any end-of-line characters.
 sub gitdiff2svndiff($)
 {
     $_ = shift @_;
-    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#^--- \w/(.+)#) {
-        return "--- $1";
-    } elsif (m#^\+\+\+ \w/(.+)#) {
-        return "+++ $1";
+    
+    # \V is any character that is not vertical white space
+    if (m#^diff --git \w/(.+) \w/([^\r\n]+)#) {
+        return "Index: $1$POSTMATCH";
+    }
+    if (m#^index [0-9a-f]{7}\.\.[0-9a-f]{7} [0-9]{6}#) {
+        return "===================================================================$POSTMATCH";
+    }
+    if (m#^--- \w/([^\r\n]+)#) {
+        return "--- $1$POSTMATCH";
+    }
+    if (m#^\+\+\+ \w/([^\r\n]+)#) {
+        return "+++ $1$POSTMATCH";
     }
     return $_;

trunk/WebKitTools/Scripts/webkitperl/VCSUtils_unittest/gitdiff2svndiff.pl

@@ -1 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # Copyright (C) 2009, 2010 Chris Jerdonek (chris.jerdonek@gmail.com)
@@ -32 +32 @@
 # Unit tests of VCSUtils::gitdiff2svndiff()
 
-use Test::Simple tests => 6;
+use strict;
+use warnings;
+
+use Test::Simple tests => 20;
 use VCSUtils;
 
-my $out;
-my $title;
-
-# New test
-$title = "gitdiff2svndiff: Convert standard git diff to svn diff";
+# We use this for display purposes, to keep each test title on one line.
+sub excerptString($)
+{
+    my ($text) = @_;
+    
+    my $length = 25;
+    
+    my $shortened = substr($text, 0, $length);
+    $shortened .= "..." if (length($text) > $length);
+    
+    return $shortened;
+}
 
 my $git_patch = <<END;
@@ -57 +67 @@
 END
 
-$out = "";
+my @gitLines = split("\n", $git_patch);
+my @svnLines = split("\n", $svn_patch);
 
-foreach my $line (split('\n', $git_patch)) {
-    $out .= gitdiff2svndiff($line) . "\n";
+# New test: check each git header line with different line endings
+my $titleHeader = "gitdiff2svndiff: ";
+
+my @lineEndingPairs = ( # display name, value
+    ["", ""],
+    ["\\n", "\n"],
+    ["\\r\\n", "\r\n"],
+);
+
+for (my $i = 0; $i < @gitLines; $i++) {
+    foreach my $pair (@lineEndingPairs) { 
+        my $gitLine = $gitLines[$i] . $pair->[1];
+        my $expected = $svnLines[$i] . $pair->[1];
+        my $title = $titleHeader . excerptString($gitLine);
+        $title .= " [line-end: \"$pair->[0]\"]";
+        
+        ok($expected eq gitdiff2svndiff($gitLine), $title);
+    }
 }
 
-ok($svn_patch eq $out, $title);
-
 # New test
-$title = "gitdiff2svndiff: Convert mnemonic git diff to svn diff";
+my $title = "gitdiff2svndiff: Convert mnemonic git diff to svn diff";
 
 my @prefixes = (
@@ -75 +100 @@
     { 'a' => '1', 'b' => '2' }, # git diff --no-index a b (compares two non-git things (1) and (2))
 );
+
+my $out = "";
 
 foreach my $prefix (@prefixes) {