<!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>[194634] 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/194634">194634</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-01-06 02:15:14 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Python SCM should be able to retrieve untracked files - Add GIT support
https://bugs.webkit.org/show_bug.cgi?id=143135
Reviewed by Michael Catanzaro.
* Scripts/webkitpy/common/checkout/scm/git.py:
(Git.untracked_files): Adding support for git.
* Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
(GitTest.setUp):
(GitTest.test_untracked_files): Adding test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmgitpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (194633 => 194634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-06 07:17:00 UTC (rev 194633)
+++ trunk/Tools/ChangeLog 2016-01-06 10:15:14 UTC (rev 194634)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-06 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Python SCM should be able to retrieve untracked files - Add GIT support
+ https://bugs.webkit.org/show_bug.cgi?id=143135
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+ (Git.untracked_files): Adding support for git.
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ (GitTest.setUp):
+ (GitTest.test_untracked_files): Adding test.
+
</ins><span class="cx"> 2016-01-05 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename badly named JSC_timeout env var to JSCTEST_timeout.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmgitpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (194633 => 194634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2016-01-06 07:17:00 UTC (rev 194633)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2016-01-06 10:15:14 UTC (rev 194634)
</span><span class="lines">@@ -214,6 +214,15 @@
</span><span class="cx"> updated_in_index_regexp = '^M[ M] (?P<filename>.+)$'
</span><span class="cx"> return self.run_status_and_extract_filenames(status_command, updated_in_index_regexp)
</span><span class="cx">
</span><ins>+ def untracked_files(self, include_ignored_files=False):
+ status_command = [self.executable_name, 'status', '--short']
+ if include_ignored_files:
+ status_command.append('--ignored')
+ status_command.extend(self._patch_directories)
+ # Remove the last / for folders to match SVN behavior.
+ extractor = "^[?!][?!] (?P<filename>.+)$"
+ return [value if not value.endswith('/') else value[:-1] for value in self.run_status_and_extract_filenames(status_command, extractor)]
+
</ins><span class="cx"> def changed_files(self, git_commit=None):
</span><span class="cx"> # FIXME: --diff-filter could be used to avoid the "extract_filenames" step.
</span><span class="cx"> status_command = [self.executable_name, 'diff', '-r', '--name-status', "--no-renames", "--no-ext-diff", "--full-index", self.merge_base(git_commit), '--']
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (194633 => 194634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2016-01-06 07:17:00 UTC (rev 194633)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2016-01-06 10:15:14 UTC (rev 194634)
</span><span class="lines">@@ -947,6 +947,8 @@
</span><span class="cx"> os.chdir(self.untracking_checkout_path)
</span><span class="cx"> write_into_file_at_path('foo_file', 'foo')
</span><span class="cx"> run_command(['git', 'add', 'foo_file'])
</span><ins>+ write_into_file_at_path('.gitignore', '*.pyc')
+ run_command(['git', 'add', '.gitignore'])
</ins><span class="cx"> run_command(['git', 'commit', '-am', 'dummy commit'])
</span><span class="cx"> self.untracking_scm = detect_scm_system(self.untracking_checkout_path)
</span><span class="cx">
</span><span class="lines">@@ -1055,7 +1057,10 @@
</span><span class="cx"> self.assertNotRegexpMatches(patch, r'rename from ')
</span><span class="cx"> self.assertNotRegexpMatches(patch, r'rename to ')
</span><span class="cx">
</span><ins>+ def test_untracked_files(self):
+ self._shared_test_untracked_files(self.tracking_scm)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class GitSVNTest(SCMTest):
</span><span class="cx">
</span><span class="cx"> def _setup_git_checkout(self):
</span></span></pre>
</div>
</div>
</body>
</html>