This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10269

rebase: when using --keep, don't care about pruned commits or divergence
ClosedPublic

Authored by martinvonz on Mar 25 2021, 6:23 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd9601243b73c: rebase: when using --keep, don't care about pruned commits or divergence
Summary

hg rebase --keep creates duplicate commits (not successors), so I
was surprised that it still skips pruned commits and errors out if it
"would cause divergence" (it wouldn't). I guess this was just an
oversight. We didn't have any tests for it, so I also included 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.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)
Mtests/test-rebase-obsolete2.t (22 lines)

Diff 26712

hgext/rebase.py

b'computed skipped revs: %s\n' b'computed skipped revs: %s\n'
% (b' '.join(b'%d' % r for r in sorted(skipped)) or b'') % (b' '.join(b'%d' % r for r in sorted(skipped)) or b'')
) )
return data return data
def _handleskippingobsolete(self): def _handleskippingobsolete(self):
"""Compute structures necessary for skipping obsolete revisions""" """Compute structures necessary for skipping obsolete revisions"""
if self.keepf:
return
if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'):
return return
obsoleteset = {r for r in self.state if self.repo[r].obsolete()} obsoleteset = {r for r in self.state if self.repo[r].obsolete()}
( (
self.obsolete_with_successor_in_destination, self.obsolete_with_successor_in_destination,
self.obsolete_with_successor_in_rebase_set, self.obsolete_with_successor_in_rebase_set,
) = _compute_obsolete_sets(self.repo, obsoleteset, self.destmap) ) = _compute_obsolete_sets(self.repo, obsoleteset, self.destmap)
skippedset = set(self.obsolete_with_successor_in_destination) skippedset = set(self.obsolete_with_successor_in_destination)

tests/test-rebase-obsolete2.t

$ hg resolve --mark willconflict $ hg resolve --mark willconflict
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 19:b82fb57ea638 "willconflict second version" rebasing 19:b82fb57ea638 "willconflict second version"
note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor" note: not rebasing 20:8b31da3c4919 "dummy change", already in destination as 18:601db7a18f51 "dummy change successor"
rebasing 21:7bdc8a87673d tip "dummy change" rebasing 21:7bdc8a87673d tip "dummy change"
$ cd .. $ cd ..
Can rebase pruned and rewritten commits with --keep
$ hg init keep
$ cd keep
$ hg debugdrawdag <<'EOS'
> D
> |
> C
> |
> F B E # prune: B
> \|/ # rebase: C -> E
> A
> EOS
1 new orphan changesets
$ hg rebase -b D -d F --keep
rebasing 1:112478962961 B "B"
rebasing 4:26805aba1e60 C "C"
rebasing 5:f585351a92f8 D tip "D"
$ cd ..