This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2016

split: preserve phase of commit that is being split
AbandonedPublic

Authored by spectral on Feb 2 2018, 6:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 5170

hgext/split.py

# instead of abort # instead of abort
# 2. mergestate check is done below by cmdutil.bailifchanged # 2. mergestate check is done below by cmdutil.bailifchanged
# 3. unstable check is more complex here because of --rebase # 3. unstable check is more complex here because of --rebase
# #
# So only "public" check is useful and it's checked directly here. # So only "public" check is useful and it's checked directly here.
if ctx.phase() == phases.public: if ctx.phase() == phases.public:
raise error.Abort(_('cannot split public changeset'), raise error.Abort(_('cannot split public changeset'),
hint=_("see 'hg help phases' for details")) hint=_("see 'hg help phases' for details"))
opts['secret'] = ctx.phase() == phases.secret
descendants = list(repo.revs('(%d::) - (%d)', rev, rev)) descendants = list(repo.revs('(%d::) - (%d)', rev, rev))
alloworphaned = obsolete.isenabled(repo, obsolete.allowunstableopt) alloworphaned = obsolete.isenabled(repo, obsolete.allowunstableopt)
if opts.get('rebase'): if opts.get('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.
torebase = list(repo.revs('%ld - (%ld & obsolete())::', torebase = list(repo.revs('%ld - (%ld & obsolete())::',
descendants, descendants)) descendants, descendants))

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