<!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>[159796] 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/159796">159796</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-26 17:27:28 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moved methods which belong to Checkout into checkout.py
https://bugs.webkit.org/show_bug.cgi?id=124889
Patch by Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu> on 2013-11-26
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/common/checkout/checkout.py:
(Checkout.scripts_directory):
(Checkout):
(Checkout.script_path):
(Checkout.commit_message_for_this_commit):
(Checkout.apply_patch):
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
(test_commit_message_for_this_commit):
(CheckoutTest.test_apply_patch):
* Scripts/webkitpy/common/checkout/scm/scm.py:
(SCM.absolute_path):
* Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
(SCMTest._setup_webkittools_scripts_symlink):
* Scripts/webkitpy/common/checkout/scm/svn.py:
(SVN.create_patch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckoutpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmscmpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmsvnpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (159795 => 159796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-11-27 01:22:07 UTC (rev 159795)
+++ trunk/Tools/ChangeLog 2013-11-27 01:27:28 UTC (rev 159796)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-11-26 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
+
+ Moved methods which belong to Checkout into checkout.py
+ https://bugs.webkit.org/show_bug.cgi?id=124889
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/common/checkout/checkout.py:
+ (Checkout.scripts_directory):
+ (Checkout):
+ (Checkout.script_path):
+ (Checkout.commit_message_for_this_commit):
+ (Checkout.apply_patch):
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ (test_commit_message_for_this_commit):
+ (CheckoutTest.test_apply_patch):
+ * Scripts/webkitpy/common/checkout/scm/scm.py:
+ (SCM.absolute_path):
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ (SCMTest._setup_webkittools_scripts_symlink):
+ * Scripts/webkitpy/common/checkout/scm/svn.py:
+ (SVN.create_patch):
+
</ins><span class="cx"> 2013-11-25 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Use Config mode of find_package for EFL 1.8
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckoutpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py (159795 => 159796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py 2013-11-27 01:22:07 UTC (rev 159795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py 2013-11-27 01:27:28 UTC (rev 159796)
</span><span class="lines">@@ -46,6 +46,12 @@
</span><span class="cx"> self._executive = executive or self._scm._executive
</span><span class="cx"> self._filesystem = filesystem or self._scm._filesystem
</span><span class="cx">
</span><ins>+ def scripts_directory(self):
+ return self._filesystem.join(self._scm.checkout_root, "Tools", "Scripts")
+
+ def script_path(self, script_name):
+ return self._filesystem.join(self.scripts_directory(), script_name)
+
</ins><span class="cx"> def is_path_to_changelog(self, path):
</span><span class="cx"> return self._filesystem.basename(path) == "ChangeLog"
</span><span class="cx">
</span><span class="lines">@@ -125,7 +131,7 @@
</span><span class="cx"> raise ScriptError(message="Found no modified ChangeLogs, cannot create a commit message.\n"
</span><span class="cx"> "All changes require a ChangeLog. See:\n %s" % urls.contribution_guidelines)
</span><span class="cx">
</span><del>- message_text = self._scm.run([self._scm.script_path('commit-log-editor'), '--print-log'] + changelog_paths, return_stderr=return_stderr)
</del><ins>+ message_text = self._scm.run([self.script_path('commit-log-editor'), '--print-log'] + changelog_paths, return_stderr=return_stderr)
</ins><span class="cx"> return CommitMessage(message_text.splitlines())
</span><span class="cx">
</span><span class="cx"> def recent_commit_infos_for_files(self, paths):
</span><span class="lines">@@ -150,7 +156,7 @@
</span><span class="cx"> # We should detect and handle that case.
</span><span class="cx"> # FIXME: Move _scm.script_path here once we get rid of all the dependencies.
</span><span class="cx"> # --force (continue after errors) is the common case, so we always use it.
</span><del>- args = [self._scm.script_path('svn-apply'), "--force"]
</del><ins>+ args = [self.script_path('svn-apply'), "--force"]
</ins><span class="cx"> if patch.reviewer():
</span><span class="cx"> args += ['--reviewer', patch.reviewer().full_name]
</span><span class="cx"> self._executive.run_command(args, input=patch.contents(), cwd=self._scm.checkout_root)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (159795 => 159796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2013-11-27 01:22:07 UTC (rev 159795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2013-11-27 01:27:28 UTC (rev 159796)
</span><span class="lines">@@ -136,9 +136,10 @@
</span><span class="cx">
</span><span class="cx"> mock_scm = MockSCM()
</span><span class="cx"> mock_scm.run = mock_run
</span><del>- mock_scm.script_path = real_scm.script_path
</del><span class="cx">
</span><ins>+ real_checkout = Checkout(real_scm)
</ins><span class="cx"> checkout = Checkout(mock_scm)
</span><ins>+ checkout.script_path = real_checkout.script_path
</ins><span class="cx"> checkout.modified_changelogs = lambda git_commit, changed_files=None: self.changelogs
</span><span class="cx"> commit_message = checkout.commit_message_for_this_commit(git_commit=None, return_stderr=True)
</span><span class="cx"> # Throw away the first line - a warning about unknown VCS root.
</span><span class="lines">@@ -252,7 +253,7 @@
</span><span class="cx"> def test_apply_patch(self):
</span><span class="cx"> checkout = self._make_checkout()
</span><span class="cx"> checkout._executive = MockExecutive(should_log=True)
</span><del>- checkout._scm.script_path = lambda script: script
</del><ins>+ checkout.script_path = lambda script: script
</ins><span class="cx"> mock_patch = Mock()
</span><span class="cx"> mock_patch.contents = lambda: "foo"
</span><span class="cx"> mock_patch.reviewer = lambda: None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscmpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (159795 => 159796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2013-11-27 01:22:07 UTC (rev 159795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2013-11-27 01:27:28 UTC (rev 159796)
</span><span class="lines">@@ -82,14 +82,6 @@
</span><span class="cx"> def absolute_path(self, repository_relative_path):
</span><span class="cx"> return self._filesystem.join(self.checkout_root, repository_relative_path)
</span><span class="cx">
</span><del>- # FIXME: This belongs in Checkout, not SCM.
- def scripts_directory(self):
- return self._filesystem.join(self.checkout_root, "Tools", "Scripts")
-
- # FIXME: This belongs in Checkout, not SCM.
- def script_path(self, script_name):
- return self._filesystem.join(self.scripts_directory(), script_name)
-
</del><span class="cx"> def run_status_and_extract_filenames(self, status_command, status_regexp):
</span><span class="cx"> filenames = []
</span><span class="cx"> # We run with cwd=self.checkout_root so that returned-paths are root-relative.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (159795 => 159796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2013-11-27 01:22:07 UTC (rev 159795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2013-11-27 01:27:28 UTC (rev 159796)
</span><span class="lines">@@ -290,8 +290,8 @@
</span><span class="cx">
</span><span class="cx"> def _setup_webkittools_scripts_symlink(self, local_scm):
</span><span class="cx"> webkit_scm = detect_scm_system(os.path.dirname(os.path.abspath(__file__)))
</span><del>- webkit_scripts_directory = webkit_scm.scripts_directory()
- local_scripts_directory = local_scm.scripts_directory()
</del><ins>+ webkit_scripts_directory = Checkout(webkit_scm, webkit_scm._executive, webkit_scm._filesystem).scripts_directory()
+ local_scripts_directory = Checkout(local_scm, local_scm._executive, local_scm._filesystem).scripts_directory()
</ins><span class="cx"> os.mkdir(os.path.dirname(local_scripts_directory))
</span><span class="cx"> os.symlink(webkit_scripts_directory, local_scripts_directory)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmsvnpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py (159795 => 159796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2013-11-27 01:22:07 UTC (rev 159795)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/svn.py 2013-11-27 01:27:28 UTC (rev 159796)
</span><span class="lines">@@ -272,7 +272,8 @@
</span><span class="cx"> return ""
</span><span class="cx"> elif changed_files == None:
</span><span class="cx"> changed_files = []
</span><del>- return self.run([self.script_path("svn-create-patch")] + changed_files,
</del><ins>+ script_path = self._filesystem.join(self.checkout_root, "Tools", "Scripts", "svn-create-patch")
+ return self.run([script_path] + changed_files,
</ins><span class="cx"> cwd=self.checkout_root, return_stderr=False,
</span><span class="cx"> decode_output=False)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>