This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9338

errors: raise InputError in `hg split`
ClosedPublic

Authored by martinvonz on Nov 17 2020, 7:56 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG568c05d8f3d2: errors: raise InputError in `hg split`
rHGae6c28dcb721: errors: raise InputError in `hg split`

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

Diff 23561

hgext/split.py

opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
revlist = [] revlist = []
if opts.get(b'rev'): if opts.get(b'rev'):
revlist.append(opts.get(b'rev')) revlist.append(opts.get(b'rev'))
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.InputError(_(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() # Handle nullid specially here (instead of leaving for precheck()
# below) so we get a nicer message and error code. # 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.InputError(_(b'cannot split working directory'))
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)) 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
) )
) )
else: else:
torebase = [] torebase = []
rewriteutil.precheck(repo, [rev] + torebase, b'split') rewriteutil.precheck(repo, [rev] + torebase, b'split')
if len(ctx.parents()) > 1: if len(ctx.parents()) > 1:
raise error.Abort(_(b'cannot split a merge changeset')) raise error.InputError(_(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
if bname and repo._bookmarks[bname] != ctx.node(): if bname and repo._bookmarks[bname] != ctx.node():
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
b'message': header + ctx.description(), b'message': header + ctx.description(),
} }
) )
commands.commit(ui, repo, **pycompat.strkwargs(opts)) commands.commit(ui, repo, **pycompat.strkwargs(opts))
newctx = repo[b'.'] newctx = repo[b'.']
committed.append(newctx) committed.append(newctx)
if not committed: if not committed:
raise error.Abort(_(b'cannot split an empty revision')) raise error.InputError(_(b'cannot split an empty revision'))
scmutil.cleanupnodes( scmutil.cleanupnodes(
repo, repo,
{ctx.node(): [c.node() for c in committed]}, {ctx.node(): [c.node() for c in committed]},
operation=b'split', operation=b'split',
fixphase=True, fixphase=True,
) )

tests/test-split.t

$ hg split $ hg split
nothing to split nothing to split
[1] [1]
$ hg commit -m empty --config ui.allowemptycommit=1 $ hg commit -m empty --config ui.allowemptycommit=1
$ hg split $ hg split
abort: cannot split an empty revision abort: cannot split an empty revision
[255] [10]
$ rm -rf .hg $ rm -rf .hg
$ hg init $ hg init
Cannot split working directory Cannot split working directory
$ hg split -r 'wdir()' $ hg split -r 'wdir()'
abort: cannot split working directory abort: cannot split working directory
[255] [10]
Generate some content. The sed filter drop CR on Windows, which is dropped in Generate some content. The sed filter drop CR on Windows, which is dropped in
the a > b line. the a > b line.
$ $TESTDIR/seq.py 1 5 | sed 's/\r$//' >> a $ $TESTDIR/seq.py 1 5 | sed 's/\r$//' >> a
$ hg ci -m a1 -A a -q $ hg ci -m a1 -A a -q
$ hg bookmark -i r1 $ hg bookmark -i r1
$ sed 's/1/11/;s/3/33/;s/5/55/' a > b $ sed 's/1/11/;s/3/33/;s/5/55/' a > b
$ cp -R . ../clean $ cp -R . ../clean
Split a head Split a head
$ hg bookmark r3 $ hg bookmark r3
$ hg split 'all()' $ hg split 'all()'
abort: cannot split multiple revisions abort: cannot split multiple revisions
[255] [10]
This function splits a bit strangely primarily to avoid changing the behavior of This function splits a bit strangely primarily to avoid changing the behavior of
the test after a bug was fixed with how split/commit --interactive handled the test after a bug was fixed with how split/commit --interactive handled
`commands.commit.interactive.unified=0`: when there were no context lines, `commands.commit.interactive.unified=0`: when there were no context lines,
it kept only the last diff hunk. When running split, this meant that runsplit it kept only the last diff hunk. When running split, this meant that runsplit
was always recording three commits, one for each diff hunk, in reverse order was always recording three commits, one for each diff hunk, in reverse order
(the base commit was the last diff hunk in the file). (the base commit was the last diff hunk in the file).
$ runsplit() { $ runsplit() {