1914206 - Make cherry_pick_commit.py work when there is no state dir

Status: RESOLVED FIXED

(Core :: WebRTC, task)

Description

[Andreas Pehrson [:pehrsons]]

Currently I get this error:

apehrson@apehrson-42624 mozilla-central % ./mach python dom/media/webrtc/third_party_build/cherry_pick_commit.py -- --commit-sha d4a6c3f76fc3b187115d1cd65f4d1fffd7bebb7c --commit-bug-number 1914196 --reviewers #webrtc-reviewers
resume_state: ''
Traceback (most recent call last):
  File "/Users/apehrson/Dev/mozilla-central/dom/media/webrtc/third_party_build/cherry_pick_commit.py", line 278, in <module>
    update_resume_state("resume2", resume_state_filename)
  File "/Users/apehrson/Dev/mozilla-central/./dom/media/webrtc/third_party_build/run_operations.py", line 95, in update_resume_state
    with open(resume_state_filename, "w") as ofile:
FileNotFoundError: [Errno 2] No such file or directory: '.moz-fast-forward/cherry_pick_commit.resume'

Let's try to fix this.

Comment 1

[Andreas Pehrson [:pehrsons]]

Attachment: Bug 1914206 - In cherry_pick_commit.py only care about modified files in third_party/libwebrtc. r?mjf!

This matches what restore_patch_stack.py checks for.

Comment 2

[Andreas Pehrson [:pehrsons]]

Attachment: Bug 1914206 - In cherry_pick_commit.py don't write to the resume file until after restoring the patch stack. r?mjf!

The state dir may not exist yet, but restore_patch_stack will create it.
Also, if the state is written first but restore_patch_stack fails for some
reason, resuming will not work.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2fe815951f5c
In cherry_pick_commit.py only care about modified files in third_party/libwebrtc. r=mjf DONTBUILD
https://hg.mozilla.org/integration/autoland/rev/3b127bc8b9bb
In cherry_pick_commit.py don't write to the resume file until after restoring the patch stack. r=mjf DONTBUILD

Comment 4

[Serban Stanca [:SerbanS]]

https://hg.mozilla.org/mozilla-central/rev/2fe815951f5c
https://hg.mozilla.org/mozilla-central/rev/3b127bc8b9bb