Title: [91282] trunk/Tools
- Revision
- 91282
- Author
- [email protected]
- Date
- 2011-07-19 12:00:58 -0700 (Tue, 19 Jul 2011)
Log Message
Rename variable isEmptyTextPatch in svn-{apply, unapply}
https://bugs.webkit.org/show_bug.cgi?id=64648
Reviewed by Adam Roben.
Rename the variable isEmptyTextPatch to hasTextChunks, which is
more descriptive and makes its usage read well in control statements.
* Scripts/svn-apply:
(patch):
* Scripts/svn-unapply:
(patch):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91281 => 91282)
--- trunk/Tools/ChangeLog 2011-07-19 18:59:35 UTC (rev 91281)
+++ trunk/Tools/ChangeLog 2011-07-19 19:00:58 UTC (rev 91282)
@@ -1,3 +1,18 @@
+2011-07-19 Daniel Bates <[email protected]>
+
+ Rename variable isEmptyTextPatch in svn-{apply, unapply}
+ https://bugs.webkit.org/show_bug.cgi?id=64648
+
+ Reviewed by Adam Roben.
+
+ Rename the variable isEmptyTextPatch to hasTextChunks, which is
+ more descriptive and makes its usage read well in control statements.
+
+ * Scripts/svn-apply:
+ (patch):
+ * Scripts/svn-unapply:
+ (patch):
+
2011-07-19 Adam Roben <[email protected]>
Make TestFailures show existing bugs and a new bug link for flaky tests
Modified: trunk/Tools/Scripts/svn-apply (91281 => 91282)
--- trunk/Tools/Scripts/svn-apply 2011-07-19 18:59:35 UTC (rev 91281)
+++ trunk/Tools/Scripts/svn-apply 2011-07-19 19:00:58 UTC (rev 91282)
@@ -315,7 +315,7 @@
my $fullPath = $diffHashRef->{indexPath};
my $isBinary = $diffHashRef->{isBinary};
my $isGit = $diffHashRef->{isGit};
- my $isEmptyTextPatch = !$patch || !$diffHashRef->{numTextChunks};
+ my $hasTextChunks = $patch && $diffHashRef->{numTextChunks};
my $deletion = 0;
my $addition = 0;
@@ -323,7 +323,7 @@
$addition = 1 if ($diffHashRef->{isNew} || $patch =~ /\n@@ -0,0 .* @@/);
$deletion = 1 if ($diffHashRef->{isDeletion} || $patch =~ /\n@@ .* \+0,0 @@/);
- if (!$addition && !$deletion && !$isBinary && !$isEmptyTextPatch) {
+ if (!$addition && !$deletion && !$isBinary && $hasTextChunks) {
# Standard patch, patch tool can handle this.
if (basename($fullPath) eq "ChangeLog") {
my $changeLogDotOrigExisted = -f "${fullPath}.orig";
Modified: trunk/Tools/Scripts/svn-unapply (91281 => 91282)
--- trunk/Tools/Scripts/svn-unapply 2011-07-19 18:59:35 UTC (rev 91281)
+++ trunk/Tools/Scripts/svn-unapply 2011-07-19 19:00:58 UTC (rev 91282)
@@ -145,7 +145,7 @@
my $fullPath = $diffHashRef->{indexPath};
my $isSvnBinary = $diffHashRef->{isBinary} && $diffHashRef->{isSvn};
- my $isEmptyTextPatch = !$patch || !$diffHashRef->{numTextChunks};
+ my $hasTextChunks = $patch && $diffHashRef->{numTextChunks};
$directoriesToCheck{dirname($fullPath)} = 1;
@@ -155,7 +155,7 @@
$addition = 1 if ($diffHashRef->{isNew} || $diffHashRef->{copiedFromPath} || $patch =~ /\n@@ -0,0 .* @@/);
$deletion = 1 if ($diffHashRef->{isDeletion} || $patch =~ /\n@@ .* \+0,0 @@/);
- if (!$addition && !$deletion && !$isSvnBinary && !$isEmptyTextPatch) {
+ if (!$addition && !$deletion && !$isSvnBinary && $hasTextChunks) {
# Standard patch, patch tool can handle this.
if (basename($fullPath) eq "ChangeLog") {
my $changeLogDotOrigExisted = -f "${fullPath}.orig";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
