Modified: trunk/Tools/ChangeLog (271202 => 271203)
--- trunk/Tools/ChangeLog 2021-01-06 17:49:19 UTC (rev 271202)
+++ trunk/Tools/ChangeLog 2021-01-06 18:14:39 UTC (rev 271203)
@@ -1,3 +1,14 @@
+2021-01-06 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Add command to canonicalize unpushed commits (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=219982
+ <rdar://problem/72427536>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/webkitscmpy/canonicalize/__init__.py:
+ (Canonicalize.main): git filter-branch requires the repository root.
+
2021-01-06 Lauro Moura <[email protected]>
[Flatpak SDK] coredumpctl invocation when using a local SDK repo fallbacks to the remote repo
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (271202 => 271203)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-01-06 17:49:19 UTC (rev 271202)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-01-06 18:14:39 UTC (rev 271203)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(0, 7, 0)
+version = Version(0, 7, 1)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/canonicalize/__init__.py (271202 => 271203)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/canonicalize/__init__.py 2021-01-06 17:49:19 UTC (rev 271202)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/canonicalize/__init__.py 2021-01-06 18:14:39 UTC (rev 271203)
@@ -74,7 +74,7 @@
repository.executable(), 'rev-list',
'--count', '--no-merges',
'{remote}/{branch}..{branch}'.format(remote=args.remote, branch=branch),
- ], capture_output=True, cwd=repository.path)
+ ], capture_output=True, cwd=repository.root_path)
if result.returncode:
sys.stderr.write('Failed to find local commits\n')
return -1
@@ -135,7 +135,7 @@
setting_message='' if log.level > logging.DEBUG else 'echo " $KEY=$VALUE"',
),
] + message_filter + ['{}...{}'.format(branch, base.hash)],
- cwd=repository.path,
+ cwd=repository.root_path,
env={'FILTER_BRANCH_SQUELCH_WARNING': '1', 'PYTHONPATH': ':'.join(sys.path)},
stdout=devnull if log.level > logging.WARNING else None,
stderr=devnull if log.level > logging.WARNING else None,
