<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174526] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174526">174526</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-09 14:10:41 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use backticks when running commands, as we run into sh-related
interpolation issues. Also, fix our usage of system() to properly
retrieve the status code.
https://bugs.webkit.org/show_bug.cgi?id=137541
Reviewed by Darin Adler.
* Scripts/git-add-reviewer:
(interactive):
(nonInteractive):
(requireCleanWorkTree):
(cherryPick):
(commit):
(addReviewerToFile):
(head):
(isAncestor):
(toCommit):
(changeLogsForCommit):
(resetToCommit):
(getConfigValue):
(runCommandWithOutput):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsgitaddreviewer">trunk/Tools/Scripts/git-add-reviewer</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174525 => 174526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-09 20:56:16 UTC (rev 174525)
+++ trunk/Tools/ChangeLog 2014-10-09 21:10:41 UTC (rev 174526)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-10-09 Dana Burkart <dburkart@apple.com>
+
+ Don't use backticks when running commands, as we run into sh-related
+ interpolation issues. Also, fix our usage of system() to properly
+ retrieve the status code.
+ https://bugs.webkit.org/show_bug.cgi?id=137541
+
+ Reviewed by Darin Adler.
+
+ * Scripts/git-add-reviewer:
+ (interactive):
+ (nonInteractive):
+ (requireCleanWorkTree):
+ (cherryPick):
+ (commit):
+ (addReviewerToFile):
+ (head):
+ (isAncestor):
+ (toCommit):
+ (changeLogsForCommit):
+ (resetToCommit):
+ (getConfigValue):
+ (runCommandWithOutput):
+
</ins><span class="cx"> 2014-10-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a WebKit1 preference for selection services
</span></span></pre></div>
<a id="trunkToolsScriptsgitaddreviewer"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/git-add-reviewer (174525 => 174526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/git-add-reviewer 2014-10-09 20:56:16 UTC (rev 174525)
+++ trunk/Tools/Scripts/git-add-reviewer 2014-10-09 21:10:41 UTC (rev 174526)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> use File::Temp ();
</span><span class="cx"> use Getopt::Long;
</span><span class="cx"> use POSIX;
</span><ins>+use IPC::Open2;
</ins><span class="cx">
</span><span class="cx"> my $defaultReviewer = "NOBODY";
</span><span class="cx">
</span><span class="lines">@@ -95,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> isAncestor($upstream, $head) or die "$ARGV[0] is not an ancestor of HEAD.";
</span><span class="cx">
</span><del>- my @revlist = `git rev-list --reverse --pretty=oneline $upstream..`;
</del><ins>+ my @revlist = runCommandWithOutput('git', 'rev-list', '--reverse', '--pretty=oneline', "$upstream..");
</ins><span class="cx"> @revlist or die "Couldn't determine revisions";
</span><span class="cx">
</span><span class="cx"> my $tempFile = new File::Temp(UNLINK => 1);
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> my $editor = $ENV{GIT_EDITOR} || getConfigValue("core.editor") || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
</span><span class="cx"> my $result = system "$editor \"" . $tempFile->filename . "\"";
</span><del>- !$result or die "Error spawning editor.";
</del><ins>+ !($result >> 8) or die "Error spawning editor.";
</ins><span class="cx">
</span><span class="cx"> my @todo = ();
</span><span class="cx"> open TEMPFILE, '<', $tempFile->filename or die "Error opening temp file.";
</span><span class="lines">@@ -136,7 +137,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $result = system "git", "checkout", $upstream;
</span><del>- !$result or die "Error checking out $ARGV[0].";
</del><ins>+ !($result >> 8) or die "Error checking out $ARGV[0].";
</ins><span class="cx">
</span><span class="cx"> my $success = 1;
</span><span class="cx"> foreach my $item (@todo) {
</span><span class="lines">@@ -154,9 +155,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $result = system "git", "branch", "-f", $head;
</span><del>- !$result or die "Error updating $head.";
</del><ins>+ !($result >> 8) or die "Error updating $head.";
</ins><span class="cx"> $result = system "git", "checkout", $head;
</span><del>- exit WEXITSTATUS($result);
</del><ins>+ exit WEXITSTATUS($result >> 8);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub nonInteractive()
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx"> my $head = head();
</span><span class="cx"> my $headCommit = toCommit($head);
</span><span class="cx">
</span><del>- isAncestor($commit, $head) or die "$ARGV[1] is not an ancestor of HEAD.";
</del><ins>+ isAncestor($commit, $head) or die "$ARGV[0] is not an ancestor of HEAD.";
</ins><span class="cx">
</span><span class="cx"> my %item = (
</span><span class="cx"> reviewer => $reviewer,
</span><span class="lines">@@ -197,10 +198,10 @@
</span><span class="cx">
</span><span class="cx"> sub requireCleanWorkTree()
</span><span class="cx"> {
</span><del>- my $result = system "git rev-parse --verify HEAD > /dev/null";
- $result ||= system qw(git update-index --refresh);
- $result ||= system qw(git diff-files --quiet);
- $result ||= system qw(git diff-index --cached --quiet HEAD --);
</del><ins>+ my $result = system("git rev-parse --verify HEAD > /dev/null") >> 8;
+ $result ||= system(qw(git update-index --refresh)) >> 8;
+ $result ||= system(qw(git diff-files --quiet)) >> 8;
+ $result ||= system(qw(git diff-index --cached --quiet HEAD --)) >> 8;
</ins><span class="cx"> !$result or die "Working tree is dirty"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,7 +217,7 @@
</span><span class="cx"> my ($item) = @_;
</span><span class="cx">
</span><span class="cx"> my $result = system "git cherry-pick -n $item->{commit} > /dev/null";
</span><del>- !$result or return fail("Failed to cherry-pick $item->{commit}");
</del><ins>+ !($result >> 8) or return fail("Failed to cherry-pick $item->{commit}");
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -243,7 +244,7 @@
</span><span class="cx"> my @command = qw(git commit -F .git/MERGE_MSG);
</span><span class="cx"> push @command, "--amend" if $amend;
</span><span class="cx"> my $result = system @command;
</span><del>- !$result or return fail("Failed to commit revision");
</del><ins>+ !($result >> 8) or return fail("Failed to commit revision");
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -285,11 +286,11 @@
</span><span class="cx"> close LOG or return fail("Couldn't close $log");
</span><span class="cx">
</span><span class="cx"> my $result = system "mv", $tempFile->filename, $log;
</span><del>- !$result or return fail("Failed to rename $tempFile to $log");
</del><ins>+ !($result >> 8) or return fail("Failed to rename $tempFile to $log");
</ins><span class="cx">
</span><span class="cx"> unless ($isCommitMessage) {
</span><span class="cx"> my $result = system "git", "add", $log;
</span><del>- !$result or return fail("Failed to git add");
</del><ins>+ !($result >> 8) or return fail("Failed to git add");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return 1;
</span><span class="lines">@@ -297,7 +298,7 @@
</span><span class="cx">
</span><span class="cx"> sub head()
</span><span class="cx"> {
</span><del>- my $head = `git symbolic-ref HEAD`;
</del><ins>+ my $head = runCommandWithOutput('git', 'symbolic-ref', 'HEAD');
</ins><span class="cx"> $head =~ /^refs\/heads\/(.*)$/ or die "Couldn't determine current branch.";
</span><span class="cx"> $head = $1;
</span><span class="cx">
</span><span class="lines">@@ -308,7 +309,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($ancestor, $descendant) = @_;
</span><span class="cx">
</span><del>- chomp(my $mergeBase = `git merge-base $ancestor $descendant`);
</del><ins>+ chomp(my $mergeBase = runCommandWithOutput('git', 'merge-base', $ancestor, $descendant));
</ins><span class="cx"> return $mergeBase eq $ancestor;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -316,7 +317,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($arg) = @_;
</span><span class="cx">
</span><del>- chomp(my $commit = `git rev-parse $arg`);
</del><ins>+ chomp(my $commit = runCommandWithOutput('git', 'rev-parse', $arg));
</ins><span class="cx"> return $commit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -324,7 +325,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($commit) = @_;
</span><span class="cx">
</span><del>- my @files = `git diff -r --name-status $commit^ $commit`;
</del><ins>+ my @files = runCommandWithOutput('git', 'diff', '-r', '--name-status', "$commit^", "$commit");
</ins><span class="cx"> @files or return fail("Couldn't determine changed files for $commit.");
</span><span class="cx">
</span><span class="cx"> my @changeLogs = map { /^[ACMR]\s*(.*)/; $1 } grep { /^[ACMR].*[^-]ChangeLog/ } @files;
</span><span class="lines">@@ -336,7 +337,7 @@
</span><span class="cx"> my ($commit) = @_;
</span><span class="cx">
</span><span class="cx"> my $result = system "git", "checkout", "-f", $commit;
</span><del>- !$result or return fail("Error checking out $commit.");
</del><ins>+ !($result >> 8) or return fail("Error checking out $commit.");
</ins><span class="cx">
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="lines">@@ -381,7 +382,17 @@
</span><span class="cx"> {
</span><span class="cx"> my ($variable) = @_;
</span><span class="cx">
</span><del>- chomp(my $value = `git config --get "$variable"`);
</del><ins>+ chomp(my $value = runCommmandWithOutput('git', 'config', '--get', $variable));
</ins><span class="cx">
</span><span class="cx"> return $value;
</span><span class="cx"> }
</span><ins>+
+sub runCommandWithOutput {
+ my ($output, $input);
+
+ my $pid = open2($output, $input, @_);
+
+ waitpid($pid, 0);
+
+ return <$output>;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>