Log Message
svn-apply cannot apply patches which is generated by git to files that contain space characters in their path https://bugs.webkit.org/show_bug.cgi?id=111066
Patch by Yuki Sekiguchi <yuki.sekigu...@access-company.com> on 2013-06-06 Reviewed by Daniel Bates. Fixes an issue where parseGitDiffHeader() would extract the wrong substring of the diff --git line as the target file path when the source file path contains a space character. ParseGitDiffHeader() should support the path which line has space characters. To support this, I changed parsing algorithm like the following: - When the diff have prefix, we consider next characters after "b/" as part of a file path. - When the diff have no prefix, we assume that both path have same directory prefix, and we split the diff line using the prefix. We only support --src-prefix and --dst-prefix don't contain a non-word character (\W) and end with '/' because we cannot distinguish the prefix from directory path. If the path has a tab, the patch(1) command thinks file path is characters before the tab. I added a dummy tab and revision when we convert git diff to svn diff. * Scripts/VCSUtils.pm: (parseGitDiffHeader): * Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl: Update expectations for dummy revision. * Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl: Ditto. * Scripts/webkitperl/VCSUtils_unittest/parseGitDiffHeader.pl: Ditto. - Added test case for files which have space in their path and --src-prefix and --dst-prefix option.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (151299 => 151300)
--- trunk/Tools/ChangeLog 2013-06-06 23:33:52 UTC (rev 151299)
+++ trunk/Tools/ChangeLog 2013-06-06 23:37:24 UTC (rev 151300)
@@ -1,3 +1,29 @@
+2013-06-06 Yuki Sekiguchi <yuki.sekigu...@access-company.com>
+
+ svn-apply cannot apply patches which is generated by git to files that contain space characters in their path
+ https://bugs.webkit.org/show_bug.cgi?id=111066
+
+ Reviewed by Daniel Bates.
+
+ Fixes an issue where parseGitDiffHeader() would extract the wrong substring of the diff --git line as the target file path when the source file path contains a space character.
+
+ ParseGitDiffHeader() should support the path which line has space characters.
+ To support this, I changed parsing algorithm like the following:
+ - When the diff have prefix, we consider next characters after "b/" as part of a file path.
+ - When the diff have no prefix, we assume that both path have same directory prefix, and we split the diff line using the prefix.
+
+ We only support --src-prefix and --dst-prefix don't contain a non-word character (\W) and end with '/' because we cannot distinguish the prefix from directory path.
+
+ If the path has a tab, the patch(1) command thinks file path is characters before the tab.
+ I added a dummy tab and revision when we convert git diff to svn diff.
+
+ * Scripts/VCSUtils.pm:
+ (parseGitDiffHeader):
+ * Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl: Update expectations for dummy revision.
+ * Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl: Ditto.
+ * Scripts/webkitperl/VCSUtils_unittest/parseGitDiffHeader.pl: Ditto.
+ - Added test case for files which have space in their path and --src-prefix and --dst-prefix option.
+
2013-06-06 Simon Fraser <simon.fra...@apple.com>
Add a menu item to MiniBrowser to toggle Transparent windows
Modified: trunk/Tools/Scripts/VCSUtils.pm (151299 => 151300)
--- trunk/Tools/Scripts/VCSUtils.pm 2013-06-06 23:33:52 UTC (rev 151299)
+++ trunk/Tools/Scripts/VCSUtils.pm 2013-06-06 23:37:24 UTC (rev 151300)
@@ -107,8 +107,11 @@
# Project time zone for Cupertino, CA, US
my $changeLogTimeZone = "PST8PDT";
-my $gitDiffStartRegEx = qr#^diff --git (\w/)?(.+) (\w/)?([^\r\n]+)#;
+my $gitDiffStartRegEx = qr#^diff --git [^\r\n]+#;
+my $gitDiffStartWithPrefixRegEx = qr#^diff --git \w/(.+) \w/([^\r\n]+)#; # We suppose that --src-prefix and --dst-prefix don't contain a non-word character (\W) and end with '/'.
+my $gitDiffStartWithoutPrefixNoSpaceRegEx = qr#^diff --git (\S+) (\S+)$#;
my $svnDiffStartRegEx = qr#^Index: ([^\r\n]+)#;
+my $gitDiffStartWithoutPrefixSourceDirectoryPrefixRegExp = qr#^diff --git ([^/]+/)#;
my $svnPropertiesStartRegEx = qr#^Property changes on: ([^\r\n]+)#; # $1 is normally the same as the index path.
my $svnPropertyStartRegEx = qr#^(Modified|Name|Added|Deleted): ([^\r\n]+)#; # $2 is the name of the property.
my $svnPropertyValueStartRegEx = qr#^\s*(\+|-|Merged|Reverse-merged)\s*([^\r\n]+)#; # $2 is the start of the property's value (which may span multiple lines).
@@ -615,6 +618,32 @@
return $fileMode % 2;
}
+# Parse the Git diff header start line.
+#
+# Args:
+# $line: "diff --git" line.
+#
+# Returns the path of the target file.
+sub parseGitDiffStartLine($)
+{
+ my $line = shift;
+ $_ = $line;
+ if (/$gitDiffStartWithPrefixRegEx/ || /$gitDiffStartWithoutPrefixNoSpaceRegEx/) {
+ return $2;
+ }
+ # Assume the diff was generated with --no-prefix (e.g. git diff --no-prefix).
+ if (!/$gitDiffStartWithoutPrefixSourceDirectoryPrefixRegExp/) {
+ # FIXME: Moving top directory file is not supported (e.g diff --git A.txt B.txt).
+ die("Could not find '/' in \"diff --git\" line: \"$line\"; only non-prefixed git diffs (i.e. not generated with --no-prefix) that move a top-level directory file are supported.");
+ }
+ my $pathPrefix = $1;
+ if (!/^diff --git \Q$pathPrefix\E.+ (\Q$pathPrefix\E.+)$/) {
+ # FIXME: Moving a file through sub directories of top directory is not supported (e.g diff --git A/B.txt C/B.txt).
+ die("Could not find '/' in \"diff --git\" line: \"$line\"; only non-prefixed git diffs (i.e. not generated with --no-prefix) that move a file between top-level directories are supported.");
+ }
+ return $1;
+}
+
# Parse the next Git diff header from the given file handle, and advance
# the handle so the last line read is the first line after the header.
#
@@ -656,12 +685,15 @@
my $indexPath;
if (/$gitDiffStartRegEx/) {
+ # Use $POSTMATCH to preserve the end-of-line character.
+ my $eol = $POSTMATCH;
+
# 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);
- # Use $POSTMATCH to preserve the end-of-line character.
- $_ = "Index: $indexPath$POSTMATCH"; # Convert to SVN format.
+ $indexPath = adjustPathForRecentRenamings(parseGitDiffStartLine($_));
+
+ $_ = "Index: $indexPath$eol"; # Convert to SVN format.
} else {
die("Could not parse leading \"diff --git\" line: \"$line\".");
}
@@ -690,9 +722,9 @@
$isNew = 1 if $1;
} elsif (/^similarity index (\d+)%/) {
$similarityIndex = $1;
- } elsif (/^copy from (\S+)/) {
+ } elsif (/^copy from ([^\t\r\n]+)/) {
$copiedFromPath = $1;
- } elsif (/^rename from (\S+)/) {
+ } elsif (/^rename from ([^\t\r\n]+)/) {
# FIXME: Record this as a move rather than as a copy-and-delete.
# This will simplify adding rename support to svn-unapply.
# Otherwise, the hash for a deletion would have to know
@@ -702,9 +734,17 @@
$copiedFromPath = $1;
$shouldDeleteSource = 1;
} elsif (/^--- \S+/) {
- $_ = "--- $indexPath"; # Convert to SVN format.
+ # Convert to SVN format.
+ # We emit the suffix "\t(revision 0)" to handle $indexPath which contains a space character.
+ # The patch(1) command thinks a file path is characters before a tab.
+ # This suffix make our diff more closely match the SVN diff format.
+ $_ = "--- $indexPath\t(revision 0)";
} elsif (/^\+\+\+ \S+/) {
- $_ = "+++ $indexPath"; # Convert to SVN format.
+ # Convert to SVN format.
+ # We emit the suffix "\t(working copy)" to handle $indexPath which contains a space character.
+ # The patch(1) command thinks a file path is characters before a tab.
+ # This suffix make our diff more closely match the SVN diff format.
+ $_ = "+++ $indexPath\t(working copy)";
$foundHeaderEnding = 1;
} elsif (/^GIT binary patch$/ ) {
$isBinary = 1;
Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl (151299 => 151300)
--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl 2013-06-06 23:33:52 UTC (rev 151299)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl 2013-06-06 23:37:24 UTC (rev 151300)
@@ -980,11 +980,11 @@
END
expectedReturn => [
[{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: Makefile
index f5d5e74..3b6aa92 100644
---- Makefile
-+++ Makefile
+--- Makefile\t(revision 0)
++++ Makefile\t(working copy)
@@ -1,1 +1,1 @@ public:
END
indexPath => "Makefile",
@@ -1008,11 +1008,11 @@
END
expectedReturn => [
[{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo
index 863339f..db418b2 100644
---- foo
-+++ foo
+--- foo\t(revision 0)
++++ foo\t(working copy)
@@ -1 +1,2 @@
Passed
+
@@ -1039,12 +1039,12 @@
END
expectedReturn => [
[{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo.h
new file mode 100644
index 0000000..3c9f114
---- foo.h
-+++ foo.h
+--- foo.h\t(revision 0)
++++ foo.h\t(working copy)
@@ -0,0 +1,34 @@
+<html>
END
@@ -1071,12 +1071,12 @@
END
expectedReturn => [
[{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo
deleted file mode 100644
index 1e50d1d..0000000
---- foo
-+++ foo
+--- foo\t(revision 0)
++++ foo\t(working copy)
@@ -1,1 +0,0 @@
-line1
END
@@ -1103,11 +1103,11 @@
END
expectedReturn => [
[{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: Makefile
index f5d5e74..3b6aa92 100644
---- Makefile
-+++ Makefile
+--- Makefile\t(revision 0)
++++ Makefile\t(working copy)
@@ -1,1 +1,1 @@ public:
Index: Makefile_new
===================================================================
@@ -1199,14 +1199,14 @@
indexPath => "foo_new",
isGit => 1,
numTextChunks => 1,
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo_new
similarity index 99%
rename from foo
rename to foo_new
index 1e50d1d..1459d21 100644
---- foo_new
-+++ foo_new
+--- foo_new\t(revision 0)
++++ foo_new\t(working copy)
@@ -15,3 +15,4 @@ release r deployment dep deploy:
line1
line2
Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl (151299 => 151300)
--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl 2013-06-06 23:33:52 UTC (rev 151299)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiffWithMockFiles.pl 2013-06-06 23:37:24 UTC (rev 151300)
@@ -71,20 +71,20 @@
@@ -1,3 +1,4 @@
EOF
-my $svnConvertedGitDiffHeader = <<EOF;
+my $svnConvertedGitDiffHeader = <<"EOF";
Index: Makefile
index 756e864..04d2ae1 100644
---- Makefile
-+++ Makefile
+--- Makefile\t(revision 0)
++++ Makefile\t(working copy)
@@ -1,3 +1,4 @@
EOF
-my $svnConvertedGitDiffHeaderForNewFile = <<EOF;
+my $svnConvertedGitDiffHeaderForNewFile = <<"EOF";
Index: Makefile
new file mode 100644
index 0000000..756e864
---- Makefile
-+++ Makefile
+--- Makefile\t(revision 0)
++++ Makefile\t(working copy)
@@ -0,0 +1,17 @@
EOF
@@ -354,8 +354,8 @@
svnConvertedText => <<"EOF",
Index: MakefileWithWindowsEOL
index e7e8475..ae16fc3 100644
---- MakefileWithWindowsEOL
-+++ MakefileWithWindowsEOL
+--- MakefileWithWindowsEOL\t(revision 0)
++++ MakefileWithWindowsEOL\t(working copy)
@@ -1,3 +1,4 @@\r
MODULES = _javascript_Core _javascript_Glue WebCore WebKit WebKitTools\r
\r
@@ -386,10 +386,10 @@
expectedReturn => [
[{
# Same as input text
- svnConvertedText => q(Index: MakefileWithMacEOL
+ svnConvertedText => qq(Index: MakefileWithMacEOL
index e7e8475..ae16fc3 100644
---- MakefileWithMacEOL
-+++ MakefileWithMacEOL
+--- MakefileWithMacEOL\t(revision 0)
++++ MakefileWithMacEOL\t(working copy)
@@ -1,3 +1,4 @@\r MODULES = _javascript_Core _javascript_Glue WebCore WebKit WebKitTools\r \r-all:
\\ No newline at end of file
+all:\r+\r),
Modified: trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseGitDiffHeader.pl (151299 => 151300)
--- trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseGitDiffHeader.pl 2013-06-06 23:33:52 UTC (rev 151299)
+++ trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseGitDiffHeader.pl 2013-06-06 23:37:24 UTC (rev 151300)
@@ -45,18 +45,90 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo.h
index f5d5e74..3b6aa92 100644
---- foo.h
-+++ foo.h
+--- foo.h\t(revision 0)
++++ foo.h\t(working copy)
END
indexPath => "foo.h",
},
"@@ -1 +1 @@\n"],
expectedNextLine => "-file contents\n",
},
+{
+ diffName => "Modified file using --src-prefix and --dst-prefix option",
+ inputText => <<'END',
+diff --git s/foo.h d/foo.h
+index f5d5e74..3b6aa92 100644
+--- s/foo.h
++++ d/foo.h
+@@ -1 +1 @@
+-file contents
++new file contents
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<"END",
+Index: foo.h
+index f5d5e74..3b6aa92 100644
+--- foo.h\t(revision 0)
++++ foo.h\t(working copy)
+END
+ indexPath => "foo.h",
+},
+"@@ -1 +1 @@\n"],
+ expectedNextLine => "-file contents\n",
+},
{ # New test
+ diffName => "Modified file which have space characters in path",
+ inputText => <<'END',
+diff --git a/foo bar.h b/foo bar.h
+index f5d5e74..3b6aa92 100644
+--- a/foo bar.h
++++ b/foo bar.h
+@@ -1 +1 @@
+-file contents
++new file contents
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<"END",
+Index: foo bar.h
+index f5d5e74..3b6aa92 100644
+--- foo bar.h\t(revision 0)
++++ foo bar.h\t(working copy)
+END
+ indexPath => "foo bar.h",
+},
+"@@ -1 +1 @@\n"],
+ expectedNextLine => "-file contents\n",
+},
+{ # New test
+ diffName => "Modified file which have space characters in path using --no-prefix",
+ inputText => <<'END',
+diff --git directory/foo bar.h directory/foo bar.h
+index f5d5e74..3b6aa92 100644
+--- directory/foo bar.h
++++ directory/foo bar.h
+@@ -1 +1 @@
+-file contents
++new file contents
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<"END",
+Index: directory/foo bar.h
+index f5d5e74..3b6aa92 100644
+--- directory/foo bar.h\t(revision 0)
++++ directory/foo bar.h\t(working copy)
+END
+ indexPath => "directory/foo bar.h",
+},
+"@@ -1 +1 @@\n"],
+ expectedNextLine => "-file contents\n",
+},
+{ # New test
diffName => "new file",
inputText => <<'END',
diff --git a/foo.h b/foo.h
@@ -69,12 +141,12 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo.h
new file mode 100644
index 0000000..3c9f114
---- foo.h
-+++ foo.h
+--- foo.h\t(revision 0)
++++ foo.h\t(working copy)
END
indexPath => "foo.h",
isNew => 1,
@@ -97,12 +169,12 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo
deleted file mode 100644
index 1e50d1d..0000000
---- foo
-+++ foo
+--- foo\t(revision 0)
++++ foo\t(working copy)
END
indexPath => "foo",
isDeletion => 1,
@@ -110,6 +182,34 @@
"@@ -1,1 +0,0 @@\n"],
expectedNextLine => "-line1\n",
},
+{
+ diffName => "delete file which have space characters in path using --no-prefix",
+ inputText => <<'END',
+diff --git directory/foo bar.h directory/foo bar.h
+deleted file mode 100644
+index 1e50d1d..0000000
+--- directory/foo bar.h
++++ /dev/null
+@@ -1,1 +0,0 @@
+-line1
+diff --git a/configure.ac b/configure.ac
+index d45dd40..3494526 100644
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<"END",
+Index: directory/foo bar.h
+deleted file mode 100644
+index 1e50d1d..0000000
+--- directory/foo bar.h\t(revision 0)
++++ directory/foo bar.h\t(working copy)
+END
+ indexPath => "directory/foo bar.h",
+ isDeletion => 1,
+},
+"@@ -1,1 +0,0 @@\n"],
+ expectedNextLine => "-line1\n",
+},
{ # New test
diffName => "using --no-prefix",
inputText => <<'END',
@@ -122,11 +222,11 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo.h
index c925780..9e65c43 100644
---- foo.h
-+++ foo.h
+--- foo.h\t(revision 0)
++++ foo.h\t(working copy)
END
indexPath => "foo.h",
},
@@ -160,6 +260,30 @@
"diff --git a/bar b/bar\n"],
expectedNextLine => "index d45dd40..3494526 100644\n",
},
+{
+ diffName => "copy file which have space characters in path using --no-prefix (with similarity index 100%)",
+ inputText => <<'END',
+diff --git directory/foo bar.h directory/foo baz.h
+similarity index 100%
+copy from directory/foo bar.h
+copy to directory/foo baz.h
+diff --git a/bar b/bar
+index d45dd40..3494526 100644
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<'END',
+Index: directory/foo baz.h
+similarity index 100%
+copy from directory/foo bar.h
+copy to directory/foo baz.h
+END
+ copiedFromPath => "directory/foo bar.h",
+ indexPath => "directory/foo baz.h",
+},
+"diff --git a/bar b/bar\n"],
+ expectedNextLine => "index d45dd40..3494526 100644\n",
+},
{ # New test
diffName => "copy (with similarity index < 100%)",
inputText => <<'END',
@@ -210,6 +334,31 @@
"diff --git a/bar b/bar\n"],
expectedNextLine => "index d45dd40..3494526 100644\n",
},
+{
+ diffName => "rename file which have space characters in path using --no-prefix (with similarity index 100%)",
+ inputText => <<'END',
+diff --git directory/foo bar.h directory/foo baz.h
+similarity index 100%
+rename from directory/foo bar.h
+rename to directory/foo baz.h
+diff --git a/bar b/bar
+index d45dd40..3494526 100644
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<'END',
+Index: directory/foo baz.h
+similarity index 100%
+rename from directory/foo bar.h
+rename to directory/foo baz.h
+END
+ copiedFromPath => "directory/foo bar.h",
+ indexPath => "directory/foo baz.h",
+ shouldDeleteSource => 1,
+},
+"diff --git a/bar b/bar\n"],
+ expectedNextLine => "index d45dd40..3494526 100644\n",
+},
{ # New test
diffName => "rename (with similarity index < 100%)",
inputText => <<'END',
@@ -230,14 +379,14 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo_new
similarity index 99%
rename from foo
rename to foo_new
index 1e50d1d..1459d21 100644
---- foo_new
-+++ foo_new
+--- foo_new\t(revision 0)
++++ foo_new\t(working copy)
END
copiedFromPath => "foo",
indexPath => "foo_new",
@@ -359,11 +508,11 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo
index d03e242..435ad3a 100755
---- foo
-+++ foo
+--- foo\t(revision 0)
++++ foo\t(working copy)
END
indexPath => "foo",
},
@@ -429,12 +578,12 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo
new file mode 100755
index 0000000..d03e242
---- foo
-+++ foo
+--- foo\t(revision 0)
++++ foo\t(working copy)
END
executableBitDelta => 1,
indexPath => "foo",
@@ -458,12 +607,12 @@
END
expectedReturn => [
{
- svnConvertedText => <<'END',
+ svnConvertedText => <<"END",
Index: foo
deleted file mode 100755
index d03e242..0000000
---- foo
-+++ foo
+--- foo\t(revision 0)
++++ foo\t(working copy)
END
executableBitDelta => -1,
indexPath => "foo",
@@ -472,6 +621,37 @@
"@@ -1 +0,0 @@\n"],
expectedNextLine => "-file contents\n",
},
+{
+ # svn-apply rejected https://bug-111042-attachments.webkit.org/attachment.cgi?id=190663
+ diffName => "Modified file which have space characters in path. svn-apply rejected attachment #190663.",
+ inputText => <<'END',
+diff --git a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+index 72d60effb9bbba0520e520ec3c1aa43f348c6997..b7924b96d5978c1ad1053dca7e554023235d9a16 100644
+--- a/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
++++ b/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+@@ -161,7 +161,7 @@
+ <EnvironmentVariables>
+ <EnvironmentVariable
+ key = "DYLD_INSERT_LIBRARIES"
+- value = "$(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib"
++ value = "$(BUILT_PRODUCTS_DIR)/SecItemShim.dylib"
+ isEnabled = "YES">
+ </EnvironmentVariable>
+ </EnvironmentVariables>
+END
+ expectedReturn => [
+{
+ svnConvertedText => <<"END",
+Index: WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme
+index 72d60effb9bbba0520e520ec3c1aa43f348c6997..b7924b96d5978c1ad1053dca7e554023235d9a16 100644
+--- WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme\t(revision 0)
++++ WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme\t(working copy)
+END
+ indexPath => "WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme",
+},
+"@@ -161,7 +161,7 @@\n"],
+ expectedNextLine => " <EnvironmentVariables>\n",
+},
);
my $testCasesCount = @testCaseHashRefs;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
