[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fadeae66de2949587714e596c7ed43491cced901
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 06:28:11 2011 +0000

    2011-01-01  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Teach svn-apply how to apply patches even though JavaScriptCore has moved
            https://bugs.webkit.org/show_bug.cgi?id=51796
    
            After this change, svn-apply will magically apply patches to
            JavaScriptCore/foo to Source/JavaScriptCore/foo.
    
            * Scripts/VCSUtils.pm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index fe8f6ce..017954b 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Eric Seidel.
 
+        Teach svn-apply how to apply patches even though JavaScriptCore has moved
+        https://bugs.webkit.org/show_bug.cgi?id=51796
+
+        After this change, svn-apply will magically apply patches to
+        JavaScriptCore/foo to Source/JavaScriptCore/foo.
+
+        * Scripts/VCSUtils.pm:
+
+2011-01-01  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Move JavaScriptCore to Source
         https://bugs.webkit.org/show_bug.cgi?id=51604
 
diff --git a/Tools/Scripts/VCSUtils.pm b/Tools/Scripts/VCSUtils.pm
index 93118a4..78ba217 100644
--- a/Tools/Scripts/VCSUtils.pm
+++ b/Tools/Scripts/VCSUtils.pm
@@ -392,6 +392,16 @@ sub normalizePath($)
     return $path;
 }
 
+sub adjustPathForRecentRenamings($)
+{
+    my ($fullPath) = @_;
+
+    if ($fullPath =~ m|^JavaScriptCore/|) {
+        return "Source/$fullPath";
+    }
+    return $fullPath;
+}
+
 sub canonicalizePath($)
 {
     my ($file) = @_;
@@ -511,7 +521,7 @@ sub parseGitDiffHeader($$)
         # The first and second paths can differ in the case of copies
         # and renames.  We use the second file path because it is the
         # destination path.
-        $indexPath = $4;
+        $indexPath = adjustPathForRecentRenamings($4);
         # Use $POSTMATCH to preserve the end-of-line character.
         $_ = "Index: $indexPath$POSTMATCH"; # Convert to SVN format.
     } else {
@@ -627,7 +637,7 @@ sub parseSvnDiffHeader($$)
 
     my $indexPath;
     if (/$svnDiffStartRegEx/) {
-        $indexPath = $1;
+        $indexPath = adjustPathForRecentRenamings($1);
     } else {
         die("First line of SVN diff does not begin with \"Index \": \"$_\"");
     }

-- 
WebKit Debian packaging