1828731 - `moz-phab submit` should not overwrite the existing repo for the patch

Status: RESOLVED FIXED

(Conduit :: moz-phab, task)

Description

[Connor Sheehan [:sheehan]]

In https://phabricator.services.mozilla.com/D174893 the patch was approved and attempted to land, but a merge conflict was found. The original author fixed the merge conflict locally and re-submitted, but used moz-phab submit instead of moz-phab uplift --train.

This requirement of using moz-phab uplift --train to re-submit uplifts is likely a footgun that others will run into. moz-phab submit should detect a re-submission and ensure the callsign of the repo remains the same on re-submission.

Comment 1

[Daniel Holbert [:dholbert]]

(In reply to Connor Sheehan [:sheehan] from comment #0)

This requirement of using moz-phab uplift --train to re-submit uplifts is likely a footgun that others will run into.

Indeed, I fired this footgun over in bug 1861259.

Comment 2

[Mathew Hodson]

Attachment: submit: use repo from existing revision when updating diffs (Bug 1828731) r=sheehan

This allows you to run moz-phab submit to update a revision that
was already created on a uplift repo. Previously if you did that,
the revision would be updated to the wrong repo.

You can now use moz-phab uplift on an uplifted commit from beta
to create a new revision for release. As long as the --train
parameter is different from the previous uplift repo, a new
revision will be created.

Comment 3

[Mathew Hodson]

This is ready to be reviewed now.

Comment 4

[Connor Sheehan [:sheehan]]

(In reply to Mathew Hodson from comment #3)

This is ready to be reviewed now.

I replied on the patch.

Comment 5

[Mathew Hodson]

Attachment: submit: fix circular import for Diff (Bug 1828731) r=sheehan