This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8064

split: add a --single flag to only ask for one split
Needs RevisionPublic

Authored by rdamazio on Feb 1 2020, 2:28 AM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

The majority of split invocations only want to split a revision in two,
so this allows them to do that without getting a second chunk selector.
I thought of making a generic "max_splits" flag, but that seemed like
overkill.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

rdamazio created this revision.Feb 1 2020, 2:28 AM
baymax requested changes to this revision.Jun 8 2020, 1:34 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jun 8 2020, 1:34 PM

Revision Contents
Changeset List

PathPackages
Mhgext/split.py (15 lines)
Mtests/test-split.t (57 lines)

Diff 19813

hgext/split.py

testedwith = b'ships-with-hg-core' testedwith = b'ships-with-hg-core'
@command( @command(
b'split', b'split',
[ [
(b'r', b'rev', b'', _(b"revision to split"), _(b'REV')), (b'r', b'rev', b'', _(b"revision to split"), _(b'REV')),
(b'', b'rebase', True, _(b'rebase descendants after split')), (b'', b'rebase', True, _(b'rebase descendants after split')),
(b'', b'single', False, _(b'make a single split')),
] ]
+ cmdutil.commitopts2, + cmdutil.commitopts2,
_(b'hg split [--no-rebase] [[-r] REV]'), _(b'hg split [--no-rebase] [[-r] REV]'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
helpbasic=True, helpbasic=True,
) )
def split(ui, repo, *revs, **opts): def split(ui, repo, *revs, **opts):
"""split a changeset into smaller ones """split a changeset into smaller ones
scmutil.movedirstate(repo, ctx.p1()) scmutil.movedirstate(repo, ctx.p1())
# Any modified, added, removed, deleted result means split is incomplete # Any modified, added, removed, deleted result means split is incomplete
def incomplete(repo): def incomplete(repo):
st = repo.status() st = repo.status()
return any((st.modified, st.added, st.removed, st.deleted)) return any((st.modified, st.added, st.removed, st.deleted))
# Main split loop # Main split loop
opts.update({b'edit': True, b'interactive': True})
while incomplete(repo): while incomplete(repo):
if committed: if committed:
if opts[b'single']:
# Will make this take all changes and be the last split.
del opts[b'interactive']
header = _( header = _(
b'HG: Splitting %s. So far it has been split into:\n' b'HG: Splitting %s. So far it has been split into:\n'
) % short(ctx.node()) ) % short(ctx.node())
for c in committed: for c in committed:
firstline = c.description().split(b'\n', 1)[0] firstline = c.description().split(b'\n', 1)[0]
header += _(b'HG: - %s: %s\n') % (short(c.node()), firstline) header += _(b'HG: - %s: %s\n') % (short(c.node()), firstline)
header += _( header += _(
b'HG: Write commit message for the next split changeset.\n' b'HG: Write commit message for the next split changeset.\n'
) )
else: else:
header = _( header = _(
b'HG: Splitting %s. Write commit message for the ' b'HG: Splitting %s. Write commit message for the '
b'first split changeset.\n' b'first split changeset.\n'
) % short(ctx.node()) ) % short(ctx.node())
opts.update(
{ opts.update({b'message': header + ctx.description()})
b'edit': True,
b'interactive': True,
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.Abort(_(b'cannot split an empty revision'))
scmutil.cleanupnodes( scmutil.cleanupnodes(

tests/test-split.t

4 4
$ hg cat -r . file2 $ hg cat -r . file2
a a
b b
1 1
2 2
3 3
4 4
Test doing single splits, where it doesn't prompt to inspect what's left after
the first split.
------------------------------------------------------------------------------
$ hg init $TESTTMP/splitsingle
$ cd $TESTTMP/splitsingle
$ printf '1\n2\n' > file
$ hg ci -qAm initial
$ printf '0\n1\n2\n3\n' > file
$ hg ci -qm splitme
$ cat > $TESTTMP/messages <<EOF
> split1
> --
> split2
> EOF
$ printf 'y\ny\nn\n' | hg split --single
diff --git a/file b/file
2 hunks, 2 lines changed
examine changes to 'file'?
(enter ? for help) [Ynesfdaq?] y
@@ -0,0 +1,1 @@
+0
record change 1/2 to 'file'?
(enter ? for help) [Ynesfdaq?] y
@@ -2,0 +4,1 @@ 2
+3
record change 2/2 to 'file'?
(enter ? for help) [Ynesfdaq?] n
EDITOR: HG: Splitting 82efe286d133. Write commit message for the first split changeset.
EDITOR: splitme
EDITOR:
EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: --
EDITOR: HG: user: test
EDITOR: HG: branch 'default'
EDITOR: HG: changed file
created new head
EDITOR: HG: Splitting 82efe286d133. So far it has been split into:
EDITOR: HG: - 810358029ce5: split1
EDITOR: HG: Write commit message for the next split changeset.
EDITOR: splitme
EDITOR:
EDITOR:
EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed.
EDITOR: HG: Leave message empty to abort commit.
EDITOR: HG: --
EDITOR: HG: user: test
EDITOR: HG: branch 'default'
EDITOR: HG: changed file
saved backup bundle to $TESTTMP/splitsingle/.hg/strip-backup/82efe286d133-1ff8b354-split.hg (obsstore-off !)