`Git.map_callsign_to_unified_head` assumes a Mercurial-bookmark style remote branch
Categories
(Conduit :: moz-phab, defect, P3)
Tracking
(Not tracked)
People
(Reporter: sheehan, Assigned: sheehan)
References
Details
Attachments
(2 files)
|
48 bytes,
text/x-phabricator-request
|
Details | Review | |
|
git: account for non-cinnabar branches in `map_callsign_to_unified_head` (Bug 1960991) r?shtrom,zeid
48 bytes,
text/x-phabricator-request
|
Details | Review |
During moz-phab uplift, moz-phab will try and find a "unified head" for rebasing patches onto before submission. The template used assumes the repo is a git-cinnabar clone, with Mercurial style bookmarks as the remote branch names.
We will need to update this for use with the new Git repo. We can check is_cinnabar_required to ensure we use the correct template.
|
Assignee | |
Comment 1•7 months ago
|
||
Long ago we changed the --train parameter to take the repo short name
instead of the callsign, since the callsigns cannot include numbers and
esr123 became the displeasing ESRONETWOEIGHT. This function was not
updated to reflect that, so we rename it to be more accurate now.
|
||
Updated•7 months ago
|
|
|
Assignee | |
Comment 2•7 months ago
|
||
After the Git migration, the unified head remote branches will not
include the /bookmarks/ namespace, since that is a Git-Cinnabar
implementation detail. Use the standard remote/origin/{branch}
naming instead.
|
||
Comment 3•7 months ago
|
||
Authored by https://github.com/cgsheeh
https://github.com/mozilla-conduit/review/commit/7fda3c5181ebc807a48c1c05ce9d73a1270c8ddc
[main] git: account for non-cinnabar branches in map_callsign_to_unified_head (Bug 1960991) r=shtrom
Authored by https://github.com/cgsheeh
https://github.com/mozilla-conduit/review/commit/58a4a3f07e1966aba35548e8fd13da59d6c5cc07
[main] scm: rename map_callsign_to_unified_head to map_shortname_to_unified_head (Bug 1960991) r=shtrom
Description
•