<!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>[161284] 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/161284">161284</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-01-03 13:40:41 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>setup-git-clone fails to get email address from git
https://bugs.webkit.org/show_bug.cgi?id=126446
Reviewed by Ryosuke Niwa.
The setup-git-clone command fails to get an email address from git
because of a bug in VCSUtils. This patch fixes that bug, and also
makes it so that when VCSUtils fails for real because of a local
misconfiguration, the error message is actually presented to the user
of setup-git-clone.
* Scripts/VCSUtils.pm:
(gitConfig): Call isGit() instead of accessing $isGit directly to make
sure that $isGit is properly initialized.
* Scripts/webkitpy/tool/commands/setupgitclone.py:
(SetupGitClone.execute): Pull out username and email acquistion to
it's own method.
(SetupGitClone._get_username_and_email): Catch the exception thrown
when VCSUtils fails and print out the error message so that the
user actually knows why the command failed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsVCSUtilspm">trunk/Tools/Scripts/VCSUtils.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandssetupgitclonepy">trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161283 => 161284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-03 21:28:24 UTC (rev 161283)
+++ trunk/Tools/ChangeLog 2014-01-03 21:40:41 UTC (rev 161284)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-03 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ setup-git-clone fails to get email address from git
+ https://bugs.webkit.org/show_bug.cgi?id=126446
+
+ Reviewed by Ryosuke Niwa.
+
+ The setup-git-clone command fails to get an email address from git
+ because of a bug in VCSUtils. This patch fixes that bug, and also
+ makes it so that when VCSUtils fails for real because of a local
+ misconfiguration, the error message is actually presented to the user
+ of setup-git-clone.
+
+ * Scripts/VCSUtils.pm:
+ (gitConfig): Call isGit() instead of accessing $isGit directly to make
+ sure that $isGit is properly initialized.
+ * Scripts/webkitpy/tool/commands/setupgitclone.py:
+ (SetupGitClone.execute): Pull out username and email acquistion to
+ it's own method.
+ (SetupGitClone._get_username_and_email): Catch the exception thrown
+ when VCSUtils fails and print out the error message so that the
+ user actually knows why the command failed.
+
</ins><span class="cx"> 2014-01-03 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> It feels too hard to get rid of a popover at build.webkit.org/dashboard
</span></span></pre></div>
<a id="trunkToolsScriptsVCSUtilspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/VCSUtils.pm (161283 => 161284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/VCSUtils.pm 2014-01-03 21:28:24 UTC (rev 161283)
+++ trunk/Tools/Scripts/VCSUtils.pm 2014-01-03 21:40:41 UTC (rev 161284)
</span><span class="lines">@@ -1880,7 +1880,7 @@
</span><span class="cx">
</span><span class="cx"> sub gitConfig($)
</span><span class="cx"> {
</span><del>- return unless $isGit;
</del><ins>+ return unless isGit();
</ins><span class="cx">
</span><span class="cx"> my ($config) = @_;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandssetupgitclonepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py (161283 => 161284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2014-01-03 21:28:24 UTC (rev 161283)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2014-01-03 21:40:41 UTC (rev 161284)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> from webkitpy.tool.multicommandtool import Command
</span><span class="cx"> from webkitpy.common.checkout.scm.git import Git
</span><ins>+from webkitpy.common.system.executive import ScriptError
</ins><span class="cx">
</span><del>-
</del><span class="cx"> class SetupGitClone(Command):
</span><span class="cx"> name = "setup-git-clone"
</span><span class="cx"> help_text = "Configures a new Git clone for the WebKit development"
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> print "There are local changes; aborting the command."
</span><span class="cx"> return
</span><span class="cx">
</span><ins>+ username, email = self._get_username_and_email(tool)
+
</ins><span class="cx"> # FIXME: We shouldn't be using a privatd method
</span><span class="cx"> run_git = tool.scm()._run_git
</span><span class="cx"> run_git(["pull"])
</span><span class="lines">@@ -50,18 +52,6 @@
</span><span class="cx"> run_git(["config", "--replace", "svn-remote.svn.fetch", "trunk:refs/remotes/origin/master"])
</span><span class="cx"> run_git(["svn", "fetch"])
</span><span class="cx">
</span><del>- original_path = tool.filesystem.abspath(".")
-
- tool.filesystem.chdir("Tools/Scripts/")
- username = tool.executive.run_and_throw_if_fail(["perl", "-e", "use VCSUtils; print STDOUT changeLogName();"], quiet=True)
- if not username:
- username = tool.user.prompt("Your name:")
-
- email = tool.executive.run_and_throw_if_fail(["perl", "-e", "use VCSUtils; print STDOUT changeLogEmailAddress();"], quiet=True)
- if not email:
- email = tool.user.prompt("Your email address:")
- tool.filesystem.chdir(original_path)
-
</del><span class="cx"> run_git(["config", "user.name", username])
</span><span class="cx"> run_git(["config", "user.email", email])
</span><span class="cx">
</span><span class="lines">@@ -84,3 +74,25 @@
</span><span class="cx"> print "You can override this option via git config branch.$branchName.webKitBranchBuild (true|false)"
</span><span class="cx">
</span><span class="cx"> print "Done"
</span><ins>+
+ def _get_username_and_email(self, tool):
+ try:
+ original_path = tool.filesystem.abspath(".")
+
+ tool.filesystem.chdir("Tools/Scripts/")
+ username = tool.executive.run_and_throw_if_fail(["perl", "-e", "use VCSUtils; print STDOUT changeLogName();"], quiet=True)
+ if not username:
+ username = tool.user.prompt("Your name:")
+
+ email = tool.executive.run_and_throw_if_fail(["perl", "-e", "use VCSUtils; print STDOUT changeLogEmailAddress();"], quiet=True)
+ if not email:
+ email = tool.user.prompt("Your email address:")
+
+ tool.filesystem.chdir(original_path)
+
+ return (username, email)
+ except ScriptError as error:
+ # VCSUtils prints useful error messages on failure, we shouldn't hide these
+ if error.output:
+ print error.output
+ raise
</ins></span></pre>
</div>
</div>
</body>
</html>