<!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>[160039] 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/160039">160039</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-03 14:29:39 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a script to automatically configure a git clone
https://bugs.webkit.org/show_bug.cgi?id=110073
Reviewed by Benjamin Poulain.
Added "webkit-patch setup-git-clone" to setup a brand new Git clone.
This command runs various commands listed on http://trac.webkit.org/wiki/UsingGitWithWebKit
* Scripts/webkitpy/tool/commands/__init__.py:
* Scripts/webkitpy/tool/commands/setupgitclone.py: Added.
(SetupGitClone):
(SetupGitClone.execute):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommands__init__py">trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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 (160038 => 160039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-03 22:24:53 UTC (rev 160038)
+++ trunk/Tools/ChangeLog 2013-12-03 22:29:39 UTC (rev 160039)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-03 Ryosuke Niwa <rniwa@webkit.org>
+
+ Add a script to automatically configure a git clone
+ https://bugs.webkit.org/show_bug.cgi?id=110073
+
+ Reviewed by Benjamin Poulain.
+
+ Added "webkit-patch setup-git-clone" to setup a brand new Git clone.
+
+ This command runs various commands listed on http://trac.webkit.org/wiki/UsingGitWithWebKit
+
+ * Scripts/webkitpy/tool/commands/__init__.py:
+ * Scripts/webkitpy/tool/commands/setupgitclone.py: Added.
+ (SetupGitClone):
+ (SetupGitClone.execute):
+
</ins><span class="cx"> 2013-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Deprecate WKNotificationProvider
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommands__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py (160038 => 160039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py 2013-12-03 22:24:53 UTC (rev 160038)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py 2013-12-03 22:29:39 UTC (rev 160039)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> from webkitpy.tool.commands.queues import *
</span><span class="cx"> from webkitpy.tool.commands.rebaseline import Rebaseline
</span><span class="cx"> from webkitpy.tool.commands.rebaselineserver import RebaselineServer
</span><ins>+from webkitpy.tool.commands.setupgitclone import SetupGitClone
</ins><span class="cx"> from webkitpy.tool.commands.sheriffbot import *
</span><span class="cx"> from webkitpy.tool.commands.upload import *
</span><span class="cx"> from webkitpy.tool.commands.suggestnominations import *
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandssetupgitclonepy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py (0 => 160039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2013-12-03 22:29:39 UTC (rev 160039)
</span><span class="lines">@@ -0,0 +1,86 @@
</span><ins>+# Copyright (c) 2013 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from webkitpy.tool.multicommandtool import Command
+from webkitpy.common.checkout.scm.git import Git
+
+
+class SetupGitClone(Command):
+ name = "setup-git-clone"
+ help_text = "Configures a new Git clone for the WebKit development"
+
+ def execute(self, options, args, tool):
+ if not isinstance(tool.scm(), Git):
+ print "This command only works inside a Git checkout."
+ return
+
+ if tool.scm().has_working_directory_changes():
+ print "There are local changes; aborting the command."
+ return
+
+ # FIXME: We shouldn't be using a privatd method
+ run_git = tool.scm()._run_git
+ run_git(["pull"])
+ run_git(["svn", "init", "--prefix=origin/", "-T", "trunk", "https://svn.webkit.org/repository/webkit"])
+ run_git(["config", "--replace", "svn-remote.svn.fetch trunk:refs/remotes/origin/master"])
+ run_git(["svn", "fetch"])
+
+ 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)
+
+ run_git(["config", "user.name", username])
+ run_git(["config", "user.email", email])
+
+ # Better Objective-C diff.
+ run_git(["config", "diff.objcpp.xfuncname", "^[-+@a-zA-Z_].*$"])
+ run_git(["config", "diff.objcppheader.xfuncname", "^[@a-zA-Z_].*$"])
+
+ if tool.user.confirm("Do you want to auto-color status, diff, and branch? (y/n)"):
+ run_git(["config", "color.status", "auto"])
+ run_git(["config", "color.diff", "auto"])
+ run_git(["config", "color.branch", "auto"])
+
+ if tool.user.confirm("Do you use a rebase-based workflow? (y=yes; n=no, I use a merge-based workflow)"):
+ run_git(["config", "merge.changelog.driver", "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %A %B"])
+ else:
+ run_git(["config", "merge.changelog.driver", "perl Tools/Scripts/resolve-ChangeLogs --fix-merged --merge-driver %O %B %A"])
+
+ if tool.user.confirm("Do you want to append the git branch name to every build? (e.g. WebKitBuild/mybranch/; y/n)"):
+ run_git(["config", "core.webKitBranchBuild", "true"])
+ print "You can override this option via git config branch.$branchName.webKitBranchBuild (true|false)"
+
+ print "Done"
</ins></span></pre>
</div>
</div>
</body>
</html>