tor-browser

commit b9993390798f9df1e50e4025e012995452331478
parent 52b6555bad06cdf42125b7d3936bf839132ec641
Author: Michael Froman <mfroman@mozilla.com>
Date:   Fri, 19 Dec 2025 18:35:39 +0000

Bug 2006947 - refer to repos as Mozilla and libwebrtc rather than mercurial and git for clarity. r=dbaker DONTBUILD

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

Diffstat:
M
dom/media/webrtc/third_party_build/cherry_pick_commit.py
 | 
38
+++++++++++++++++++++-----------------

1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/dom/media/webrtc/third_party_build/cherry_pick_commit.py b/dom/media/webrtc/third_party_build/cherry_pick_commit.py
@@ -248,12 +248,12 @@ if __name__ == "__main__":
         else:
             run_hg("hg revert --all")
             run_hg(f"hg purge {args.target_path}")
-        # If the resume_state is not resume2 or resume3 that means we may
-        # have committed something to mercurial.  First we need to check
-        # for our cherry-pick commit message, and if found, remove
-        # that commit.
+        # If the resume_state is not resume2 or resume3 that means we
+        # may have committed something to the Mozilla repo.  First we
+        # need to check for our cherry-pick commit message, and if
+        # found, remove that commit.
         if resume_state not in ("resume2", "resume3"):
-            # check for committed mercurial patch and backout
+            # check for committed patch and backout
             if repo_type == RepoType.GIT:
                 stdout_lines = run_git("git show --oneline --no-patch", ".")
             else:
@@ -290,7 +290,8 @@ if __name__ == "__main__":
         atexit.unregister(early_exit_handler)
         sys.exit(0)
 
-    # make sure the relevant bits of the mercurial repo is clean before beginning
+    # make sure the relevant bits of the Mozilla repo are clean before
+    # beginning
     error_help.set_help(
         f"There are modified or untracked files under {args.target_path}.\n"
         f"Please cleanup the repo under {args.target_path} before running {script_name}"
@@ -387,7 +388,7 @@ if __name__ == "__main__":
         print("-------")
         error_help.set_help(
             f"Vendoring the newly cherry-picked git commit ({args.commit_sha}) has failed.\n"
-            "The mercurial repo is in an unknown state.  This failure is\n"
+            "The Mozilla repo is in an unknown state.  This failure is\n"
             "rare and thus makes it difficult to provide definitive guidance.\n"
             "In essence, the current failing command is:\n"
             f"./mach python {args.script_path}/vendor_and_commit.py \\\n"
@@ -451,30 +452,33 @@ if __name__ == "__main__":
         resume_state = ""
         update_resume_state("resume8", resume_state_filename)
         # get the files changed from the newly vendored cherry-pick
-        # commit in mercurial
+        # commit in the Mozilla repo
         if repo_type == RepoType.GIT:
             cmd = "git show --format='' --name-status | grep -v 'README.'"
         else:
             cmd = "hg status --change tip --exclude '**/README.*'"
         stdout_lines = run_shell(cmd)  # run_shell to allow file wildcard
-        print(f"Mercurial changes:\n{stdout_lines}")
-        hg_file_change_cnt = len(stdout_lines)
+        print(f"Mozilla repo changes:\n{stdout_lines}")
+        mozilla_file_change_cnt = len(stdout_lines)
 
         # get the files changed from the original cherry-picked patch in
-        # our github repo (moz-libwebrtc)
-        git_paths_changed = filter_git_changes(args.repo_path, args.commit_sha, None)
-        print(f"github changes:\n{git_paths_changed}")
-        git_file_change_cnt = len(git_paths_changed)
+        # the libwebrtc github repo
+        libwebrtc_paths_changed = filter_git_changes(
+            args.repo_path, args.commit_sha, None
+        )
+        print(f"Libwebrtc repo changes:\n{libwebrtc_paths_changed}")
+        libwebrtc_file_change_cnt = len(libwebrtc_paths_changed)
 
         error_help.set_help(
             f"Vendoring the cherry-pick of commit {args.commit_sha} has failed due to mismatched\n"
-            f"changed file counts between mercurial ({hg_file_change_cnt}) and git ({git_file_change_cnt}).\n"
+            f"changed file counts between the Mozilla repo ({mozilla_file_change_cnt}) "
+            f"and the libwebrtc repo ({libwebrtc_file_change_cnt}).\n"
             "This may be because the mozilla patch-stack was not verified after\n"
             "running restore_patch_stack.py.  After reconciling the changes in\n"
-            f"the newly committed mercurial patch, please re-run {script_name} to complete\n"
+            f"the newly committed patch, please re-run {script_name} to complete\n"
             "the cherry-pick processing."
         )
-        if hg_file_change_cnt != git_file_change_cnt:
+        if mozilla_file_change_cnt != libwebrtc_file_change_cnt:
             sys.exit(1)
         error_help.set_help(None)