Changeset 64072 in webkit

Timestamp:

Jul 26, 2010 1:58:03 PM (14 years ago)

Author:

dbates@webkit.org

Message:

2010-07-26 Daniel Bates <​dbates@rim.com>

Reviewed by Darin Adler.

svn-unapply warns of uninitialized variable when unapplying
a patch that describes an svn move operation
​https://bugs.webkit.org/show_bug.cgi?id=42036

Fixes Perl uninitialized variable warnings when un-applying
a patch that moves a file.

• Scripts/svn-unapply:
  • Modified patch() so that it initializes $patch to the empty string when we don't have svnConvertedText (such as when reversing a diff that represents a svn copy/move operation).

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/svn-unapply (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-26  Daniel Bates  <dbates@rim.com>
+
+        Reviewed by Darin Adler.
+
+        svn-unapply warns of uninitialized variable when unapplying
+        a patch that describes an svn move operation
+        https://bugs.webkit.org/show_bug.cgi?id=42036
+
+        Fixes Perl uninitialized variable warnings when un-applying
+        a patch that moves a file.
+
+        * Scripts/svn-unapply:
+          - Modified patch() so that it initializes $patch to the empty
+            string when we don't have svnConvertedText (such as when
+            reversing a diff that represents a svn copy/move operation).
+
 2010-07-26  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/Scripts/svn-unapply

@@ -140 +140 @@
     my ($diffHashRef) = @_;
 
-    my $patch = $diffHashRef->{svnConvertedText};
+    # Make sure $patch is initialized to some value.  There is no
+    # svnConvertedText when reversing an svn copy/move.
+    my $patch = $diffHashRef->{svnConvertedText} || "";
 
     my $fullPath = $diffHashRef->{indexPath};
@@ -202 +204 @@
             #        code.  In particular, svn-apply's scmRemove() subroutine
             #        should be used here.
-            unapplyPatch($patch, $fullPath, ["--force"]);
+            unapplyPatch($patch, $fullPath, ["--force"]) if $patch;
             unlink($fullPath) if -z $fullPath;
             system "svn", "revert", $fullPath;