[git-webkit] --update should be synonomous with --rebase

https://bugs.webkit.org/show_bug.cgi?id=236658
<rdar://problem/88979674>

Reviewed by Ryan Haddad.

When working on a branch, `update` and `rebase` mean approximately
the same thing. `git-webkit pr` should support both.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.parser):


Canonical link: https://commits.webkit.org/247289@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog

@@ -1,3 +1,19 @@
+2022-02-15  Jonathan Bedard  <jbedard@apple.com>
+
+        [git-webkit] --update should be synonomous with --rebase
+        https://bugs.webkit.org/show_bug.cgi?id=236658
+        <rdar://problem/88979674>
+
+        Reviewed by Ryan Haddad.
+
+        When working on a branch, `update` and `rebase` mean approximately
+        the same thing. `git-webkit pr` should support both.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
+        (PullRequest.parser):
+
 2022-02-15  Per Arne Vollan  <pvollan@apple.com>
 
         REGRESSION(r289147): Two API tests are failing

Tools/Scripts/libraries/webkitscmpy/setup.py

@@ -29,7 +29,7 @@ def readme():
 
 setup(
     name='webkitscmpy',
-    version='4.1.4',
+    version='4.1.5',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),
     classifiers=[

Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -46,7 +46,7 @@ def _maybe_add_webkitcorepy_path():
         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
     )
 
-version = Version(4, 1, 4)
+version = Version(4, 1, 5)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))

Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py

@@ -47,7 +47,7 @@ def parser(cls, parser, loggers=None):
             action=arguments.NoAction,
         )
         parser.add_argument(
-            '--rebase', '--no-rebase',
+            '--rebase', '--no-rebase', '--update', '--no-update',
             dest='rebase', default=None,
             help='Rebase (or do not rebase) the pull-request on the source branch before pushing',
             action=arguments.NoAction,