Title: [270941] trunk/Tools
Revision
270941
Author
[email protected]
Date
2020-12-17 12:30:51 -0800 (Thu, 17 Dec 2020)

Log Message

[webkitscmpy] Remove branches argument from mock Git
https://bugs.webkit.org/show_bug.cgi?id=219988
<rdar://problem/72434657>

Reviewed by Dewei Zhu.

* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
(Git.__init__): Remote branches argument.
* Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
(TestGit.test_branches):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (270940 => 270941)


--- trunk/Tools/ChangeLog	2020-12-17 20:30:28 UTC (rev 270940)
+++ trunk/Tools/ChangeLog	2020-12-17 20:30:51 UTC (rev 270941)
@@ -1,3 +1,17 @@
+2020-12-17  Jonathan Bedard  <[email protected]>
+
+        [webkitscmpy] Remove branches argument from mock Git
+        https://bugs.webkit.org/show_bug.cgi?id=219988
+        <rdar://problem/72434657>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Bump version.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py:
+        (Git.__init__): Remote branches argument.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:
+        (TestGit.test_branches):
+
 2020-12-17  Zan Dobersek  <[email protected]>
 
         Unreviewed, reordering associated email addresses in

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (270940 => 270941)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2020-12-17 20:30:28 UTC (rev 270940)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	2020-12-17 20:30:51 UTC (rev 270941)
@@ -46,7 +46,7 @@
         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
     )
 
-version = Version(0, 6, 1)
+version = Version(0, 6, 2)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py (270940 => 270941)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py	2020-12-17 20:30:28 UTC (rev 270940)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py	2020-12-17 20:30:51 UTC (rev 270941)
@@ -33,7 +33,7 @@
 
     def __init__(
         self, path='/.invalid-git', datafile=None,
-        remote=None, branches=None, tags=None,
+        remote=None, tags=None,
         detached=None, default_branch='main',
         git_svn=False,
     ):
@@ -42,7 +42,6 @@
         self.remote = remote or '[email protected]:/mock/{}'.format(os.path.basename(path))
         self.detached = detached or False
 
-        self.branches = branches or []
         self.tags = tags or {}
 
         try:
@@ -156,7 +155,7 @@
                 cwd=self.path,
                 generator=lambda *args, **kwargs: mocks.ProcessCompletion(
                     returncode=0,
-                    stdout='\n'.join(sorted(['* ' + self.branch] + list(({default_branch} | set(self.commits.keys()) | set(self.branches)) - {self.branch}))) +
+                    stdout='\n'.join(sorted(['* ' + self.branch] + list(({default_branch} | set(self.commits.keys())) - {self.branch}))) +
                            '\nremotes/origin/HEAD -> origin/{}\n'.format(default_branch),
                 ),
             ), mocks.Subprocess.Route(
@@ -312,5 +311,5 @@
         commit = self.find(something)
         if commit:
             self.head = commit
-            self.detached = something not in self.branches
+            self.detached = something not in self.commits.keys()
         return True if commit else False

Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py (270940 => 270941)


--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py	2020-12-17 20:30:28 UTC (rev 270940)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py	2020-12-17 20:30:51 UTC (rev 270941)
@@ -56,10 +56,10 @@
             self.assertEqual(local.Git(self.path).remote(), repo.remote)
 
     def test_branches(self):
-        with mocks.local.Git(self.path, branches=('remotes/origin/branch-3',)):
+        with mocks.local.Git(self.path):
             self.assertEqual(
                 local.Git(self.path).branches,
-                ['branch-3', 'branch-a', 'branch-b', 'main'],
+                ['branch-a', 'branch-b', 'main'],
             )
 
     def test_tags(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to