Title: [100585] trunk/Tools
- Revision
- 100585
- Author
- [email protected]
- Date
- 2011-11-17 02:04:48 -0800 (Thu, 17 Nov 2011)
Log Message
svn-apply shouldn't magically move files into Source anymore
https://bugs.webkit.org/show_bug.cgi?id=72579
Reviewed by Eric Seidel.
The Source directory has existed for long enough that we don't need
svn-apply to magically re-write old-style patches anymore.
* Scripts/VCSUtils.pm:
(parseGitDiffHeader):
(parseSvnDiffHeader):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100584 => 100585)
--- trunk/Tools/ChangeLog 2011-11-17 09:44:01 UTC (rev 100584)
+++ trunk/Tools/ChangeLog 2011-11-17 10:04:48 UTC (rev 100585)
@@ -1,3 +1,17 @@
+2011-11-17 Adam Barth <[email protected]>
+
+ svn-apply shouldn't magically move files into Source anymore
+ https://bugs.webkit.org/show_bug.cgi?id=72579
+
+ Reviewed by Eric Seidel.
+
+ The Source directory has existed for long enough that we don't need
+ svn-apply to magically re-write old-style patches anymore.
+
+ * Scripts/VCSUtils.pm:
+ (parseGitDiffHeader):
+ (parseSvnDiffHeader):
+
2011-11-16 Ryosuke Niwa <[email protected]>
Add a list of contribution areas
Modified: trunk/Tools/Scripts/VCSUtils.pm (100584 => 100585)
--- trunk/Tools/Scripts/VCSUtils.pm 2011-11-17 09:44:01 UTC (rev 100584)
+++ trunk/Tools/Scripts/VCSUtils.pm 2011-11-17 10:04:48 UTC (rev 100585)
@@ -422,19 +422,6 @@
}
}
-sub adjustPathForRecentRenamings($)
-{
- my ($fullPath) = @_;
-
- if ($fullPath =~ m|^WebCore/|
- || $fullPath =~ m|^_javascript_Core/|
- || $fullPath =~ m|^WebKit/|
- || $fullPath =~ m|^WebKit2/|) {
- return "Source/$fullPath";
- }
- return $fullPath;
-}
-
sub canonicalizePath($)
{
my ($file) = @_;
@@ -624,7 +611,7 @@
# 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 = adjustPathForRecentRenamings($4);
+ $indexPath = $4;
# Use $POSTMATCH to preserve the end-of-line character.
$_ = "Index: $indexPath$POSTMATCH"; # Convert to SVN format.
} else {
@@ -740,7 +727,7 @@
my $indexPath;
if (/$svnDiffStartRegEx/) {
- $indexPath = adjustPathForRecentRenamings($1);
+ $indexPath = $1;
} else {
die("First line of SVN diff does not begin with \"Index \": \"$_\"");
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
