This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8057

rebase: abort if the user tries to rebase the working copy
ClosedPublic

Authored by martinvonz on Jan 31 2020, 1:59 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG830eae18b2f3: rebase: abort if the user tries to rebase the working copy
rHG35d6b05fd87f: rebase: abort if the user tries to rebase the working copy
rHG130e27fcf48f: rebase: abort if the user tries to rebase the working copy
Summary

I think it's more correct to treat hg rebase -r 'wdirrev()' -d foo
as hg co -m foo, but I'm instead making it error out. That's partly
because it's probably what the user wanted (in the case I heard from a
user, they had done hg rebase -s f where f resolved to wdir())
and partly because I don't want to think about more complicated cases
where the user specifies the working copy together with other commits.

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.Jan 31 2020, 1:59 PM
pulkit added a subscriber: pulkit.Jan 31 2020, 6:28 PM
pulkit added inline comments.
tests/test-rebase-parameters.t
100

hm, the destination is not empty here.

martinvonz updated this revision to Diff 19804.Jan 31 2020, 7:08 PM
martinvonz added inline comments.Jan 31 2020, 7:08 PM
tests/test-rebase-parameters.t
100

Oops, that was sloppy of me to not notice (I just assumed it was the same message as above). Will fix.

pulkit accepted this revision.Feb 3 2020, 8:19 AM
This revision is now accepted and ready to land.Feb 3 2020, 8:19 AM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (6 lines)
Mtests/test-rebase-parameters.t (7 lines)

Diff 19853

hgext/rebase.py

copies, copies,
destutil, destutil,
dirstateguard, dirstateguard,
error, error,
extensions, extensions,
hg, hg,
merge as mergemod, merge as mergemod,
mergeutil, mergeutil,
node as nodemod,
obsolete, obsolete,
obsutil, obsutil,
patch, patch,
phases, phases,
pycompat, pycompat,
registrar, registrar,
repair, repair,
revset, revset,
if not rebaseset: if not rebaseset:
ui.status(_(b'empty "rev" revision set - nothing to rebase\n')) ui.status(_(b'empty "rev" revision set - nothing to rebase\n'))
return None return None
elif srcf: elif srcf:
src = scmutil.revrange(repo, [srcf]) src = scmutil.revrange(repo, [srcf])
if not src: if not src:
ui.status(_(b'empty "source" revision set - nothing to rebase\n')) ui.status(_(b'empty "source" revision set - nothing to rebase\n'))
return None return None
rebaseset = repo.revs(b'(%ld)::', src) rebaseset = repo.revs(b'(%ld)::', src) or src
assert rebaseset
else: else:
base = scmutil.revrange(repo, [basef or b'.']) base = scmutil.revrange(repo, [basef or b'.'])
if not base: if not base:
ui.status( ui.status(
_(b'empty "base" revision set - ' b"can't compute rebase set\n") _(b'empty "base" revision set - ' b"can't compute rebase set\n")
) )
return None return None
if destf: if destf:
) )
else: # can it happen? else: # can it happen?
ui.status( ui.status(
_(b'nothing to rebase from %s to %s\n') _(b'nothing to rebase from %s to %s\n')
% (b'+'.join(bytes(repo[r]) for r in base), dest) % (b'+'.join(bytes(repo[r]) for r in base), dest)
) )
return None return None
if nodemod.wdirrev in rebaseset:
raise error.Abort(_(b'cannot rebase the working copy'))
rebasingwcp = repo[b'.'].rev() in rebaseset rebasingwcp = repo[b'.'].rev() in rebaseset
ui.log( ui.log(
b"rebase", b"rebase",
b"rebasing working copy parent: %r\n", b"rebasing working copy parent: %r\n",
rebasingwcp, rebasingwcp,
rebase_rebasing_wcp=rebasingwcp, rebase_rebasing_wcp=rebasingwcp,
) )
if inmemory and rebasingwcp: if inmemory and rebasingwcp:

tests/test-rebase-parameters.t

(run 'hg heads .' to see heads, specify destination with -d) (run 'hg heads .' to see heads, specify destination with -d)
[255] [255]
$ hg rebase --rev '1 & !1' --dest 8 $ hg rebase --rev '1 & !1' --dest 8
empty "rev" revision set - nothing to rebase empty "rev" revision set - nothing to rebase
[1] [1]
$ hg rebase --rev 'wdir()' --dest 6 $ hg rebase --rev 'wdir()' --dest 6
abort: working directory revision cannot be specified abort: cannot rebase the working copy
[255] [255]
$ hg rebase --source 'wdir()' --dest 6 2>&1 | grep assert $ hg rebase --source 'wdir()' --dest 6
assert rebaseset abort: cannot rebase the working copy
pulkitUnsubmitted
Not Done

hm, the destination is not empty here.

pulkit: hm, the destination is not empty here.
martinvonzAuthorUnsubmitted
Done

Oops, that was sloppy of me to not notice (I just assumed it was the same message as above). Will fix.

martinvonz: Oops, that was sloppy of me to not notice (I just assumed it was the same message as above).
[255]
$ hg rebase --source '1 & !1' --dest 8 $ hg rebase --source '1 & !1' --dest 8
empty "source" revision set - nothing to rebase empty "source" revision set - nothing to rebase
[1] [1]
$ hg rebase --base '1 & !1' --dest 8 $ hg rebase --base '1 & !1' --dest 8
empty "base" revision set - can't compute rebase set empty "base" revision set - can't compute rebase set
[1] [1]