tor-browser

commit 873f0c549816f98ff1a2603d735fdf48e57313af
parent 718b5e8f6fc406bdbfd2bed4cffee13bc703c348
Author: Atila Butkovits <abutkovits@mozilla.com>
Date:   Fri,  2 Jan 2026 21:50:03 +0200

Revert "Bug 2008043 - Fix base ref computation. r=glandium" for causing issues when trying to push to try.

This reverts commit a6420cd0f2e2ac2cb3936808128ccd0812745a2f.

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

2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/python/mozversioncontrol/mozversioncontrol/repo/git.py b/python/mozversioncontrol/mozversioncontrol/repo/git.py
@@ -130,11 +130,13 @@ class GitRepository(Repository):
                 yield name
 
     def get_mozilla_remote_args(self) -> list[str]:
-        """Return a list of arguments to limit commits to official remotes."""
-        return [remote for remote in self.get_mozilla_upstream_remotes()] or [
-            "--remotes"
+        """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 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,
             [
-                "central",
-                "firefox",
-                "unified",
+                "--remotes=central",
+                "--remotes=firefox",
+                "--remotes=unified",
             ],
         ),
-        (False, ["firefox"]),
+        (False, ["--remotes=firefox"]),
     ),
 )
 def test_get_mozilla_remote_args(is_cinnabar, expected_remotes, repo):