( )⚙ D7686 split: use rewriteutil.precheck() instead of reimplementing it

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7686

split: 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
rHG2349a60f33db: split: use rewriteutil.precheck() instead of reimplementing it
Summary

As you can see from the patch, I disagree with most of the comment
saying that rewriteutil.precheck() is not worthwhile.

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/split.py (32 lines)
Mtests/test-split.t (6 lines)

Diff 18861

hgext/split.py

) )
from mercurial import ( from mercurial import (
bookmarks, bookmarks,
cmdutil, cmdutil,
commands, commands,
error, error,
hg, hg,
obsolete,
phases,
pycompat, pycompat,
registrar, registrar,
revsetlang, revsetlang,
rewriteutil,
scmutil, scmutil,
) )
# allow people to use split without explicitly enabling rebase extension # allow people to use split without explicitly enabling rebase extension
from . import rebase from . import rebase
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
revlist.extend(revs) revlist.extend(revs)
with repo.wlock(), repo.lock(), repo.transaction(b'split') as tr: with repo.wlock(), repo.lock(), repo.transaction(b'split') as tr:
revs = scmutil.revrange(repo, revlist or [b'.']) revs = scmutil.revrange(repo, revlist or [b'.'])
if len(revs) > 1: if len(revs) > 1:
raise error.Abort(_(b'cannot split multiple revisions')) raise error.Abort(_(b'cannot split multiple revisions'))
rev = revs.first() rev = revs.first()
ctx = repo[rev] ctx = repo[rev]
# Handle nullid specially here (instead of leaving for precheck()
# below) so we get a nicer message and error code.
if rev is None or ctx.node() == nullid: if rev is None or ctx.node() == nullid:
ui.status(_(b'nothing to split\n')) ui.status(_(b'nothing to split\n'))
return 1 return 1
if ctx.node() is None: if ctx.node() is None:
raise error.Abort(_(b'cannot split working directory')) raise error.Abort(_(b'cannot split working directory'))
# rewriteutil.precheck is not very useful here because:
# 1. null check is done above and it's more friendly to return 1
# instead of abort
# 2. mergestate check is done below by cmdutil.bailifchanged
# 3. unstable check is more complex here because of --rebase
#
# So only "public" check is useful and it's checked directly here.
if ctx.phase() == phases.public:
raise error.Abort(
_(b'cannot split public changeset'),
hint=_(b"see 'hg help phases' for details"),
)
descendants = list(repo.revs(b'(%d::) - (%d)', rev, rev))
alloworphaned = obsolete.isenabled(repo, obsolete.allowunstableopt)
if opts.get(b'rebase'): if opts.get(b'rebase'):
# Skip obsoleted descendants and their descendants so the rebase # Skip obsoleted descendants and their descendants so the rebase
# won't cause conflicts for sure. # won't cause conflicts for sure.
descendants = list(repo.revs(b'(%d::) - (%d)', rev, rev))
torebase = list( torebase = list(
repo.revs( repo.revs(
b'%ld - (%ld & obsolete())::', descendants, descendants b'%ld - (%ld & obsolete())::', descendants, descendants
) )
) )
if not alloworphaned and len(torebase) != len(descendants):
raise error.Abort(
_(b'split would leave orphaned changesets behind')
)
else: else:
if not alloworphaned and descendants: torebase = []
raise error.Abort( rewriteutil.precheck(repo, [rev] + torebase, b'split')
_(b'cannot split changeset with children without rebase')
)
torebase = ()
if len(ctx.parents()) > 1: if len(ctx.parents()) > 1:
raise error.Abort(_(b'cannot split a merge changeset')) raise error.Abort(_(b'cannot split a merge changeset'))
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
# Deactivate bookmark temporarily so it won't get moved unintentionally # Deactivate bookmark temporarily so it won't get moved unintentionally
bname = repo._activebookmark bname = repo._activebookmark

tests/test-split.t

$ mv b a $ mv b a
$ hg ci -m a2 -q $ hg ci -m a2 -q
$ hg bookmark -i r2 $ hg bookmark -i r2
Cannot split a public changeset Cannot split a public changeset
$ hg phase --public -r 'all()' $ hg phase --public -r 'all()'
$ hg split . $ hg split .
abort: cannot split public changeset abort: cannot split public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]
$ hg phase --draft -f -r 'all()' $ hg phase --draft -f -r 'all()'
Cannot split while working directory is dirty Cannot split while working directory is dirty
$ touch dirty $ touch dirty
#endif #endif
Split a non-head without rebase Split a non-head without rebase
$ cd $TESTTMP/d $ cd $TESTTMP/d
#if obsstore-off #if obsstore-off
$ runsplit -r 1 --no-rebase $ runsplit -r 1 --no-rebase
abort: cannot split changeset with children without rebase abort: cannot split changeset with children
[255] [255]
#else #else
$ runsplit -r 1 --no-rebase >/dev/null $ runsplit -r 1 --no-rebase >/dev/null
3 new orphan changesets 3 new orphan changesets
$ hg bookmark $ hg bookmark
d1 2:b5c5ea414030 d1 2:b5c5ea414030
* d2 3:f4a0a8d004cc * d2 3:f4a0a8d004cc
d3 4:777940761eba d3 4:777940761eba
> B > B
> | > |
> A > A
> EOS > EOS
2 new orphan changesets 2 new orphan changesets
$ eval `hg tags -T '{tag}={node}\n'` $ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags $ rm .hg/localtags
$ hg split $B --config experimental.evolution=createmarkers $ hg split $B --config experimental.evolution=createmarkers
abort: split would leave orphaned changesets behind abort: cannot split changeset with children
[255] [255]
$ cat > $TESTTMP/messages <<EOF $ cat > $TESTTMP/messages <<EOF
> Split B > Split B
> EOF > EOF
$ cat <<EOF | hg split $B $ cat <<EOF | hg split $B
> y > y
> y > y
> EOF > EOF