Diff
Modified: trunk/Tools/ChangeLog (284164 => 284165)
--- trunk/Tools/ChangeLog 2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/ChangeLog 2021-10-14 16:08:07 UTC (rev 284165)
@@ -1,3 +1,19 @@
+2021-10-14 Jonathan Bedard <jbed...@apple.com>
+
+ [git-webkit] Reset author time when editing commits (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=230224
+
+ Reviewed by Dewei Zhu.
+
+ update-ref creates a sticky ref file, which is not what we want.
+ Use 'fetch' instead.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+ (Git.pull): Use fetch instead of update-ref.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+
2021-10-14 Aakash Jain <aakash_j...@apple.com>
Disable django admin url on ews.webkit.org
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284164 => 284165)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-10-14 16:08:07 UTC (rev 284165)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='2.2.9',
+ version='2.2.10',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284164 => 284165)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-10-14 16:08:07 UTC (rev 284165)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(2, 2, 9)
+version = Version(2, 2, 10)
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 (284164 => 284165)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py 2021-10-14 16:08:07 UTC (rev 284165)
@@ -814,7 +814,7 @@
if not code and branch:
code = run(
- [self.executable(), 'update-ref', branch, '{}/{}'.format(remote, branch)],
+ [self.executable(), 'fetch', remote, '{}:{}'.format(branch, branch)],
cwd=self.root_path,
).returncode
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (284164 => 284165)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2021-10-14 16:03:39 UTC (rev 284164)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py 2021-10-14 16:08:07 UTC (rev 284165)
@@ -431,7 +431,7 @@
cwd=self.path,
generator=lambda *args, **kwargs: mocks.ProcessCompletion(returncode=0),
), mocks.Subprocess.Route(
- self.executable, 'update-ref', re.compile(r'.+'), re.compile(r'.+'),
+ self.executable, 'fetch', 'origin', re.compile(r'.+:.+'),
cwd=self.path,
generator=lambda *args, **kwargs: mocks.ProcessCompletion(returncode=0),
), mocks.Subprocess.Route(
