Changeset 267810 in webkit

Timestamp:

Sep 30, 2020 4:51:10 PM (4 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Check if a git checkout is linked to an SVN checkout
​https://bugs.webkit.org/show_bug.cgi?id=216888
<rdar://problem/69446322>

Reviewed by Dewei Zhu.

• Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Increment library version.
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:

(Git.info): Run git svn info if in a Git-SVN checkout.
(Git.is_svn): Check if in a Git-SVN checkout.
(Git.is_git): Return True.

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

(Scm.is_svn): Return False.
(Scm.is_git): Ditto.

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

(Svn.is_svn): Return True.

• Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:

(Git.init): Add git svn commands.

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

(TestGit.test_scm_type):
(TestGit.test_info):

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

(TestSvn.test_scm_type):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (modified) (3 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/test/svn_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-30  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Check if a git checkout is linked to an SVN checkout
+        https://bugs.webkit.org/show_bug.cgi?id=216888
+        <rdar://problem/69446322>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Increment library version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:
+        (Git.info): Run `git svn info` if in a Git-SVN checkout.
+        (Git.is_svn): Check if in a Git-SVN checkout.
+        (Git.is_git): Return True.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py:
+        (Scm.is_svn): Return False.
+        (Scm.is_git): Ditto.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+        (Svn.is_svn): Return True.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+        (Git.__init__): Add `git svn` commands.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+        (TestGit.test_scm_type):
+        (TestGit.test_info):
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/svn_unittest.py:
+        (TestSvn.test_scm_type):
+
 2020-09-30  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -47 +47 @@
     )
 
-version = Version(0, 0, 4)
+version = Version(0, 0, 5)
 
 from webkitscmpy.contributor import Contributor

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

@@ -22 +22 @@
 
 
-from webkitcorepy import run, decorators
+from webkitcorepy import run, decorators, TimeoutExpired
 from webkitscmpy.local import Scm
 
@@ -37 +37 @@
         if not self.root_path:
             raise OSError('Provided path {} is not a git repository'.format(path))
+
+    @decorators.Memoize(cached=False)
+    def info(self):
+        if not self.is_svn:
+            raise self.Exception('Cannot run SVN info on a git checkout which is not git-svn')
+
+        info_result = run([self.executable, 'svn', 'info'], cwd=self.path, capture_output=True, encoding='utf-8')
+        if info_result.returncode:
+            return {}
+
+        result = {}
+        for line in info_result.stdout.splitlines():
+            split = line.split(': ')
+            result[split[0]] = ': '.join(split[1:])
+        return result
+
+    @property
+    @decorators.Memoize()
+    def is_svn(self):
+        try:
+            return run(
+                [self.executable, 'svn', 'find-rev', 'r1'],
+                cwd=self.root_path,
+                capture_output=True,
+                encoding='utf-8',
+                timeout=1,
+            ).returncode == 0
+        except TimeoutExpired:
+            return False
+
+    @property
+    def is_git(self):
+        return True
 
     @property

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

@@ -44 +44 @@
 
     @property
+    def is_svn(self):
+        return False
+
+    @property
+    def is_git(self):
+        return False
+
+    @property
     def root_path(self):
         raise NotImplementedError()

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

@@ -51 +51 @@
 
     @property
+    def is_svn(self):
+        return True
+
+    @property
     def root_path(self):
         return self.info(cached=True).get('Working Copy Root Path')

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

@@ -33 +33 @@
         branch=None, remote=None, branches=None, tags=None,
         detached=None, default_branch='main',
+        git_svn=False,
     ):
         self.path = path
@@ -41 +42 @@
         self.branches = branches or []
         self.tags = tags or []
+
+        if git_svn:
+            git_svn_routes = [
+                mocks.Subprocess.Route(
+                    local.Git.executable, 'svn', 'find-rev', 'r1',
+                    cwd=self.path,
+                    completion=mocks.ProcessCompletion(
+                        returncode=0,
+                        stdout='d423ea82efaaed0dcbafb09aaa4a70fafdea0729\n',
+                    ),
+                ), mocks.Subprocess.Route(
+                    local.Git.executable, 'svn', 'info',
+                    cwd=self.path,
+                    completion=mocks.ProcessCompletion(
+                        returncode=0,
+                        stdout=
+                            'Path: .\n'
+                            'URL: {remote}/{branch}\n'
+                            'Repository Root: {remote}\n'.format(
+                                path=self.path,
+                                remote=self.remote,
+                                branch=self.branch,
+                            ),
+                    ),
+                ),
+            ]
+
+        else:
+            git_svn_routes = [mocks.Subprocess.Route(
+                local.Git.executable, 'svn',
+                cwd=self.path,
+                completion=mocks.ProcessCompletion(returncode=1, elapsed=2),
+            )]
 
         super(Git, self).__init__(
@@ -117 +151 @@
                     stderr='fatal: not a git repository (or any parent up to mount point)\nStopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).\n',
                 ),
-            ),
+            ), *git_svn_routes
         )

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

@@ -24 +24 @@
 import unittest
 
+from webkitcorepy import LoggerCapture
+from webkitcorepy.mocks import Time as MockTime
 from webkitscmpy import local, mocks
 
@@ -70 +72 @@
         with mocks.local.Git(self.path):
             self.assertEqual(local.Git(self.path).default_branch, 'main')
+
+    def test_scm_type(self):
+        with mocks.local.Git(self.path), MockTime, LoggerCapture():
+            self.assertTrue(local.Git(self.path).is_git)
+            self.assertFalse(local.Git(self.path).is_svn)
+
+        with mocks.local.Git(self.path, git_svn=True), MockTime, LoggerCapture():
+            self.assertTrue(local.Git(self.path).is_git)
+            self.assertTrue(local.Git(self.path).is_svn)
+
+    def test_info(self):
+        with mocks.local.Git(self.path), MockTime, LoggerCapture():
+            with self.assertRaises(local.Git.Exception):
+                self.assertEqual(dict(), local.Git(self.path).info())
+
+        with mocks.local.Git(self.path, git_svn=True), MockTime, LoggerCapture():
+            self.assertEqual(
+                {
+                    'Path': '.',
+                    'Repository Root': 'git@webkit.org:/mock/repository',
+                    'URL': 'git@webkit.org:/mock/repository/main',
+                }, local.Git(self.path).info(),
+            )

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

@@ -67 +67 @@
         with mocks.local.Svn(self.path):
             self.assertEqual(local.Svn(self.path).default_branch, 'trunk')
+
+    def test_scm_type(self):
+        with mocks.local.Svn(self.path):
+            self.assertTrue(local.Svn(self.path).is_svn)
+            self.assertFalse(local.Svn(self.path).is_git)