diff --git a/mercurial/commands.py b/mercurial/commands.py index 2f760da140ee4437293c874b5021f6d9f5d287d9_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..3c16b9c0b0998471b2ed1093cbbacc9aa333b808_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1893,6 +1893,32 @@ return 0 return 1 +@command('continue', + dryrunopts, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, + helpbasic=True) +def continuecmd(ui, repo, **opts): + """resumes an interrupted operation (EXPERIMENTAL) + + Finishes a multistep operation like graft, histedit, rebase, merge, + and unshelve if they are in an interrupted state. + + 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') + contstate = cmdutil.getunfinishedstate(repo) + if not contstate: + raise error.Abort(_('no operation in progress')) + if not contstate.continuefunc: + raise error.Abort((_("%s in progress but does not support " + "'hg continue'") % (contstate._opname)), + hint=contstate.continuemsg()) + if dryrun: + ui.status(_('%s in progress, will be resumed\n') % (contstate._opname)) + return + return contstate.continuefunc(ui, repo) + @command('copy|cp', [('A', 'after', None, _('record a copy that has already occurred')), ('f', 'force', None, _('forcibly copy over an existing managed file')), diff --git a/mercurial/state.py b/mercurial/state.py index 2f760da140ee4437293c874b5021f6d9f5d287d9_bWVyY3VyaWFsL3N0YXRlLnB5..3c16b9c0b0998471b2ed1093cbbacc9aa333b808_bWVyY3VyaWFsL3N0YXRlLnB5 100644 --- a/mercurial/state.py +++ b/mercurial/state.py @@ -99,7 +99,7 @@ def __init__(self, opname, fname, clearable, allowcommit, reportonly, continueflag, stopflag, cmdmsg, cmdhint, statushint, - abortfunc): + abortfunc, continuefunc): self._opname = opname self._fname = fname self._clearable = clearable @@ -111,6 +111,7 @@ self._cmdhint = cmdhint self._statushint = statushint self.abortfunc = abortfunc + self.continuefunc = continuefunc def statusmsg(self): """returns the hint message corresponding to the command for @@ -159,7 +160,8 @@ def addunfinished(opname, fname, clearable=False, allowcommit=False, reportonly=False, continueflag=False, stopflag=False, - cmdmsg="", cmdhint="", statushint="", abortfunc=None): + cmdmsg="", cmdhint="", statushint="", abortfunc=None, + continuefunc=None): """this registers a new command or operation to unfinishedstates opname is the name the command or operation fname is the file name in which data should be stored in .hg directory. @@ -184,6 +186,8 @@ message of the format ('To continue: hg cmdname --continue' 'To abort: hg cmdname --abort') is not desired abortfunc stores the function required to abort an unfinished state. + continuefunc stores the function required to finish an interrupted + operation. """ statecheckobj = _statecheck(opname, fname, clearable, allowcommit, reportonly, continueflag, stopflag, cmdmsg, @@ -187,7 +191,7 @@ """ statecheckobj = _statecheck(opname, fname, clearable, allowcommit, reportonly, continueflag, stopflag, cmdmsg, - cmdhint, statushint, abortfunc) + cmdhint, statushint, abortfunc, continuefunc) if opname == 'merge': _unfinishedstates.append(statecheckobj) else: diff --git a/tests/test-completion.t b/tests/test-completion.t index 2f760da140ee4437293c874b5021f6d9f5d287d9_dGVzdHMvdGVzdC1jb21wbGV0aW9uLnQ=..3c16b9c0b0998471b2ed1093cbbacc9aa333b808_dGVzdHMvdGVzdC1jb21wbGV0aW9uLnQ= 100644 --- a/tests/test-completion.t +++ b/tests/test-completion.t @@ -15,6 +15,7 @@ clone commit config + continue copy diff export @@ -252,6 +253,7 @@ clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos config: untrusted, edit, local, global, template + continue: dry-run copy: after, force, include, exclude, dry-run debugancestor: debugapplystreamclonebundle: diff --git a/tests/test-help.t b/tests/test-help.t index 2f760da140ee4437293c874b5021f6d9f5d287d9_dGVzdHMvdGVzdC1oZWxwLnQ=..3c16b9c0b0998471b2ed1093cbbacc9aa333b808_dGVzdHMvdGVzdC1oZWxwLnQ= 100644 --- a/tests/test-help.t +++ b/tests/test-help.t @@ -408,6 +408,7 @@ show changeset information by line for each file clone make a copy of an existing repository commit, ci commit the specified files or all outstanding changes + continue resumes an interrupted operation (EXPERIMENTAL) diff diff repository (or selected files) export dump the header and diffs for one or more changesets forget forget the specified files on the next commit @@ -2389,6 +2390,13 @@ commit the specified files or all outstanding changes </td></tr> <tr><td> + <a href="/help/continue"> + continue + </a> + </td><td> + resumes an interrupted operation (EXPERIMENTAL) + </td></tr> + <tr><td> <a href="/help/diff"> diff </a> diff --git a/tests/test-hgweb-json.t b/tests/test-hgweb-json.t index 2f760da140ee4437293c874b5021f6d9f5d287d9_dGVzdHMvdGVzdC1oZ3dlYi1qc29uLnQ=..3c16b9c0b0998471b2ed1093cbbacc9aa333b808_dGVzdHMvdGVzdC1oZ3dlYi1qc29uLnQ= 100644 --- a/tests/test-hgweb-json.t +++ b/tests/test-hgweb-json.t @@ -1895,6 +1895,10 @@ "topic": "commit" }, { + "summary": "resumes an interrupted operation (EXPERIMENTAL)", + "topic": "continue" + }, + { "summary": "diff repository (or selected files)", "topic": "diff" },