Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 42627:55d8329ba509

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: removed part of description from abort and continue The description for registration of new `continuefunc` or `abortfunc` is removed as it is not required from user perspective. Differential Revision: https://phab.mercurial-scm.org/D6660
author Taapas Agrawal <taapas2897@gmail.com>
date Fri, 19 Jul 2019 01:49:10 +0530
parents 9eace8d6d537
children 0795bbe8ed19
comparison
equal deleted inserted replaced
42626:944604118c0f 42627:55d8329ba509
139 139
140 Aborts a multistep operation like graft, histedit, rebase, merge, 140 Aborts a multistep operation like graft, histedit, rebase, merge,
141 and unshelve if they are in an unfinished state. 141 and unshelve if they are in an unfinished state.
142 142
143 use --dry-run/-n to dry run the command. 143 use --dry-run/-n to dry run the command.
144 A new operation can be added to this by registering the operation and
145 abort logic in the unfinishedstates list under statemod.
146 """ 144 """
147 dryrun = opts.get(r'dry_run') 145 dryrun = opts.get(r'dry_run')
148 abortstate = cmdutil.getunfinishedstate(repo) 146 abortstate = cmdutil.getunfinishedstate(repo)
149 if not abortstate: 147 if not abortstate:
150 raise error.Abort(_('no operation in progress')) 148 raise error.Abort(_('no operation in progress'))
1901 1899
1902 Finishes a multistep operation like graft, histedit, rebase, merge, 1900 Finishes a multistep operation like graft, histedit, rebase, merge,
1903 and unshelve if they are in an interrupted state. 1901 and unshelve if they are in an interrupted state.
1904 1902
1905 use --dry-run/-n to dry run the command. 1903 use --dry-run/-n to dry run the command.
1906 A new operation can be added to this by registering the operation and
1907 continue logic in the unfinishedstates list under statemod.
1908 """ 1904 """
1909 dryrun = opts.get(r'dry_run') 1905 dryrun = opts.get(r'dry_run')
1910 contstate = cmdutil.getunfinishedstate(repo) 1906 contstate = cmdutil.getunfinishedstate(repo)
1911 if not contstate: 1907 if not contstate:
1912 raise error.Abort(_('no operation in progress')) 1908 raise error.Abort(_('no operation in progress'))