Closed Bug 1757076 Opened 4 months ago Closed 4 months ago

`moz-phab uplift` should avoid rebase if commits are already a descendant of the destination

Categories

(Conduit :: moz-phab, task)

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: sheehan, Assigned: sheehan)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Essentially, we should avoid rebase if our changes are already based off of the destination.

Adds a check to see if the repo revset is a descendant of the
unified head on which the rebase would apply. In the Mercurial
case we query the log to check if the submit revset is descendant
from the unified head. For Git we use the merge-base plumbing
command and the --is-ancestor argument, as this is the inverse
of finding a descendant.

Since we are adding logic that changes the repo amending conditions
we take this time to clarify that logic, moving everything into a
standalone function that returns a boolean indicating if the later
submit actions should make local amendments to the revset after
submission.

Status: NEW → RESOLVED
Closed: 4 months ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.