Title: [111503] trunk/Tools
- Revision
- 111503
- Author
- [email protected]
- Date
- 2012-03-20 22:45:06 -0700 (Tue, 20 Mar 2012)
Log Message
svn-apply should move inflight patches from WebCore/webaudio to WebCore/Modules/webaudio
https://bugs.webkit.org/show_bug.cgi?id=81567
Reviewed by Eric Seidel.
This temporary measure should help us avoid disrupting the folks
working on WebAudio when we move the webaudio directory to Modules.
* Scripts/VCSUtils.pm:
(adjustPathForRecentRenamings):
(parseGitDiffHeader):
(parseSvnDiffHeader):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111502 => 111503)
--- trunk/Tools/ChangeLog 2012-03-21 05:29:01 UTC (rev 111502)
+++ trunk/Tools/ChangeLog 2012-03-21 05:45:06 UTC (rev 111503)
@@ -1,3 +1,18 @@
+2012-03-20 Adam Barth <[email protected]>
+
+ svn-apply should move inflight patches from WebCore/webaudio to WebCore/Modules/webaudio
+ https://bugs.webkit.org/show_bug.cgi?id=81567
+
+ Reviewed by Eric Seidel.
+
+ This temporary measure should help us avoid disrupting the folks
+ working on WebAudio when we move the webaudio directory to Modules.
+
+ * Scripts/VCSUtils.pm:
+ (adjustPathForRecentRenamings):
+ (parseGitDiffHeader):
+ (parseSvnDiffHeader):
+
2012-03-20 Dirk Pranke <[email protected]>
Unreviewed, rolling out r111453.
Modified: trunk/Tools/Scripts/VCSUtils.pm (111502 => 111503)
--- trunk/Tools/Scripts/VCSUtils.pm 2012-03-21 05:29:01 UTC (rev 111502)
+++ trunk/Tools/Scripts/VCSUtils.pm 2012-03-21 05:45:06 UTC (rev 111503)
@@ -434,6 +434,15 @@
}
}
+sub adjustPathForRecentRenamings($)
+{
+ my ($fullPath) = @_;
+
+ $fullPath =~ s|WebCore/webaudio|WebCore/Modules/webaudio|g;
+
+ return $fullPath;
+}
+
sub canonicalizePath($)
{
my ($file) = @_;
@@ -624,7 +633,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 = $4;
+ $indexPath = adjustPathForRecentRenamings($4);
# Use $POSTMATCH to preserve the end-of-line character.
$_ = "Index: $indexPath$POSTMATCH"; # Convert to SVN format.
} else {
@@ -740,7 +749,7 @@
my $indexPath;
if (/$svnDiffStartRegEx/) {
- $indexPath = $1;
+ $indexPath = adjustPathForRecentRenamings($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
