This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7685

rebase: use rewriteutil.precheck() instead of reimplementing it
ClosedPublic

Authored by martinvonz on Dec 17 2019, 2:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG71fee4564410: rebase: use rewriteutil.precheck() instead of reimplementing it
Summary

After this patch, there's still another place in rebase.py, in the
--stop code path, that reimplements rewriteutil.precheck(). I
couldn't fix that place because it rewriteutil.precheck() checks
that there is only one dirstate parent, which fails because we have
two parents at that point. I think it's incorrect that rebase leaves
the user with two parents during conflicts, but changing that is way
of of scope for this series.

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

martinvonz created this revision.Dec 17 2019, 2:36 PM
pulkit accepted this revision.Dec 18 2019, 1:14 AM
This revision is now accepted and ready to land.Dec 18 2019, 1:14 AM
yuja added a subscriber: yuja.Dec 18 2019, 10:11 AM
  • hint=_(b'use --keep to keep original changesets'),
  • )

+ if not self.keepf:
+ try:
+ rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
+ except error.Abort as e:
+ if e.hint is None:
+ e.hint = b'use --keep to keep original changesets'

Missed _()?

Revision Contents
Changeset List

Diff 18860

hgext/rebase.py

obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
registrar, registrar,
repair, repair,
revset, revset,
revsetlang, revsetlang,
rewriteutil,
scmutil, scmutil,
smartset, smartset,
state as statemod, state as statemod,
util, util,
) )
# The following constants are used throughout the rebase module. The ordering of # The following constants are used throughout the rebase module. The ordering of
# their values must be maintained. # their values must be maintained.
backup = backup and self.backupf backup = backup and self.backupf
return self._abort(backup=backup, suppwarns=suppwarns) return self._abort(backup=backup, suppwarns=suppwarns)
def _preparenewrebase(self, destmap): def _preparenewrebase(self, destmap):
if not destmap: if not destmap:
return _nothingtorebase() return _nothingtorebase()
rebaseset = destmap.keys() rebaseset = destmap.keys()
allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt) if not self.keepf:
if not (self.keepf or allowunstable) and self.repo.revs( try:
b'first(children(%ld) - %ld)', rebaseset, rebaseset rewriteutil.precheck(self.repo, rebaseset, action=b'rebase')
): except error.Abort as e:
raise error.Abort( if e.hint is None:
_( e.hint = b'use --keep to keep original changesets'
b"can't remove original changesets with" raise e
b" unrebased descendants"
),
hint=_(b'use --keep to keep original changesets'),
)
result = buildstate(self.repo, destmap, self.collapsef) result = buildstate(self.repo, destmap, self.collapsef)
if not result: if not result:
# Empty state built, nothing to rebase # Empty state built, nothing to rebase
self.ui.status(_(b'nothing to rebase\n')) self.ui.status(_(b'nothing to rebase\n'))
return _nothingtorebase() return _nothingtorebase()
for root in self.repo.set(b'roots(%ld)', rebaseset):
if not self.keepf and not root.mutable():
raise error.Abort(
_(b"can't rebase public changeset %s") % root,
hint=_(b"see 'hg help phases' for details"),
)
(self.originalwd, self.destmap, self.state) = result (self.originalwd, self.destmap, self.state) = result
if self.collapsef: if self.collapsef:
dests = set(self.destmap.values()) dests = set(self.destmap.values())
if len(dests) != 1: if len(dests) != 1:
raise error.Abort( raise error.Abort(
_(b'--collapse does not work with multiple destinations') _(b'--collapse does not work with multiple destinations')
) )
destrev = next(iter(dests)) destrev = next(iter(dests))

tests/test-rebase-collapse.t

@ 2: 64b456429f67 'Collapsed revision @ 2: 64b456429f67 'Collapsed revision
| * move1 | * move1
| * move2' | * move2'
o 1: 1352765a01d4 'change' o 1: 1352765a01d4 'change'
| |
o 0: f447d5abf5ea 'add' o 0: f447d5abf5ea 'add'
$ hg rebase --collapse -r 1 -d 0 $ hg rebase --collapse -r 1 -d 0
abort: can't remove original changesets with unrebased descendants abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
Test collapsing in place Test collapsing in place
$ hg rebase --collapse -b . -d 0 $ hg rebase --collapse -b . -d 0
rebasing 1:1352765a01d4 "change" rebasing 1:1352765a01d4 "change"
rebasing 2:64b456429f67 "Collapsed revision" (tip) rebasing 2:64b456429f67 "Collapsed revision" (tip)

