Attachment 437055 Details for Bug 229625 – Patch

[patch] Patch

bug-229625-20210901124648.patch (text/plain), 2.71 KB, created by Jonathan Bedard on 2021-09-01 12:46:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2021-09-01 12:46:49 PDT

Size: 2.71 KB

patch

obsolete

>Subversion Revision: 281866
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 86972487baab87f0b3ffcc826e2630f9565f055e..86496d28912d4681a5191b89bed4a69710cbdd7a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2021-09-01  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [git-webkit] Automatic rebasing or pull-requests (Follow-up fix.)
>+        https://bugs.webkit.org/show_bug.cgi?id=229625
>+        <rdar://problem/82451030>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
>+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
>+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
>+        (Git.pull): Set commit for git-svn checkouts.
>+
> 2021-09-01  Jonathan Bedard  <jbedard@apple.com>
> 
>         [git-webkit] Add automatic Editor configuration
>diff --git a/Tools/Scripts/libraries/webkitscmpy/setup.py b/Tools/Scripts/libraries/webkitscmpy/setup.py
>index 925238f87a8bdee6b2aa6b737430d4707b8d6855..1c05ff6c844c14cb0b8e20246d7d6e804762960f 100644
>--- a/Tools/Scripts/libraries/webkitscmpy/setup.py
>+++ b/Tools/Scripts/libraries/webkitscmpy/setup.py
>@@ -29,7 +29,7 @@ def readme():
> 
> setup(
>     name='webkitscmpy',
>-    version='2.1.0',
>+    version='2.1.1',
>     description='Library designed to interact with git and svn repositories.',
>     long_description=readme(),
>     classifiers=[
>diff --git a/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py b/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
>index 7b424969becfff26098d6171074d896c5fd13d1b..43497128a5336bc825cb25d0ff0470808bf80697 100644
>--- a/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
>+++ b/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
>@@ -46,7 +46,7 @@ except ImportError:
>         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
>     )
> 
>-version = Version(2, 1, 0)
>+version = Version(2, 1, 1)
> 
> AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
> AutoInstall.register(Package('monotonic', Version(1, 5)))
>diff --git a/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py b/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
>index ef139587f73167bda0f24ae0ae859a64e3abd573..a023c83db036a9190b08f560a46a89b6b90a4139 100644
>--- a/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
>+++ b/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py
>@@ -772,6 +772,7 @@ class Git(Scm):
>         ).returncode else self.commit()
> 
>     def pull(self, rebase=None, branch=None):
>+        commit = self.commit() if self.is_svn else None
>         code = run(
>             [self.executable(), 'pull'] + (
>                 ['origin', branch] if branch else []

Actions: View | Formatted Diff | Diff

Attachments on bug 229625: 436661 | 436807 | 436882 | 436931 | 437052 | 437055