This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7664

rebase: make rebase not crash if p1 == p2 != nullid
ClosedPublic

Authored by spectral on Dec 13 2019, 6:57 PM.

Details

Reviewers
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc6feee1e4d5b: rebase: make rebase not crash if p1 == p2 != nullid
Summary

While this shouldn't happen normally, some historical bugs can have caused this
kind of commit to exist. Instead of crashing and having it be unobvious how to
recover, let's try to continue on. Without this, we get an error like
"ValueError: min() arg is an empty sequence"

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Dec 13 2019, 6:57 PM
martinvonz accepted this revision.Dec 13 2019, 7:03 PM

I think "historical" here means "before D7549.

This revision is now accepted and ready to land.Dec 13 2019, 7:03 PM
pulkit accepted this revision.Dec 16 2019, 12:40 AM
spectral added a commit: rHGc6feee1e4d5b: rebase: make rebase not crash if p1 == p2 != nullid.Dec 16 2019, 1:30 AM
Closed by commit rHGc6feee1e4d5b: rebase: make rebase not crash if p1 == p2 != nullid (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 18743

hgext/rebase.py

# | | # as merge base, the difference between D and F will include # | | # as merge base, the difference between D and F will include
# B C # C, so the rebased F will contain C surprisingly. If "E" was # B C # C, so the rebased F will contain C surprisingly. If "E" was
# |/ # chosen, the rebased F will contain B. # |/ # chosen, the rebased F will contain B.
# A Z # A Z
# #
# But our merge base candidates (D and E in above case) could still be # But our merge base candidates (D and E in above case) could still be
# better than the default (ancestor(F, Z) == null). Therefore still # better than the default (ancestor(F, Z) == null). Therefore still
# pick one (so choose p1 above). # pick one (so choose p1 above).
if sum(1 for b in bases if b != nullrev) > 1: if sum(1 for b in set(bases) if b != nullrev) > 1:
unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i] unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i]
for i, base in enumerate(bases): for i, base in enumerate(bases):
if base == nullrev: if base == nullrev:
continue continue
# Revisions in the side (not chosen as merge base) branch that # Revisions in the side (not chosen as merge base) branch that
# might contain "surprising" contents # might contain "surprising" contents
siderevs = list( siderevs = list(
repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest) repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest)