Title: [281339] trunk/Tools
- Revision
- 281339
- Author
- jbed...@apple.com
- Date
- 2021-08-20 14:56:59 -0700 (Fri, 20 Aug 2021)
Log Message
[git-webkit] Forward unknown args to log and blame
https://bugs.webkit.org/show_bug.cgi?id=229342
<rdar://problem/82178743>
Rubber-stamped by Aakash Jain.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
(main): Both log and blame might be passed options that need to be forwarded to git/svn.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (281338 => 281339)
--- trunk/Tools/ChangeLog 2021-08-20 21:28:00 UTC (rev 281338)
+++ trunk/Tools/ChangeLog 2021-08-20 21:56:59 UTC (rev 281339)
@@ -1,3 +1,16 @@
+2021-08-20 Jonathan Bedard <jbed...@apple.com>
+
+ [git-webkit] Forward unknown args to log and blame
+ https://bugs.webkit.org/show_bug.cgi?id=229342
+ <rdar://problem/82178743>
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+ (main): Both log and blame might be passed options that need to be forwarded to git/svn.
+
2021-08-20 Carlos Alberto Lopez Perez <clo...@igalia.com>
REGRESSION(r274166): [GTK] It broke run-_javascript_core-tests causing all tests to use lot of memory
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (281338 => 281339)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-08-20 21:28:00 UTC (rev 281338)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-08-20 21:56:59 UTC (rev 281339)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='1.1.3',
+ version='1.1.4',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (281338 => 281339)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-08-20 21:28:00 UTC (rev 281338)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-08-20 21:56:59 UTC (rev 281339)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(1, 1, 3)
+version = Version(1, 1, 4)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py (281338 => 281339)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py 2021-08-20 21:28:00 UTC (rev 281338)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py 2021-08-20 21:56:59 UTC (rev 281339)
@@ -23,6 +23,7 @@
import argparse
import logging
import os
+import sys
from .blame import Blame
from .canonicalize import Canonicalize
@@ -71,6 +72,7 @@
for program in programs:
subparser = subparsers.add_parser(program.name, help=program.help)
subparser.set_defaults(main=program.main)
+ subparser.set_defaults(program=program.name)
arguments.LoggingGroup(
subparser,
loggers=loggers,
@@ -78,7 +80,14 @@
)
program.parser(subparser, loggers=loggers)
- parsed = parser.parse_args(args=args)
+ args = args or sys.argv[1:]
+ parsed, unknown = parser.parse_known_args(args=args)
+ if unknown:
+ program_index = args.index(parsed.program)
+ if getattr(parsed, 'args', None):
+ parsed.args = [arg for arg in args[program_index:] if arg in parsed.args or arg in unknown]
+ if any([option not in getattr(parsed, 'args', []) for option in unknown]):
+ parsed = parser.parse_args(args=args)
if parsed.repository.startswith(('https://', 'http://')):
repository = remote.Scm.from_url(parsed.repository, contributors=contributors)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
