Title: [282113] trunk/Tools
- Revision
- 282113
- Author
- jbed...@apple.com
- Date
- 2021-09-07 16:02:45 -0700 (Tue, 07 Sep 2021)
Log Message
[git-webkit] Support callbacks as main arguments (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=229739
<rdar://problem/82597266>
Unreviewed follow-up fix.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
(Git.url): For compatibility, use git config directly.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (282112 => 282113)
--- trunk/Tools/ChangeLog 2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/ChangeLog 2021-09-07 23:02:45 UTC (rev 282113)
@@ -1,5 +1,18 @@
2021-09-07 Jonathan Bedard <jbed...@apple.com>
+ [git-webkit] Support callbacks as main arguments (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=229739
+ <rdar://problem/82597266>
+
+ Unreviewed follow-up fix.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.url): For compatibility, use git config directly.
+
+2021-09-07 Jonathan Bedard <jbed...@apple.com>
+
[git-webkit] Support callbacks as main arguments
https://bugs.webkit.org/show_bug.cgi?id=229739
<rdar://problem/82597266>
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (282112 => 282113)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-09-07 23:02:45 UTC (rev 282113)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='2.1.2',
+ version='2.1.3',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (282112 => 282113)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-09-07 23:02:45 UTC (rev 282113)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(2, 1, 2)
+version = Version(2, 1, 3)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (282112 => 282113)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-09-07 22:23:44 UTC (rev 282112)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-09-07 23:02:45 UTC (rev 282113)
@@ -380,10 +380,7 @@
@decorators.Memoize()
def url(self, name=None):
- result = run([self.executable(), 'remote', 'get-url', name or 'origin'], cwd=self.root_path, capture_output=True, encoding='utf-8')
- if result.returncode:
- raise self.Exception('Failed to retrieve remote for {}'.format(self.root_path))
- return result.stdout.rstrip()
+ return self.config().get('remote.{}.url'.format(name or 'origin'))
@decorators.Memoize()
def remote(self, name=None):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
