( )⚙ D6660 commands: removed part of description from abort and continue

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6660

commands: removed part of description from abort and continue
ClosedPublic

Authored by taapas1128 on Jul 18 2019, 4:20 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG55d8329ba509: commands: removed part of description from abort and continue
Summary

The description for registration of new continuefunc or abortfunc
is removed as it is not required from user perspective.

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.

Event Timeline

taapas1128 created this revision.Jul 18 2019, 4:20 PM
martinvonz accepted this revision.Jul 21 2019, 10:15 AM
This revision is now accepted and ready to land.Jul 21 2019, 10:15 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)

Diff 15984

mercurial/commands.py

helpbasic=True) helpbasic=True)
def abort(ui, repo, **opts): def abort(ui, repo, **opts):
"""abort an unfinished operation (EXPERIMENTAL) """abort an unfinished operation (EXPERIMENTAL)
Aborts a multistep operation like graft, histedit, rebase, merge, Aborts a multistep operation like graft, histedit, rebase, merge,
and unshelve if they are in an unfinished state. and unshelve if they are in an unfinished state.
use --dry-run/-n to dry run the command. use --dry-run/-n to dry run the command.
A new operation can be added to this by registering the operation and
abort logic in the unfinishedstates list under statemod.
""" """
dryrun = opts.get(r'dry_run') dryrun = opts.get(r'dry_run')
abortstate = cmdutil.getunfinishedstate(repo) abortstate = cmdutil.getunfinishedstate(repo)
if not abortstate: if not abortstate:
raise error.Abort(_('no operation in progress')) raise error.Abort(_('no operation in progress'))
if not abortstate.abortfunc: if not abortstate.abortfunc:
raise error.Abort((_("%s in progress but does not support 'hg abort'") % raise error.Abort((_("%s in progress but does not support 'hg abort'") %
(abortstate._opname)), hint=abortstate.hint()) (abortstate._opname)), hint=abortstate.hint())
helpbasic=True) helpbasic=True)
def continuecmd(ui, repo, **opts): def continuecmd(ui, repo, **opts):
"""resumes an interrupted operation (EXPERIMENTAL) """resumes an interrupted operation (EXPERIMENTAL)
Finishes a multistep operation like graft, histedit, rebase, merge, Finishes a multistep operation like graft, histedit, rebase, merge,
and unshelve if they are in an interrupted state. and unshelve if they are in an interrupted state.
use --dry-run/-n to dry run the command. use --dry-run/-n to dry run the command.
A new operation can be added to this by registering the operation and
continue logic in the unfinishedstates list under statemod.
""" """
dryrun = opts.get(r'dry_run') dryrun = opts.get(r'dry_run')
contstate = cmdutil.getunfinishedstate(repo) contstate = cmdutil.getunfinishedstate(repo)
if not contstate: if not contstate:
raise error.Abort(_('no operation in progress')) raise error.Abort(_('no operation in progress'))
if not contstate.continuefunc: if not contstate.continuefunc:
raise error.Abort((_("%s in progress but does not support " raise error.Abort((_("%s in progress but does not support "
"'hg continue'") % (contstate._opname)), "'hg continue'") % (contstate._opname)),