<!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>[284263] 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/284263">284263</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-10-15 12:14:53 -0700 (Fri, 15 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[webkitscmpy] Refactor PR branch management (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=230432
<rdar://problem/83258413>

Reviewed by Stephanie Lewis.

When we are uploading a change that includes multiple commits,
the second commit will be on the same branch as the first, but that
branch will be editable. We should not declare that "no commits
have been found on an editable branch," because that's not true.

* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
(Branch.branch_point): Log the found commit for branches with multiple commits.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpysetuppy">trunk/Tools/Scripts/libraries/webkitscmpy/setup.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpy__init__py">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpyprogrambranchpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (284262 => 284263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/ChangeLog       2021-10-15 19:14:53 UTC (rev 284263)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-10-15  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Refactor PR branch management (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=230432
+        <rdar://problem/83258413>
+
+        Reviewed by Stephanie Lewis.
+
+        When we are uploading a change that includes multiple commits,
+        the second commit will be on the same branch as the first, but that
+        branch will be editable. We should not declare that "no commits
+        have been found on an editable branch," because that's not true.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py:
+        (Branch.branch_point): Log the found commit for branches with multiple commits.
+
</ins><span class="cx"> 2021-10-15  Aakash Jain  <aakash_jain@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make submit to ews error messages readable
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpysetuppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284262 => 284263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py       2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py  2021-10-15 19:14:53 UTC (rev 284263)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> setup(
</span><span class="cx">     name='webkitscmpy',
</span><del>-    version='2.2.10',
</del><ins>+    version='2.2.11',
</ins><span class="cx">     description='Library designed to interact with git and svn repositories.',
</span><span class="cx">     long_description=readme(),
</span><span class="cx">     classifiers=[
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpy__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284262 => 284263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py        2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py   2021-10-15 19:14:53 UTC (rev 284263)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
</span><span class="cx">     )
</span><span class="cx"> 
</span><del>-version = Version(2, 2, 10)
</del><ins>+version = Version(2, 2, 11)
</ins><span class="cx"> 
</span><span class="cx"> AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
</span><span class="cx"> AutoInstall.register(Package('monotonic', Version(1, 5)))
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpyprogrambranchpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py (284262 => 284263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py  2021-10-15 19:13:29 UTC (rev 284262)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/branch.py     2021-10-15 19:14:53 UTC (rev 284263)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">         while not commit or cls.editable(commit.branch, repository=repository):
</span><span class="cx">             cnt += 1
</span><span class="cx">             commit = repository.find(argument='HEAD~{}'.format(cnt), include_log=False, include_identifier=False)
</span><del>-            if cnt > 1 or commit.branch != repository.branch:
</del><ins>+            if cnt > 1 or commit.branch != repository.branch or cls.editable(commit.branch, repository=repository):
</ins><span class="cx">                 log.warning('    Found {}...'.format(string_utils.pluralize(cnt, 'commit')))
</span><span class="cx">             else:
</span><span class="cx">                 log.warning('    No commits on editable branch')
</span></span></pre>
</div>
</div>

</body>
</html>