[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [281821] trunk/Tools
From: jbedard () apple ! com
Date: 2021-08-31 20:42:13
Message-ID: 20210831204213.E9B3B1005593 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[281821] 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/281821">281821</a></dd> \
<dt>Author</dt> <dd>jbedard@apple.com</dd> <dt>Date</dt> <dd>2021-08-31 13:42:13 \
-0700 (Tue, 31 Aug 2021)</dd> </dl>
<h3>Log Message</h3>
<pre>[git-webkit] Automatic rebasing or pull-requests
https://bugs.webkit.org/show_bug.cgi?id=229625
<rdar://problem/82451030>
Reviewed by Dewei Zhu.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.pull): Add rebase and branch arguments.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Add pull.rebase = true in default config.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py:
(Pull): Add 'up' and 'update' aliases.
(Pull.main): Update the source branch of a pull-request branches.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.parser): Add --rebase/--no-rebase options.
(PullRequest.main): Update and rebase a pull-request on it's source branch.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
(TestPullRequest.test_staged):
(TestPullRequest.test_modified):
(TestPullRequest.test_github):
(TestPullRequest.test_github_update):
(TestPullRequest.test_bitbucket):
(TestPullRequest.test_bitbucket_update):
* Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py:
(TestSetupGitSvn.test_empty):
(TestSetupGitSvn.test_add):</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="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpylocalgitpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpymockslocalgitpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpyprogrampullpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpyprogrampull_requestpy"> \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpytestpull_request_unitte \
stpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitscmpywebkitscmpytestsetup_git_svn_unitt \
estpy">trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281820 => 281821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2021-08-31 20:40:41 UTC (rev 281820)
+++ trunk/Tools/ChangeLog 2021-08-31 20:42:13 UTC (rev 281821)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2021-08-31 Jonathan Bedard <jbedard@apple.com>
+
+ [git-webkit] Automatic rebasing or pull-requests
+ https://bugs.webkit.org/show_bug.cgi?id=229625
+ <rdar://problem/82451030>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.pull): Add rebase and branch arguments.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+ (Git.__init__): Add pull.rebase = true in default config.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py:
+ (Pull): Add 'up' and 'update' aliases.
+ (Pull.main): Update the source branch of a pull-request branches.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+ (PullRequest.parser): Add --rebase/--no-rebase options.
+ (PullRequest.main): Update and rebase a pull-request on it's source branch.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py:
+ (TestPullRequest.test_staged):
+ (TestPullRequest.test_modified):
+ (TestPullRequest.test_github):
+ (TestPullRequest.test_github_update):
+ (TestPullRequest.test_bitbucket):
+ (TestPullRequest.test_bitbucket_update):
+ * Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py:
+ (TestSetupGitSvn.test_empty):
+ (TestSetupGitSvn.test_add):
+
</ins><span class="cx"> 2021-08-31 Kate Cheney <katherine_cheney@apple.com>
</span><span class="cx">
</span><span class="cx"> Loads after session restore marked app initiated in \
Safari </span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpysetuppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py \
(281820 => 281821)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-08-31 20:42:13 UTC (rev \
281821) </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.0.0',
</del><ins>+ version='2.0.1',
</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 (281820 => \
281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-08-31 20:40:41 \
UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-08-31 \
20:42:13 UTC (rev 281821) </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, 0, 0)
</del><ins>+version = Version(2, 0, 1)
</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="trunkToolsScriptslibrarieswebkitscmpywebkitscmpylocalgitpy"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (281820 => \
281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-08-31 \
20:42:13 UTC (rev 281821) </span><span class="lines">@@ -771,9 +771,14 @@
</span><span class="cx"> cwd=self.root_path,
</span><span class="cx"> ).returncode else self.commit()
</span><span class="cx">
</span><del>- def pull(self):
- commit = self.commit()
- code = run([self.executable(), 'pull'], cwd=self.root_path).returncode
</del><ins>+ def pull(self, rebase=None, branch=None):
+ code = run(
+ [self.executable(), 'pull'] + (
+ ['origin', branch] if branch else []
+ ) + (
+ [] if rebase is None else ['--rebase={}'.format('True' if rebase \
else 'False')] + ), cwd=self.root_path,
+ ).returncode
</ins><span class="cx"> if not code and self.is_svn:
</span><span class="cx"> return run([
</span><span class="cx"> self.executable(), 'svn', 'fetch', \
'--log-window-size=5000', '-r', '{}:HEAD'.format(commit.revision), \
</span></span></pre></div> <a \
id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpymockslocalgitpy"></a> <div \
class="modfile"><h4>Modified: \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (281820 => \
281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2021-08-31 \
20:42:13 UTC (rev 281821) </span><span class="lines">@@ -92,6 +92,8 @@
</span><span class="cx"> '\tlogallrefupdates = true\n'
</span><span class="cx"> '\tignorecase = true\n'
</span><span class="cx"> '\tprecomposeunicode = true\n'
</span><ins>+ '[pull]\n'
+ '\trebase = true\n'
</ins><span class="cx"> '[remote "origin"]\n'
</span><span class="cx"> '\turl = {remote}\n'
</span><span class="cx"> '\tfetch = \
+refs/heads/*:refs/remotes/origin/*\n' </span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpyprogrampullpy"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py (281820 => \
281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull.py 2021-08-31 \
20:42:13 UTC (rev 281821) </span><span class="lines">@@ -23,10 +23,13 @@
</span><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx"> from .command import Command
</span><ins>+from .pull_request import PullRequest
+from webkitscmpy import local
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class Pull(Command):
</span><span class="cx"> name = 'pull'
</span><ins>+ aliases = ['up', 'update']
</ins><span class="cx"> help = 'Update the current checkout, synchronize git-svn \
if configured' </span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="lines">@@ -34,4 +37,8 @@
</span><span class="cx"> if not repository.path:
</span><span class="cx"> sys.stderr.write('Cannot update remote \
repository\n') </span><span class="cx"> return 1
</span><ins>+
+ if isinstance(repository, local.Git):
+ branch_point = PullRequest.branch_point(args, repository, **kwargs)
+ return repository.pull(rebase=True, branch=branch_point.branch)
</ins><span class="cx"> return repository.pull()
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpyprogrampull_requestpy"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py (281820 \
=> 281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py 2021-08-31 \
20:42:13 UTC (rev 281821) </span><span class="lines">@@ -38,11 +38,17 @@
</span><span class="cx"> def parser(cls, parser, loggers=None):
</span><span class="cx"> Branch.parser(parser, loggers=loggers)
</span><span class="cx"> parser.add_argument(
</span><del>- '--no-add', '--add',
</del><ins>+ '--add', '--no-add',
</ins><span class="cx"> dest='will_add', default=None,
</span><span class="cx"> help='When drafting a change, add (or never add) \
modified files to set of staged changes to be committed', </span><span class="cx"> \
action=arguments.NoAction, </span><span class="cx"> )
</span><ins>+ parser.add_argument(
+ '--rebase', '--no-rebase',
+ dest='rebase', default=None,
+ help='Rebase (or do not rebase) the pull-request on the source branch \
before pushing', + action=arguments.NoAction,
+ )
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def create_commit(cls, args, repository, **kwargs):
</span><span class="lines">@@ -105,6 +111,12 @@
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="cx"> branch_point = cls.branch_point(args, repository, \
**kwargs) </span><ins>+ if args.rebase or (args.rebase is None and \
repository.config().get('pull.rebase')): + log.warning("Rebasing '{}' \
on '{}'...".format(repository.branch, branch_point.branch)) + if \
repository.pull(rebase=True, branch=branch_point.branch): + \
sys.stderr.write("Failed to rebase '{}' on '{},' please resolve \
conflicts\n".format(repository.branch, branch_point.branch)) + \
return 1 + log.warning("Rebased '{}' on \
'{}!'".format(repository.branch, branch_point.branch)) </ins><span class="cx">
</span><span class="cx"> rmt = repository.remote()
</span><span class="cx"> if not rmt:
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpytestpull_request_unittestpy"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py \
(281820 => 281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/pull_request_unittest.py 2021-08-31 \
20:42:13 UTC (rev 281821) </span><span class="lines">@@ -194,6 +194,8 @@
</span><span class="cx"> self.assertEqual(captured.root.log.getvalue(), \
'''Creating the local development branch 'eng/pr-branch'... </span><span class="cx"> \
Creating commit... </span><span class="cx"> Found 1 commit...
</span><ins>+Rebasing 'eng/pr-branch' on 'main'...
+Rebased 'eng/pr-branch' on 'main!'
</ins><span class="cx"> ''')
</span><span class="cx"> self.assertEqual(captured.stderr.getvalue(), \
"'{}' doesn't have a recognized remote\n".format(self.path)) </span><span \
class="cx"> </span><span class="lines">@@ -213,6 +215,8 @@
</span><span class="cx"> Adding modified.txt...
</span><span class="cx"> Creating commit...
</span><span class="cx"> Found 1 commit...
</span><ins>+Rebasing 'eng/pr-branch' on 'main'...
+Rebased 'eng/pr-branch' on 'main!'
</ins><span class="cx"> ''')
</span><span class="cx">
</span><span class="cx"> def test_github(self):
</span><span class="lines">@@ -228,10 +232,12 @@
</span><span class="cx"> self.assertEqual(captured.stderr.getvalue(), '')
</span><span class="cx"> log = captured.root.log.getvalue().splitlines()
</span><span class="cx"> self.assertEqual(
</span><del>- log[:4] + log[7 if sys.version_info > (3, 0) else 5:], [
</del><ins>+ log[:6] + log[9 if sys.version_info > (3, 0) else 7:], [
</ins><span class="cx"> "Creating the local development branch \
'eng/pr-branch'...", </span><span class="cx"> 'Creating \
commit...', </span><span class="cx"> ' Found 1 commit...',
</span><ins>+ "Rebasing 'eng/pr-branch' on 'main'...",
+ "Rebased 'eng/pr-branch' on 'main!'",
</ins><span class="cx"> "Pushing 'eng/pr-branch' to \
'fork'...", </span><span class="cx"> "Creating pull-request \
for 'eng/pr-branch'...", </span><span class="cx"> "Created \
'PR 1 | Created commit'!", </span><span class="lines">@@ -257,9 +263,11 @@
</span><span class="cx"> self.assertEqual(captured.stderr.getvalue(), '')
</span><span class="cx"> log = captured.root.log.getvalue().splitlines()
</span><span class="cx"> self.assertEqual(
</span><del>- log[:3] + log[6 if sys.version_info > (3, 0) else 4:], [
</del><ins>+ log[:5] + log[8 if sys.version_info > (3, 0) else 6:], [
</ins><span class="cx"> "Amending commit...",
</span><span class="cx"> ' Found 1 commit...',
</span><ins>+ "Rebasing 'eng/pr-branch' on 'main'...",
+ "Rebased 'eng/pr-branch' on 'main!'",
</ins><span class="cx"> "Pushing 'eng/pr-branch' to \
'fork'...", </span><span class="cx"> "Updating pull-request \
for 'eng/pr-branch'...", </span><span class="cx"> "Updated \
'PR 1 | Amended commit'!", </span><span class="lines">@@ -266,7 +274,7 @@
</span><span class="cx"> ],
</span><span class="cx"> )
</span><span class="cx">
</span><del>- def test_stash(self):
</del><ins>+ def test_bitbucket(self):
</ins><span class="cx"> with OutputCapture() as captured, \
mocks.remote.BitBucket() as remote, mocks.local.Git(self.path, \
remote='ssh://git@{}/{}/{}.git'.format( </span><span class="cx"> \
remote.hosts[0], remote.project.split('/')[1], remote.project.split('/')[3], \
</span><span class="cx"> )) as repo, mocks.local.Svn(): </span><span \
class="lines">@@ -280,10 +288,12 @@ </span><span class="cx"> \
self.assertEqual(captured.stderr.getvalue(), '') </span><span class="cx"> log \
= captured.root.log.getvalue().splitlines() </span><span class="cx"> \
self.assertEqual( </span><del>- log[:4] + log[7 if sys.version_info > \
(3, 0) else 5:], [ </del><ins>+ log[:6] + log[9 if sys.version_info > \
(3, 0) else 7:], [ </ins><span class="cx"> "Creating the local \
development branch 'eng/pr-branch'...", </span><span class="cx"> \
'Creating commit...', </span><span class="cx"> ' Found 1 \
commit...', </span><ins>+ "Rebasing 'eng/pr-branch' on \
'main'...", + "Rebased 'eng/pr-branch' on 'main!'",
</ins><span class="cx"> "Pushing 'eng/pr-branch' to \
'origin'...", </span><span class="cx"> "Creating \
pull-request for 'eng/pr-branch'...", </span><span class="cx"> \
"Created 'PR 1 | Created commit'!", </span><span class="lines">@@ -290,7 \
+300,7 @@ </span><span class="cx"> ],
</span><span class="cx"> )
</span><span class="cx">
</span><del>- def test_stash_update(self):
</del><ins>+ def test_bitbucket_update(self):
</ins><span class="cx"> with mocks.remote.BitBucket() as remote, \
mocks.local.Git(self.path, remote='ssh://git@{}/{}/{}.git'.format( </span><span \
class="cx"> remote.hosts[0], remote.project.split('/')[1], \
remote.project.split('/')[3], </span><span class="cx"> )) as repo, \
mocks.local.Svn(): </span><span class="lines">@@ -311,9 +321,11 @@
</span><span class="cx"> self.assertEqual(captured.stderr.getvalue(), '')
</span><span class="cx"> log = captured.root.log.getvalue().splitlines()
</span><span class="cx"> self.assertEqual(
</span><del>- log[:3] + log[6 if sys.version_info > (3, 0) else 4:], [
</del><ins>+ log[:5] + log[8 if sys.version_info > (3, 0) else 6:], [
</ins><span class="cx"> "Amending commit...",
</span><span class="cx"> ' Found 1 commit...',
</span><ins>+ "Rebasing 'eng/pr-branch' on 'main'...",
+ "Rebased 'eng/pr-branch' on 'main!'",
</ins><span class="cx"> "Pushing 'eng/pr-branch' to \
'origin'...", </span><span class="cx"> "Updating \
pull-request for 'eng/pr-branch'...", </span><span class="cx"> \
"Updated 'PR 1 | Amended commit'!", </span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitscmpywebkitscmpytestsetup_git_svn_unittestpy"></a>
<div class="modfile"><h4>Modified: \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py \
(281820 => 281821)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py 2021-08-31 \
20:40:41 UTC (rev 281820)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_git_svn_unittest.py 2021-08-31 \
20:42:13 UTC (rev 281821) </span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> '\tlogallrefupdates = true\n'
</span><span class="cx"> '\tignorecase = true\n'
</span><span class="cx"> '\tprecomposeunicode = true\n'
</span><ins>+ '[pull]\n'
+ '\trebase = true\n'
</ins><span class="cx"> '[remote "origin"]\n'
</span><span class="cx"> '\turl = {git_remote}\n'
</span><span class="cx"> '\tfetch = \
+refs/heads/*:refs/remotes/origin/*\n' </span><span class="lines">@@ -113,6 +115,8 @@
</span><span class="cx"> '\tlogallrefupdates = true\n'
</span><span class="cx"> '\tignorecase = true\n'
</span><span class="cx"> '\tprecomposeunicode = true\n'
</span><ins>+ '[pull]\n'
+ '\trebase = true\n'
</ins><span class="cx"> '[remote "origin"]\n'
</span><span class="cx"> '\turl = {git_remote}\n'
</span><span class="cx"> '\tfetch = \
+refs/heads/*:refs/remotes/origin/*\n' </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic