Source code
Revision control
Copy as Markdown
Other Tools
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# This script identifies which commits on a libwebrtc branch-head are missing
# from a given Firefox branch. It uses show_branch_head_commits.py to list
# the upstream branch-head commits and then checks whether each one has been
# vendored into Firefox.
#
# A commit is considered present in Firefox if any of the following apply:
# - its full SHA appears in the "Upstream commit:" footer of a vendor commit
# - its full SHA appears in a "(cherry picked from commit ...)" line
# - its subject (after stripping the [MXXX] milestone prefix) is found as a
# substring in any commit touching third_party/libwebrtc, catching manual
# backports that don't use the standard vendoring format
#
# If --milestone is not provided, the script reads MOZ_NEXT_LIBWEBRTC_MILESTONE
# from default_config_env on the given Firefox branch.
import argparse
import re
import subprocess
import sys
from run_operations import run_git
from show_branch_head_commits import default_repo_dir, get_branch_head_commits
CHERRY_PICK_RE = re.compile(r"\(cherry picked from commit ([0-9a-f]+)\)")
BRACKET_PREFIXES_RE = re.compile(r"^(\[[^\]]*\]\s*)+")
def get_vendored_upstream_shas(firefox_path, firefox_branch):
lines = run_git(
f"git log --format=%b {firefox_branch} -- third_party/libwebrtc", firefox_path
)
shas = set()
for line in lines:
if line.startswith(UPSTREAM_COMMIT_PREFIX):
shas.add(line[len(UPSTREAM_COMMIT_PREFIX) :])
else:
m = CHERRY_PICK_RE.search(line)
if m:
shas.add(m.group(1))
return shas
def get_firefox_commit_text(firefox_path, firefox_branch):
return set(
run_git(
f"git log --format=%s%n%b {firefox_branch} -- third_party/libwebrtc",
firefox_path,
)
)
def is_subject_in_firefox(subject, ff_text):
stripped = BRACKET_PREFIXES_RE.sub("", subject).strip()
if not stripped:
return False
return any(stripped in line for line in ff_text)
def get_firefox_version(firefox_path, firefox_branch):
res = subprocess.run(
["git", "show", f"{firefox_branch}:browser/config/version.txt"],
capture_output=True,
text=True,
cwd=firefox_path,
check=False,
)
if res.returncode != 0:
return None
return res.stdout.strip() or None
def get_default_milestone(firefox_path, firefox_branch):
# run_git calls sys.exit on failure; use subprocess directly so we can
# handle the case where firefox_branch doesn't have default_config_env
res = subprocess.run(
[
"git",
"show",
f"{firefox_branch}:dom/media/webrtc/third_party_build/default_config_env",
],
capture_output=True,
text=True,
cwd=firefox_path,
check=False,
)
if res.returncode != 0:
return None
for line in res.stdout.splitlines():
if "MOZ_NEXT_LIBWEBRTC_MILESTONE=" in line and not line.strip().startswith("#"):
return int(line.split("=")[-1].strip())
return None
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description="Identify branch-head commits for a libwebrtc milestone missing from Firefox"
)
parser.add_argument(
"firefox_branch",
help="Firefox branch to check for vendored commits (example: origin/beta)",
)
parser.add_argument(
"--milestone",
type=int,
default=None,
help="integer chromium milestone (example: 106)",
)
parser.add_argument(
"--repo-path",
default=default_repo_dir,
help=f"path to moz-libwebrtc repo (defaults to {default_repo_dir})",
)
parser.add_argument(
"--firefox-path",
default=".",
help="path to Firefox repo (defaults to .)",
)
args = parser.parse_args()
# try to detect the milestone using info from the libwebrtc update
# in dom/media/webrtc/third_party_build/default_config_env
if args.milestone is None:
args.milestone = get_default_milestone(args.firefox_path, args.firefox_branch)
if args.milestone is None:
sys.exit(
f"error: unable to determine milestone from {args.firefox_branch}; "
"please provide --milestone"
)
# grab the branch-head commit for the milestone
branch_head, full_shas, oneline_commits, upstream_subjects = (
get_branch_head_commits(args.repo_path, args.milestone)
)
firefox_version = get_firefox_version(args.firefox_path, args.firefox_branch)
version_str = f" ({firefox_version})" if firefox_version else ""
print(f"Firefox branch: {args.firefox_branch}{version_str}")
print(f"chromium milestone {args.milestone} uses {branch_head}")
if not oneline_commits:
print(f"no branch-specific commits found on {branch_head}")
sys.exit(0)
print(f"\n{len(oneline_commits)} commit(s) on {branch_head}:")
for commit in oneline_commits:
print(commit)
vendored = get_vendored_upstream_shas(args.firefox_path, args.firefox_branch)
ff_text = get_firefox_commit_text(args.firefox_path, args.firefox_branch)
# look for vendored shas, and if not found there, check for the
# subject in the commit messages from third_party/libwebrtc as a
# last ditch tactic since some branch-head cherry-picks
# accidentally. leave out the commit sha they are cherry-picking.
missing = [
line
for sha, line, subject in zip(full_shas, oneline_commits, upstream_subjects)
if sha not in vendored and not is_subject_in_firefox(subject, ff_text)
]
if not missing:
print(f"\nall {len(oneline_commits)} commit(s) already vendored into Firefox")
else:
print(f"\n{len(missing)} commit(s) missing from Firefox:")
for commit in missing:
print(commit)