[git-webkit] De-duplicate personal forks

https://bugs.webkit.org/show_bug.cgi?id=250861
rdar://104444642

Reviewed by Elliott Williams.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
(Setup.git): Remove duplicate personal forks.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py:

Canonical link: https://commits.webkit.org/259222@main

Tools/Scripts/libraries/webkitscmpy/setup.py

@@ -29,7 +29,7 @@ def readme():
 
 setup(
     name='webkitscmpy',
-    version='5.11.0',
+    version='5.11.1',
     description='Library designed to interact with git and svn repositories.',
     long_description=readme(),
     classifiers=[

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

@@ -46,7 +46,7 @@ def _maybe_add_webkitcorepy_path():
         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
     )
 
-version = Version(5, 11, 0)
+version = Version(5, 11, 1)
 
 AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))

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

@@ -480,14 +480,12 @@ def git(cls, args, repository, additional_setup=None, hooks=None, **kwargs):
                 if cls.github(args, nw_rmt, remote=name, team=repository.config().get('webkitscmpy.access.{}'.format(name), None)):
                     result += 1
                     continue
-                log.info("Adding forked {remote} remote as '{username}-{remote}' and '{remote}-fork'...".format(
-                    remote=name, username=username,
-                ))
-                for fork_name in ['{}-{}'.format(username, name), '{}-fork'.format(name)]:
-                    if cls._add_remote(repository, fork_name, cls._fork_remote(repository.url(), username, '{}-{}'.format(rmt.name, name)), fetch=False):
-                        result += 1
-                    else:
-                        available_remotes.append(fork_name)
+                fork_name = '{}-fork'.format(name)
+                log.info("Adding forked {remote} remote as '{name}'...".format(remote=name, name=fork_name))
+                if cls._add_remote(repository, fork_name, cls._fork_remote(repository.url(), username, '{}-{}'.format(rmt.name, name)), fetch=False):
+                    result += 1
+                else:
+                    available_remotes.append(fork_name)
 
         else:
             warning = '''Checkout using {actual} as origin remote
@@ -506,12 +504,11 @@ def git(cls, args, repository, additional_setup=None, hooks=None, **kwargs):
         if cls.github(args, rmt, team=repository.config().get('webkitscmpy.access.origin', None), **kwargs):
             return result + 1
 
-        log.info("Adding forked remote as '{}' and 'fork'...".format(username))
-        for name in [username, 'fork']:
-            if cls._add_remote(repository, name, cls._fork_remote(repository.url(), username, rmt.name), fetch=False):
-                result += 1
-            else:
-                available_remotes.append(name)
+        log.info("Adding forked remote as 'fork'...".format(username))
+        if cls._add_remote(repository, 'fork', cls._fork_remote(repository.url(), username, rmt.name), fetch=False):
+            result += 1
+        else:
+            available_remotes.append('fork')
 
         for rem in available_remotes:
             if 'fork' not in rem:

Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/setup_unittest.py

@@ -183,8 +183,7 @@ def test_github_checkout(self):
 GitHub credentials saved via Keyring!
 Verifying user owned fork...
 Created a private fork of 'WebKit' belonging to 'username'!
-Adding forked remote as 'username' and 'fork'...
-Added remote 'username'
+Adding forked remote as 'fork'...
 Added remote 'fork'
 Fetching 'fork'
 '''.format(repository=self.path),