Commit a1ae49ef authored by abarth@webkit.org's avatar abarth@webkit.org

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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100585 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1f3153b3
2011-11-17 Adam Barth <abarth@webkit.org>
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 <rniwa@webkit.org>
Add a list of contribution areas
......@@ -422,19 +422,6 @@ sub possiblyColored($$)
}
}
sub adjustPathForRecentRenamings($)
{
my ($fullPath) = @_;
if ($fullPath =~ m|^WebCore/|
|| $fullPath =~ m|^JavaScriptCore/|
|| $fullPath =~ m|^WebKit/|
|| $fullPath =~ m|^WebKit2/|) {
return "Source/$fullPath";
}
return $fullPath;
}
sub canonicalizePath($)
{
my ($file) = @_;
......@@ -624,7 +611,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 = 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 @@ sub parseSvnDiffHeader($$)
my $indexPath;
if (/$svnDiffStartRegEx/) {
$indexPath = adjustPathForRecentRenamings($1);
$indexPath = $1;
} else {
die("First line of SVN diff does not begin with \"Index \": \"$_\"");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment