Diff
Modified: trunk/Tools/ChangeLog (286372 => 286373)
--- trunk/Tools/ChangeLog 2021-12-01 19:07:25 UTC (rev 286372)
+++ trunk/Tools/ChangeLog 2021-12-01 19:14:23 UTC (rev 286373)
@@ -1,3 +1,17 @@
+2021-12-01 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Do not query remotes when determining branches containing commit
+ https://bugs.webkit.org/show_bug.cgi?id=233700
+ <rdar://problem/85920569>
+
+ Reviewed by Stephanie Lewis.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.branches_for): Remove -a from --contains check.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+
2021-12-01 Tim Horton <[email protected]>
REGRESSION (r286346): ResourceLoadDelegate.LoadInfo fails
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (286372 => 286373)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-12-01 19:07:25 UTC (rev 286372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-12-01 19:14:23 UTC (rev 286373)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='3.0.4',
+ version='3.0.5',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (286372 => 286373)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-12-01 19:07:25 UTC (rev 286372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-12-01 19:14:23 UTC (rev 286373)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(3, 0, 4)
+version = Version(3, 0, 5)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (286372 => 286373)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-12-01 19:07:25 UTC (rev 286372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-12-01 19:14:23 UTC (rev 286373)
@@ -461,7 +461,7 @@
def branches_for(self, hash=None, remote=True):
branch = run(
- [self.executable(), 'branch', '-a'] + (['--contains', hash] if hash else []),
+ [self.executable(), 'branch'] + (['--contains', hash] if hash else ['-a']),
cwd=self.root_path,
capture_output=True,
encoding='utf-8',
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (286372 => 286373)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2021-12-01 19:07:25 UTC (rev 286372)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2021-12-01 19:14:23 UTC (rev 286373)
@@ -340,12 +340,12 @@
)
) if self.find(args[4]) else mocks.ProcessCompletion(returncode=128),
), mocks.Subprocess.Route(
- self.executable, 'branch', '-a', '--contains', re.compile(r'.+'),
+ self.executable, 'branch', '--contains', re.compile(r'.+'),
cwd=self.path,
generator=lambda *args, **kwargs: mocks.ProcessCompletion(
returncode=0,
- stdout='\n'.join(sorted(self.branches_on(args[4]))) + '\n',
- ) if self.find(args[4]) else mocks.ProcessCompletion(returncode=128),
+ stdout='\n'.join(sorted(self.branches_on(args[3]))) + '\n',
+ ) if self.find(args[3]) else mocks.ProcessCompletion(returncode=128),
), mocks.Subprocess.Route(
self.executable, 'checkout', '-b', re.compile(r'.+'),
cwd=self.path,
