1984467 - `moz-phab uplift` always uses `origin` as the remote when determining remote branch

Status: RESOLVED FIXED

(Conduit :: moz-phab, defect, P3)

Description

[Connor Sheehan [:sheehan]]

When determining the remote branch to use for uplift revisions, moz-phab assumes the appropriate remote is named origin.

Comment 1

[Connor Sheehan [:sheehan]]

Attachment: git: use `get_base_remotes` when building repo branch head (Bug 1984467) r?shtrom,mhodson

Currently we hard-code origin as the remote name when finding
a remote branch to use as the uplift target to rebase patches
onto. Instead use the result of get_base_remotes to build
the remote branches. The messaging in get_base_remotes will
inform the user of multiple remotes being available and suggest
the git_remote config option to enforce a specific remote in
the event we select the wrong remote branch. Update wording in
one log message to remove references to finding a base commit,
as that was the single usage of this method previously. Also
update tests to show the expected behaviour change after this
patch.

update test_integration_git

Comment 2

[BMO Github Automation]

Authored by https://github.com/cgsheeh
https://github.com/mozilla-conduit/review/commit/b5f966ed20e42dee399dbf5101be5438234d9741
[main] git: use get_base_remotes when building repo branch head (Bug 1984467) r=shtrom,mhodson