This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2301

rebase: sort roots by revision
ClosedPublic

Authored by durin42 on Feb 18 2018, 12:35 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG53be14874ee8: rebase: sort roots by revision
Summary

Previously we were sorting them by whatever implicit sort order we got
between changectx instances. Sorting by rev at least makes some sense,
so I chose that.

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

durin42 created this revision.Feb 18 2018, 12:35 AM
pulkit accepted this revision.Feb 18 2018, 6:46 AM
Closed by commit rHG53be14874ee8: rebase: sort roots by revision (authored by durin42). · Explain WhyFeb 18 2018, 7:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (4 lines)

Diff 5838

hgext/rebase.py

# Only check the first batch of revisions to rebase not depending on other # Only check the first batch of revisions to rebase not depending on other
# rebaseset. This means "source is ancestor of destination" for the second # rebaseset. This means "source is ancestor of destination" for the second
# (and following) batches of revisions are not checked here. We rely on # (and following) batches of revisions are not checked here. We rely on
# "defineparents" to do that check. # "defineparents" to do that check.
roots = list(repo.set('roots(%ld)', sortedsrc[0])) roots = list(repo.set('roots(%ld)', sortedsrc[0]))
if not roots: if not roots:
raise error.Abort(_('no matching revisions')) raise error.Abort(_('no matching revisions'))
roots.sort() def revof(r):
return r.rev()
roots = sorted(roots, key=revof)
state = dict.fromkeys(rebaseset, revtodo) state = dict.fromkeys(rebaseset, revtodo)
emptyrebase = (len(sortedsrc) == 1) emptyrebase = (len(sortedsrc) == 1)
for root in roots: for root in roots:
dest = repo[destmap[root.rev()]] dest = repo[destmap[root.rev()]]
commonbase = root.ancestor(dest) commonbase = root.ancestor(dest)
if commonbase == root: if commonbase == root:
raise error.Abort(_('source is ancestor of destination')) raise error.Abort(_('source is ancestor of destination'))
if commonbase == dest: if commonbase == dest: