This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3819

split: preserve phase of commit that is being split
ClosedPublic

Authored by martinvonz on Jun 19 2018, 5:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4f885770c4a2: split: preserve phase of commit that is being split
Summary

With this change, hg split will preserve the phase of the commit that is being
split, ignoring the phases.new-commit setting. Previously, we would use whatever
phases.new-commit was set to (unless our parent was secret, then we would be
secret even if phases.new-commit=draft).

Now, splitting a draft commit with phases.new-commit=secret does not cause the
new commits to become secret, and splitting a secret commit with
phases.new-commit=draft and a draft parent does not cause the new commits to
become draft.

Test cases and commit message taken from Kyle Lippincott's D2016 (thanks!).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 19 2018, 5:16 PM
Closed by commit rHG4f885770c4a2: split: preserve phase of commit that is being split (authored by martinvonz). · Explain WhyJun 21 2018, 8:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/split.py (2 lines)
Mtests/test-split.t (33 lines)

Diff 9235

hgext/split.py

commands.commit(ui, repo, **pycompat.strkwargs(opts)) commands.commit(ui, repo, **pycompat.strkwargs(opts))
newctx = repo['.'] newctx = repo['.']
committed.append(newctx) committed.append(newctx)
if not committed: if not committed:
raise error.Abort(_('cannot split an empty revision')) raise error.Abort(_('cannot split an empty revision'))
scmutil.cleanupnodes(repo, {ctx.node(): [c.node() for c in committed]}, scmutil.cleanupnodes(repo, {ctx.node(): [c.node() for c in committed]},
operation='split') operation='split', fixphase=True)
return committed[-1] return committed[-1]
def dorebase(ui, repo, src, destctx): def dorebase(ui, repo, src, destctx):
rebase.rebase(ui, repo, rev=[revsetlang.formatspec('%ld', src)], rebase.rebase(ui, repo, rev=[revsetlang.formatspec('%ld', src)],
dest=revsetlang.formatspec('%d', destctx.rev())) dest=revsetlang.formatspec('%d', destctx.rev()))

tests/test-split.t

| | | | | |
| | x 2:26805aba1e60 C | | x 2:26805aba1e60 C
| |/ | |/
| x 1:112478962961 B | x 1:112478962961 B
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
#endif #endif
Preserve secret phase in split
$ cp -R $TESTTMP/clean $TESTTMP/phases1
$ cd $TESTTMP/phases1
$ hg phase --secret -fr tip
$ hg log -T '{short(node)} {phase}\n'
1df0d5c5a3ab secret
a61bcde8c529 draft
$ runsplit tip >/dev/null
$ hg log -T '{short(node)} {phase}\n'
00eebaf8d2e2 secret
a09ad58faae3 secret
e704349bd21b secret
a61bcde8c529 draft
Do not move things to secret even if phases.new-commit=secret
$ cp -R $TESTTMP/clean $TESTTMP/phases2
$ cd $TESTTMP/phases2
$ cat >> .hg/hgrc <<EOF
> [phases]
> new-commit=secret
> EOF
$ hg log -T '{short(node)} {phase}\n'
1df0d5c5a3ab draft
a61bcde8c529 draft
$ runsplit tip >/dev/null
$ hg log -T '{short(node)} {phase}\n'
00eebaf8d2e2 draft
a09ad58faae3 draft
e704349bd21b draft
a61bcde8c529 draft