Title: [288222] trunk/Tools
- Revision
- 288222
- Author
- [email protected]
- Date
- 2022-01-19 11:47:31 -0800 (Wed, 19 Jan 2022)
Log Message
[git-webkit] Improve pr push error message
https://bugs.webkit.org/show_bug.cgi?id=235299
<rdar://problem/87721181>
Reviewed by Aakash Jain.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.main): If `git push` fails, provide the user with options
for resolution.
Canonical link: https://commits.webkit.org/246182@main
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (288221 => 288222)
--- trunk/Tools/ChangeLog 2022-01-19 19:44:17 UTC (rev 288221)
+++ trunk/Tools/ChangeLog 2022-01-19 19:47:31 UTC (rev 288222)
@@ -1,3 +1,17 @@
+2022-01-19 Jonathan Bedard <[email protected]>
+
+ [git-webkit] Improve pr push error message
+ https://bugs.webkit.org/show_bug.cgi?id=235299
+ <rdar://problem/87721181>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+ (PullRequest.main): If `git push` fails, provide the user with options
+ for resolution.
+
2022-01-19 Alex Christensen <[email protected]>
Unreviewed, reverting r288147.
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (288221 => 288222)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-01-19 19:44:17 UTC (rev 288221)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2022-01-19 19:47:31 UTC (rev 288222)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='3.1.0',
+ version='3.1.1',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (288221 => 288222)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-01-19 19:44:17 UTC (rev 288221)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2022-01-19 19:47:31 UTC (rev 288222)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(3, 1, 0)
+version = Version(3, 1, 1)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py (288221 => 288222)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py 2022-01-19 19:44:17 UTC (rev 288221)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py 2022-01-19 19:47:31 UTC (rev 288222)
@@ -135,7 +135,9 @@
target = 'fork' if isinstance(rmt, remote.GitHub) else 'origin'
log.info("Pushing '{}' to '{}'...".format(repository.branch, target))
if run([repository.executable(), 'push', '-f', target, repository.branch], cwd=repository.root_path).returncode:
- sys.stderr.write("Failed to push '{}' to '{}'\n".format(repository.branch, target))
+ sys.stderr.write("Failed to push '{}' to '{}' (alias of '{}')\n".format(repository.branch, target, repository.url(name=target)))
+ sys.stderr.write("Your checkout may be mis-configured, try re-running 'git-webkit setup' or\n")
+ sys.stderr.write("your checkout may not have permission to push to '{}'\n".format(repository.url(name=target)))
return 1
if args.history or (target != 'origin' and args.history is None):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