tests/test-rebase-scenario-global.t

|/ |/
o 0: cd010b8cd998 'A' o 0: cd010b8cd998 'A'
Check rebasing public changeset Check rebasing public changeset
$ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 $ hg pull --config phases.publish=True -q -r 6 . # update phase of 6
$ hg rebase -d 0 -b 6 $ hg rebase -d 0 -b 6
nothing to rebase abort: cannot rebase public changesets
[1] (see 'hg help phases' for details)
[255]
$ hg rebase -d 5 -b 6 $ hg rebase -d 5 -b 6
abort: can't rebase public changeset e1c4361dd923 abort: cannot rebase public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]
$ hg rebase -d 5 -r '1 + (6::)' $ hg rebase -d 5 -r '1 + (6::)'
abort: can't rebase public changeset e1c4361dd923 abort: cannot rebase public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]
$ hg rebase -d 5 -b 6 --keep $ hg rebase -d 5 -b 6 --keep
rebasing 6:e1c4361dd923 "C" rebasing 6:e1c4361dd923 "C"
rebasing 7:c9659aac0000 "D" (tip) rebasing 7:c9659aac0000 "D" (tip)
Check rebasing mutable changeset Check rebasing mutable changeset
Simple case with keep: Simple case with keep:
Source on have two descendant heads but ask for one Source on have two descendant heads but ask for one
$ hg clone -q -u . ah ah1 $ hg clone -q -u . ah ah1
$ cd ah1 $ cd ah1
$ hg rebase -r '2::8' -d 1 $ hg rebase -r '2::8' -d 1
abort: can't remove original changesets with unrebased descendants abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '2::8' -d 1 -k $ hg rebase -r '2::8' -d 1 -k
rebasing 2:c9e50f6cdc55 "C" rebasing 2:c9e50f6cdc55 "C"
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 "I" (tip)
$ cd .. $ cd ..
Base on have one descendant heads we ask for but common ancestor have two Base on have one descendant heads we ask for but common ancestor have two
$ hg clone -q -u . ah ah2 $ hg clone -q -u . ah ah2
$ cd ah2 $ cd ah2
$ hg rebase -r '3::8' -d 1 $ hg rebase -r '3::8' -d 1
abort: can't remove original changesets with unrebased descendants abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::8' -d 1 --keep $ hg rebase -r '3::8' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
rebasing 8:479ddb54a924 "I" (tip) rebasing 8:479ddb54a924 "I" (tip)
$ hg tglog $ hg tglog
$ cd .. $ cd ..
rebase subset rebase subset
$ hg clone -q -u . ah ah3 $ hg clone -q -u . ah ah3
$ cd ah3 $ cd ah3
$ hg rebase -r '3::7' -d 1 $ hg rebase -r '3::7' -d 1
abort: can't remove original changesets with unrebased descendants abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::7' -d 1 --keep $ hg rebase -r '3::7' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"
$ hg tglog $ hg tglog
o 11: 8fbd00952cbc 'H' o 11: 8fbd00952cbc 'H'
$ cd .. $ cd ..
rebase subset with multiple head rebase subset with multiple head
$ hg clone -q -u . ah ah4 $ hg clone -q -u . ah ah4
$ cd ah4 $ cd ah4
$ hg rebase -r '3::(7+5)' -d 1 $ hg rebase -r '3::(7+5)' -d 1
abort: can't remove original changesets with unrebased descendants abort: cannot rebase changeset with children
(use --keep to keep original changesets) (use --keep to keep original changesets)
[255] [255]
$ hg rebase -r '3::(7+5)' -d 1 --keep $ hg rebase -r '3::(7+5)' -d 1 --keep
rebasing 3:ffd453c31098 "D" rebasing 3:ffd453c31098 "D"
rebasing 4:c01897464e7f "E" rebasing 4:c01897464e7f "E"
rebasing 5:41bfcc75ed73 "F" rebasing 5:41bfcc75ed73 "F"
rebasing 6:3d8a618087a7 "G" rebasing 6:3d8a618087a7 "G"
rebasing 7:72434a4e60b0 "H" rebasing 7:72434a4e60b0 "H"