Changeset 273142 in webkit

Timestamp:

Feb 19, 2021 9:33:33 AM (3 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Add clean command
​https://bugs.webkit.org/show_bug.cgi?id=222135
<rdar://problem/74496504>

Reviewed by Aakash Jain.

• Scripts/libraries/webkitscmpy/setup.py: Bump version.
• Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Ditto.
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:

(Git):
(Git.clean): Throw away all local changes.

• Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:

(Svn):
(Svn.clean): Throw away all local changes, delete untracked files.

• Scripts/libraries/webkitscmpy/webkitscmpy/program/init.py:

(main): Add Clean command

• Scripts/libraries/webkitscmpy/webkitscmpy/program/clean.py: Added.

(Clean): Command to remove all local changes from the current checkout.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/clean.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-19  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Add clean command
+        https://bugs.webkit.org/show_bug.cgi?id=222135
+        <rdar://problem/74496504>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+        (Git):
+        (Git.clean): Throw away all local changes.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+        (Svn):
+        (Svn.clean): Throw away all local changes, delete untracked files.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:
+        (main): Add Clean command
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/clean.py: Added.
+        (Clean): Command to remove all local changes from the current checkout.
+
 2021-02-19  Jiewen Tan  <jiewen_tan@apple.com>
 

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

@@ -30 +30 @@
 setup(
     name='webkitscmpy',
-    version='0.9.9',
+    version='0.10.0',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),

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

@@ -47 +47 @@
     )
 
-version = Version(0, 9, 9)
+version = Version(0, 10, 0)
 
 AutoInstall.register(Package('entrypoints', Version(0, 3, 0)))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py

@@ -334 +334 @@
             ], cwd=self.root_path).returncode
         return code
+
+    def clean(self):
+        return run([
+            self.executable(), 'reset', 'HEAD', '--hard',
+        ], cwd=self.root_path).returncode

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py

@@ -27 +27 @@
 import os
 import re
+import shutil
 import subprocess
 import sys
@@ -400 +401 @@
     def pull(self):
         return run([self.executable(), 'up'], cwd=self.root_path).returncode
+
+    def clean(self):
+        result = run([
+            self.executable(), 'revert', '-R', self.root_path,
+        ], cwd=self.root_path).returncode
+        if result:
+            return result
+
+        for line in reversed(run([self.executable(), 'status'], cwd=self.root_path, capture_output=True, encoding='utf-8').stdout.splitlines()):
+            candidate = line.split('       ')
+            if candidate[0] != '?':
+                continue
+            path = os.path.join(self.root_path, '       '.join(candidate[1:]))
+            if os.path.isdir(path):
+                shutil.rmtree(path, ignore_errors=True)
+            elif os.path.exists(path):
+                os.remove(path)
+        return 0

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

@@ -29 +29 @@
 
 from .canonicalize import Canonicalize
+from .clean import Clean
 from .command import Command
 from .checkout import Checkout
@@ -57 +58 @@
     subparsers = parser.add_subparsers(help='sub-command help')
 
-    programs = [Find, Checkout, Canonicalize, Pull]
+    programs = [Find, Checkout, Canonicalize, Pull, Clean]
     if subversion:
         programs.append(SetupGitSvn)