<!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>[175717] 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/175717">175717</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-06 14:41:31 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove code that prepends a leading 'r' to the first argument of _run_git_svn_find_rev
https://bugs.webkit.org/show_bug.cgi?id=138475
Reviewed by Ryosuke Niwa.
The change in https://trac.webkit.org/175603 introduced broke compatibility with svn_revision_from_git_commit.
This patch reverts the part of that change that broke compatibility. In addition, this patch adds a comment to
explain that SVN revisions require a leading 'r', moves an existing comment to a more appropriate location and
renames the positional argument to better reflect that it can represent either an SVN revision or a Git tree-ish.
* Scripts/webkitpy/common/checkout/scm/git.py:
(Git._run_git_svn_find_rev):
Add comment mentioning that svn_revisions need to begin with 'r'.
Move comment (explaining that git svn find-rev exits with code 0 when no match is found) to a more appropriate location.
Rename the argument 'revision' to 'revision_or_treeish' to reflect the dual form that argument can take.
Remove code that coerced the revision/treeish into a string and prepended an 'r'.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (175716 => 175717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-06 22:23:16 UTC (rev 175716)
+++ trunk/Tools/ChangeLog 2014-11-06 22:41:31 UTC (rev 175717)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-11-06 Matthew Hanson <matthew_hanson@apple.com>
+
+ Remove code that prepends a leading 'r' to the first argument of _run_git_svn_find_rev
+ https://bugs.webkit.org/show_bug.cgi?id=138475
+
+ Reviewed by Ryosuke Niwa.
+
+ The change in https://trac.webkit.org/175603 introduced broke compatibility with svn_revision_from_git_commit.
+ This patch reverts the part of that change that broke compatibility. In addition, this patch adds a comment to
+ explain that SVN revisions require a leading 'r', moves an existing comment to a more appropriate location and
+ renames the positional argument to better reflect that it can represent either an SVN revision or a Git tree-ish.
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+ (Git._run_git_svn_find_rev):
+ Add comment mentioning that svn_revisions need to begin with 'r'.
+ Move comment (explaining that git svn find-rev exits with code 0 when no match is found) to a more appropriate location.
+ Rename the argument 'revision' to 'revision_or_treeish' to reflect the dual form that argument can take.
+ Remove code that coerced the revision/treeish into a string and prepended an 'r'.
+
</ins><span class="cx"> 2014-11-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add context menu API to Web Process Extensions
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmgitpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (175716 => 175717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2014-11-06 22:23:16 UTC (rev 175716)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2014-11-06 22:41:31 UTC (rev 175717)
</span><span class="lines">@@ -323,16 +323,13 @@
</span><span class="cx"> command += changed_files
</span><span class="cx"> return self.prepend_svn_revision(self.run(command, decode_output=False, cwd=self.checkout_root))
</span><span class="cx">
</span><del>- def _run_git_svn_find_rev(self, revision, branch=None):
- revision = str(revision)
- if revision and revision[0] != 'r':
- revision = 'r' + revision
-
- # git svn find-rev always exits 0, even when the revision or commit is not found.
- command = ['svn', 'find-rev', revision]
</del><ins>+ def _run_git_svn_find_rev(self, revision_or_treeish, branch=None):
+ # git svn find-rev requires SVN revisions to begin with the character 'r'.
+ command = ['svn', 'find-rev', revision_or_treeish]
</ins><span class="cx"> if branch:
</span><span class="cx"> command.append(branch)
</span><span class="cx">
</span><ins>+ # git svn find-rev always exits 0, even when the revision or commit is not found.
</ins><span class="cx"> return self._run_git(command).rstrip()
</span><span class="cx">
</span><span class="cx"> def _string_to_int_or_none(self, string):
</span></span></pre>
</div>
</div>
</body>
</html>