1800924 - Update prep_repo.sh to handle stacking libwebrtc branch commits

Status: RESOLVED FIXED

(Core :: WebRTC, task, P2)

Description

[Michael Froman [:mjf]]

The current script doesn't properly handle setting up the repro with the commits that only exist in the branch that a particular Chromium release uses.

From here we see that Chromium v105 used branch 5195. Branch 5195 is a fairly simple case. This only one additional commit in this branch:

42be4ae879 (branch-heads/5195) Limit input size for the rtp video layers allocation fuzzer

The first common commit between trunk and 5195 is:

dc5cf31cad Roll chromium_revision 17f3d023e1..abe412afe7 (1026586:1026730)

A more extensive example is from v104, which used branch 5112. There are several commits in this branch:

06aea31d10 (HEAD, branch-heads/5112) [Merge-104] Disallow invalid arguments in RestoreEncodingLayers.
2ce9e01b8d [merge to M104] sdp: temporarily relax channel requirements for statically assigned payload types
701c8ff957 [merge to M104] sdp: temporarily relax clockrate requirements for statically assigned payload types
7e74f2bc3f [merge to M104] pc: make codec comparison for static codecs case-insensitive
56b208761d [M104] Do not allow simulcast to be turned off using SDP munging
e836f5fe1a [Merge-104] Remove excessive log spam from receiver.getParameters().024e1316f9 Fix clearing of mouse cursor if display uses a scale factor
e083ccc076 [Merge to M104] Fix issue with pacing rate after long queue times.

The first common commit between trunk and 5112 is:

a976a87115 Download Fuchsia SDK

The prep_repo.sh script should properly pre-stack the previous branch's non-trunk commits under the Mozilla patch set so that as the fast-foward process moves forward, those branch commits (generally cherry-picks of upcoming trunk commits) will be absorbed as the trunk commits are encountered.

Comment 1

[Michael Froman [:mjf]]

Attachment: Bug 1800924 - pt1 - add new variable and example data for v106 fast-forward to example_config_env. r?dbaker!

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1800924 - pt2 - handle pre-stacking release branch commits when prepping moz-libwebrtc repo. r?dbaker!

Depends on D162612

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2ffeee9b69cd
pt1 - add new variable and example data for v106 fast-forward to example_config_env. r=dbaker DONTBUILD
https://hg.mozilla.org/integration/autoland/rev/aa926b177533
pt2 - handle pre-stacking release branch commits when prepping moz-libwebrtc repo. r=dbaker DONTBUILD

Comment 4

[Natalia Csoregi [:nataliaCs]]

https://hg.mozilla.org/mozilla-central/rev/2ffeee9b69cd
https://hg.mozilla.org/mozilla-central/rev/aa926b177533