Changeset 271203 in webkit

Timestamp:

Jan 6, 2021, 10:14:39 AM (6 years ago)

Author:

Jonathan Bedard

Message:

[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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/canonicalize/__init__.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-06  Jonathan Bedard <jbedard@apple.com>
+
+        [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  <lmoura@igalia.com>
 

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

@@ -47 +47 @@
     )
 
-version = Version(0, 7, 0)
+version = Version(0, 7, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

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

@@ -75 +75 @@
             '--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')
@@ -136 +136 @@
                     ),
                 ] + 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,