Changeset 270254 in webkit

Timestamp:

Nov 30, 2020 11:23:08 AM (3 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Support remote repositories in git-webkit
​https://bugs.webkit.org/show_bug.cgi?id=219172
<rdar://problem/71594909>

Rubber-stamped by Aakash Jain.

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

(Command.parser): Remove repository, since it depends on the parser.
(Command.main): Support arguments to main functions.
(Find.parser): Remove repository, since it depends on the parser.
(Checkout.parser): Ditto.
(Checkout.main): Early return if specified repository is remote.
(main): Construct repository based on path argument.

• Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py:

(TestCheckout):
(TestCheckout.test_checkout_remote):

• Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py:

(TestFind.test_baisc_svn_remote):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/program.py (modified) (9 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-30  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Support remote repositories in git-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=219172
+        <rdar://problem/71594909>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program.py:
+        (Command.parser): Remove repository, since it depends on the parser.
+        (Command.main): Support arguments to main functions.
+        (Find.parser): Remove repository, since it depends on the parser.
+        (Checkout.parser): Ditto.
+        (Checkout.main): Early return if specified repository is remote.
+        (main): Construct repository based on path argument.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py:
+        (TestCheckout):
+        (TestCheckout.test_checkout_remote):
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py:
+        (TestFind.test_baisc_svn_remote):
+
 2020-11-30  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -47 +47 @@
     )
 
-version = Version(0, 4, 0)
+version = Version(0, 4, 1)
 
 AutoInstall.register(Package('dateutil', Version(2, 8, 1), pypi_name='python-dateutil'))

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

@@ -29 +29 @@
 from datetime import datetime
 from webkitcorepy import arguments, log as webkitcorepy_log
-from webkitscmpy import Commit, local, log
+from webkitscmpy import Commit, local, log, remote
 
 
@@ -37 +37 @@
 
     @classmethod
-    def parser(cls, parser, repository):
+    def parser(cls, parser):
         if cls.name is None:
             raise NotImplementedError('Command does not have a name')
@@ -44 +44 @@
 
     @classmethod
-    def main(cls, repository):
+    def main(cls, args, repository):
         sys.stderr.write('No command specified\n')
         return -1
@@ -54 +54 @@
 
     @classmethod
-    def parser(cls, parser, repository, loggers=None):
+    def parser(cls, parser, loggers=None):
         arguments.LoggingGroup(
             parser,
@@ -122 +122 @@
 
     @classmethod
-    def parser(cls, parser, repository, loggers=None):
+    def parser(cls, parser, loggers=None):
         arguments.LoggingGroup(
             parser,
@@ -137 +137 @@
     @classmethod
     def main(cls, args, repository):
+        if not repository.path:
+            sys.stderr.write("Cannot checkout on remote repository")
+            return 1
+
         try:
             commit = repository.checkout(args.argument[0])
@@ -156 +160 @@
     loggers = [logging.getLogger(), webkitcorepy_log,  log] + (loggers or [])
 
-    repository = local.Scm.from_path(path=path or os.getcwd())
-
     parser = argparse.ArgumentParser(
         description='Custom git tooling from the WebKit team to interact with a ' +
@@ -163 +165 @@
     )
     arguments.LoggingGroup(parser)
+
+    group = parser.add_argument_group('Repository')
+    group.add_argument(
+        '--path', '-p', '-C',
+        dest='repository', default=path or os.getcwd(),
+        help='Set the repository path or URL to be used',
+        action='store',
+    )
+
     subparsers = parser.add_subparsers(help='sub-command help')
 
@@ -168 +179 @@
         subparser = subparsers.add_parser(program.name, help=program.help)
         subparser.set_defaults(main=program.main)
-        program.parser(subparser, repository=repository, loggers=loggers)
+        program.parser(subparser, loggers=loggers)
 
     parsed = parser.parse_args(args=args)
 
+    if parsed.repository.startswith(('https://', 'http://')):
+        repository = remote.Scm.from_url(parsed.repository)
+    else:
+        repository = local.Scm.from_path(path=parsed.repository)
+
     return parsed.main(args=parsed, repository=repository)

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/checkout_unittest.py

@@ -63 +63 @@
 
             self.assertEqual(4, local.Svn(self.path).commit().revision)
+
+    def test_checkout_remote(self):
+        with mocks.remote.Svn(), OutputCapture():
+            self.assertEqual(1, program.main(
+                args=('-C', 'https://svn.webkit.org/repository/webkit', 'checkout', '3@trunk'),
+                path=self.path,
+            ))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py

@@ -53 +53 @@
             self.assertEqual(0, program.main(
                 args=('find', 'HEAD', '-q'),
+                path=self.path,
+            ))
+        self.assertEqual(captured.stdout.getvalue(), '4@trunk | r6 | 6th commit\n')
+
+    def test_basic_svn_remote(self):
+        with mocks.remote.Svn(), OutputCapture() as captured:
+            self.assertEqual(0, program.main(
+                args=('-C', 'https://svn.webkit.org/repository/webkit', 'find', 'HEAD', '-q'),
                 path=self.path,
             ))