| hg-reviewers |
This is for parity with the identically named option on the hg commit
(including hg commit --amend) command.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/split.py (7 lines) | |||
| M | tests/test-split.t (29 lines) |
| # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should | ||||
| # be specifying the version(s) of Mercurial they are tested with, or | # be specifying the version(s) of Mercurial they are tested with, or | ||||
| # leave the attribute unspecified. | # leave the attribute unspecified. | ||||
| testedwith = 'ships-with-hg-core' | testedwith = 'ships-with-hg-core' | ||||
| @command('^split', | @command('^split', | ||||
| [('r', 'rev', '', _("revision to split"), _('REV')), | [('r', 'rev', '', _("revision to split"), _('REV')), | ||||
| ('', 'rebase', True, _('rebase descendants after split')), | ('', 'rebase', True, _('rebase descendants after split')), | ||||
| ('', 'secret', None, _('use the secret phase for committing')), | |||||
| ] + cmdutil.commitopts2, | ] + cmdutil.commitopts2, | ||||
| _('hg split [--no-rebase] [[-r] REV]')) | _('hg split [--no-rebase] [[-r] REV]')) | ||||
| def split(ui, repo, *revs, **opts): | def split(ui, repo, *revs, **opts): | ||||
| """split a changeset into smaller ones | """split a changeset into smaller ones | ||||
| Repeatedly prompt changes and commit message for new changesets until there | Repeatedly prompt changes and commit message for new changesets until there | ||||
| is nothing left in the original changeset. | is nothing left in the original changeset. | ||||
| # 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")) | ||||
| # If the user specified --secret or --no-secret on the commandline, | |||||
| # respect that; otherwise, respect the current phase of the commit | |||||
| # (ignoring the phases.new-commit setting). | |||||
| if opts.get('secret') is None: | |||||
| opts['secret'] = ctx.phase() == phases.secret | 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)) | ||||
| 1df0d5c5a3ab draft | 1df0d5c5a3ab draft | ||||
| a61bcde8c529 draft | a61bcde8c529 draft | ||||
| $ runsplit tip >/dev/null | $ runsplit tip >/dev/null | ||||
| $ hg log -T '{short(node)} {phase}\n' | $ hg log -T '{short(node)} {phase}\n' | ||||
| 00eebaf8d2e2 draft | 00eebaf8d2e2 draft | ||||
| a09ad58faae3 draft | a09ad58faae3 draft | ||||
| e704349bd21b draft | e704349bd21b draft | ||||
| a61bcde8c529 draft | a61bcde8c529 draft | ||||
| If --secret is specified, convert draft commits to secret on split | |||||
| $ cp -R $TESTTMP/clean $TESTTMP/phases3 | |||||
| $ cd $TESTTMP/phases3 | |||||
| $ hg log -T '{short(node)} {phase}\n' | |||||
| 1df0d5c5a3ab draft | |||||
| a61bcde8c529 draft | |||||
| $ runsplit --secret tip >/dev/null | |||||
| $ hg log -T '{short(node)} {phase}\n' | |||||
| 00eebaf8d2e2 secret | |||||
| a09ad58faae3 secret | |||||
| e704349bd21b secret | |||||
| a61bcde8c529 draft | |||||
| If --no-secret is specified, convert secret commits to draft on split | |||||
| $ cp -R $TESTTMP/clean $TESTTMP/phases4 | |||||
| $ cd $TESTTMP/phases4 | |||||
| $ hg phase --secret -fr tip | |||||
| $ hg log -T '{short(node)} {phase}\n' | |||||
| 1df0d5c5a3ab secret | |||||
| a61bcde8c529 draft | |||||
| $ runsplit --no-secret tip >/dev/null | |||||
| $ hg log -T '{short(node)} {phase}\n' | |||||
| 00eebaf8d2e2 draft | |||||
| a09ad58faae3 draft | |||||
| e704349bd21b draft | |||||
| a61bcde8c529 draft | |||||