Use "branch" instead of "revision" with MercurialVCS

RESOLVED FIXED

Status

RESOLVED FIXED
2 years ago
2 years ago

People

(Reporter: gps, Assigned: gps)

Tracking

unspecified
Dependency tree / graph

Firefox Tracking Flags

(firefox49 fixed)

Details

Attachments

(1 attachment)

(Assignee)

Description

2 years ago
I think I found some potential bustage as a result of what landed in bug 1270317. Should be easy to fix on its own. Fortunately, I think it only impacts single locale jobs.
(Assignee)

Updated

2 years ago
Assignee: nobody → gps
Status: NEW → ASSIGNED
(Assignee)

Comment 1

2 years ago
Created attachment 8754130 [details]
MozReview Request: Bug 1274092 - Use "branch" instead of "revision" with hg tool; r?jlund

The new tool has different behavior for "revision" and "branch:" if
you pass a name to "revision" and it already resolves, it won't
attempt a pull because it thinks it already has the revision. That
would be bad.

So convert consumers using the "hg" tool to pass "branch" when
using symbol names.

Review commit: https://reviewboard.mozilla.org/r/53762/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/53762/
Attachment #8754130 - Flags: review?(jlund)
Attachment #8754130 - Flags: review?(jlund) → review+
Comment on attachment 8754130 [details]
MozReview Request: Bug 1274092 - Use "branch" instead of "revision" with hg tool; r?jlund

https://reviewboard.mozilla.org/r/53762/#review50478

oh, nice catch.

I'm just poking around. I noticed we pass a --tag-override for at least some release jobs:
* https://dxr.mozilla.org/build-central/search?q=tag-override&case=true&=build-central&redirect=true
* * https://dxr.mozilla.org/mozilla-central/search?q=tag-override&=mozilla-central&redirect=true

on a glance, it looks like it sets/overrides vcs_config["revision"]: https://dxr.mozilla.org/build-central/source/mozharness/mozharness/base/vcs/vcsbase.py#106

this I suppose would be bad since we check for presence of "revision" before "branch"?: https://hg.mozilla.org/integration/fx-team/rev/7ca64e0cf6f1250637f659781a782fa9bedc8224#l1.260
(Assignee)

Comment 3

2 years ago
https://reviewboard.mozilla.org/r/53762/#review50478

And a good catch on your part!

It looks like I may have planted some time bombs in the code. Fortunately, we should have several weeks to get things in a happy state. I'll work on finishing the port away from hgtool tomorrow and on improving `robustcheckout` to check for and reject symbolic names in `--revision`.
(Assignee)

Comment 4

2 years ago
https://hg.mozilla.org/integration/fx-team/rev/370cc2de9b99588532be789e816a0fafb1e58b29
Bug 1274092 - Use "branch" instead of "revision" with hg tool; r=jlund

Comment 5

2 years ago
bugherder
https://hg.mozilla.org/mozilla-central/rev/370cc2de9b99
Status: ASSIGNED → RESOLVED
Last Resolved: 2 years ago
status-firefox49: --- → fixed
Resolution: --- → FIXED
re-opening to track https://bugzilla.mozilla.org/show_bug.cgi?id=1275623#c4
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
(Assignee)

Comment 7

2 years ago
Since a commit already landed on central, I'll file a follow-up to fix remaining occurrences.
Status: REOPENED → RESOLVED
Last Resolved: 2 years ago2 years ago
Resolution: --- → FIXED
(Assignee)

Updated

2 years ago
Blocks: 1275783
You need to log in before you can comment on or make changes to this bug.