tor-browser

commit a6420cd0f2e2ac2cb3936808128ccd0812745a2f
parent 1947044d41ed068bc13434a042b07ecc6580ad7c
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date:   Wed, 31 Dec 2025 12:46:58 +0000

Bug 2008043 - Fix base ref computation. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D277666

Diffstat:
M
python/mozversioncontrol/mozversioncontrol/repo/git.py
 | 
8
+++-----
M
python/mozversioncontrol/test/test_get_mozilla_remote_args.py
 | 
8
++++----

2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/python/mozversioncontrol/mozversioncontrol/repo/git.py b/python/mozversioncontrol/mozversioncontrol/repo/git.py
@@ -130,13 +130,11 @@ class GitRepository(Repository):
                 yield name
 
     def get_mozilla_remote_args(self) -> list[str]:
-        """Return a list of `--remotes` arguments to limit commits to official remotes."""
-        official_remotes = [
-            f"--remotes={remote}" for remote in self.get_mozilla_upstream_remotes()
+        """Return a list of arguments to limit commits to official remotes."""
+        return [remote for remote in self.get_mozilla_upstream_remotes()] or [
+            "--remotes"
         ]
 
-        return official_remotes if official_remotes else ["--remotes"]
-
     @property
     def base_ref(self):
         remote_args = self.get_mozilla_remote_args()
diff --git a/python/mozversioncontrol/test/test_get_mozilla_remote_args.py b/python/mozversioncontrol/test/test_get_mozilla_remote_args.py
@@ -30,12 +30,12 @@ STEPS = {
         (
             True,
             [
-                "--remotes=central",
-                "--remotes=firefox",
-                "--remotes=unified",
+                "central",
+                "firefox",
+                "unified",
             ],
         ),
-        (False, ["--remotes=firefox"]),
+        (False, ["firefox"]),
     ),
 )
 def test_get_mozilla_remote_args(is_cinnabar, expected_remotes, repo):