This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6645

continue: added logic for hg continue
ClosedPublic

Authored by taapas1128 on Jul 15 2019, 4:41 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3c16b9c0b099: continue: added logic for hg continue
rHGb53633d3f809: continue: added logic for hg continue
Summary

This is part of GSoC19 project `Implement abort and
continue commands`. This patch is part of the continue plan.

This adds the basic logic for hg continue. This command
aborts an multistep operation like graft, histedit, rebase,
transplant and unshelve if they are in an unfinished state.

The first part of the logic is determining the unfinished
operation from the state detection API under statemod.
This API is extended to support hg continue by adding a method
to register the abort logic as a function (here continuefunc).

Once the unfinished operation is determined the registered
logic is used to resume the command in case it is interrupted.
The benefit of this kind of framework is that any new extension
developed can support hg continue by registering the command
and logic under statedetection API.

hg continue currently supports --dry-run/-n flag only.
It is used to dry run hg abort

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 15 2019, 4:41 PM
taapas1128 updated this revision to Diff 15915.Jul 15 2019, 4:48 PM
taapas1128 added a commit: rHGb53633d3f809: continue: added logic for hg continue.Jul 17 2019, 7:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb53633d3f809: continue: added logic for hg continue (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.
pulkit added a subscriber: pulkit.Jul 18 2019, 12:44 AM
pulkit added inline comments.
mercurial/commands.py
1906

This line should not be a part of user help.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (26 lines)
Mmercurial/state.py (10 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-help.t (8 lines)
Mtests/test-hgweb-json.t (4 lines)

Diff 15941

mercurial/commands.py

else: else:
fm.write('name value', '%s=%s\n', entryname, value) fm.write('name value', '%s=%s\n', entryname, value)
matched = True matched = True
fm.end() fm.end()
if matched: if matched:
return 0 return 0
return 1 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
pulkitUnsubmitted
Not Done

This line should not be a part of user help.

pulkit: This line should not be a part of user help.
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', @command('copy|cp',
[('A', 'after', None, _('record a copy that has already occurred')), [('A', 'after', None, _('record a copy that has already occurred')),
('f', 'force', None, _('forcibly copy over an existing managed file')), ('f', 'force', None, _('forcibly copy over an existing managed file')),
] + walkopts + dryrunopts, ] + walkopts + dryrunopts,
_('[OPTION]... SOURCE... DEST'), _('[OPTION]... SOURCE... DEST'),
helpcategory=command.CATEGORY_FILE_CONTENTS) helpcategory=command.CATEGORY_FILE_CONTENTS)
def copy(ui, repo, *pats, **opts): def copy(ui, repo, *pats, **opts):
"""mark files as copied for the next commit """mark files as copied for the next commit

mercurial/state.py

are in an unfinished conditition or not and return appropriate message are in an unfinished conditition or not and return appropriate message
and hint. and hint.
It also has the ability to register and determine the states of any new It also has the ability to register and determine the states of any new
multistep operation or multistep command extension. multistep operation or multistep command extension.
""" """
def __init__(self, opname, fname, clearable, allowcommit, reportonly, def __init__(self, opname, fname, clearable, allowcommit, reportonly,
continueflag, stopflag, cmdmsg, cmdhint, statushint, continueflag, stopflag, cmdmsg, cmdhint, statushint,
abortfunc): abortfunc, continuefunc):
self._opname = opname self._opname = opname
self._fname = fname self._fname = fname
self._clearable = clearable self._clearable = clearable
self._allowcommit = allowcommit self._allowcommit = allowcommit
self._reportonly = reportonly self._reportonly = reportonly
self._continueflag = continueflag self._continueflag = continueflag
self._stopflag = stopflag self._stopflag = stopflag
self._cmdmsg = cmdmsg self._cmdmsg = cmdmsg
self._cmdhint = cmdhint self._cmdhint = cmdhint
self._statushint = statushint self._statushint = statushint
self.abortfunc = abortfunc self.abortfunc = abortfunc
self.continuefunc = continuefunc
def statusmsg(self): def statusmsg(self):
"""returns the hint message corresponding to the command for """returns the hint message corresponding to the command for
hg status --verbose hg status --verbose
""" """
if not self._statushint: if not self._statushint:
hint = (_('To continue: hg %s --continue\n' hint = (_('To continue: hg %s --continue\n'
'To abort: hg %s --abort') % (self._opname, 'To abort: hg %s --abort') % (self._opname,
else: else:
return repo.vfs.exists(self._fname) return repo.vfs.exists(self._fname)
# A list of statecheck objects for multistep operations like graft. # A list of statecheck objects for multistep operations like graft.
_unfinishedstates = [] _unfinishedstates = []
def addunfinished(opname, fname, clearable=False, allowcommit=False, def addunfinished(opname, fname, clearable=False, allowcommit=False,
reportonly=False, continueflag=False, stopflag=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 """this registers a new command or operation to unfinishedstates
opname is the name the command or operation opname is the name the command or operation
fname is the file name in which data should be stored in .hg directory. fname is the file name in which data should be stored in .hg directory.
It is None for merge command. It is None for merge command.
clearable boolean determines whether or not interrupted states can be clearable boolean determines whether or not interrupted states can be
cleared by running `hg update -C .` which in turn deletes the cleared by running `hg update -C .` which in turn deletes the
state file. state file.
allowcommit boolean decides whether commit is allowed during interrupted allowcommit boolean decides whether commit is allowed during interrupted
state or not. state or not.
reportonly flag is used for operations like bisect where we just reportonly flag is used for operations like bisect where we just
need to detect the operation using 'hg status --verbose' need to detect the operation using 'hg status --verbose'
continueflag is a boolean determines whether or not a command supports continueflag is a boolean determines whether or not a command supports
`--continue` option or not. `--continue` option or not.
stopflag is a boolean that determines whether or not a command supports stopflag is a boolean that determines whether or not a command supports
--stop flag --stop flag
cmdmsg is used to pass a different status message in case standard cmdmsg is used to pass a different status message in case standard
message of the format "abort: cmdname in progress" is not desired. message of the format "abort: cmdname in progress" is not desired.
cmdhint is used to pass a different hint message in case standard cmdhint is used to pass a different hint message in case standard
message of the format "To continue: hg cmdname --continue message of the format "To continue: hg cmdname --continue
To abort: hg cmdname --abort" is not desired. To abort: hg cmdname --abort" is not desired.
statushint is used to pass a different status message in case standard statushint is used to pass a different status message in case standard
message of the format ('To continue: hg cmdname --continue' message of the format ('To continue: hg cmdname --continue'
'To abort: hg cmdname --abort') is not desired 'To abort: hg cmdname --abort') is not desired
abortfunc stores the function required to abort an unfinished state. 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, statecheckobj = _statecheck(opname, fname, clearable, allowcommit,
reportonly, continueflag, stopflag, cmdmsg, reportonly, continueflag, stopflag, cmdmsg,
cmdhint, statushint, abortfunc) cmdhint, statushint, abortfunc, continuefunc)
if opname == 'merge': if opname == 'merge':
_unfinishedstates.append(statecheckobj) _unfinishedstates.append(statecheckobj)
else: else:
_unfinishedstates.insert(0, statecheckobj) _unfinishedstates.insert(0, statecheckobj)
addunfinished( addunfinished(
'update', fname='updatestate', clearable=True, 'update', fname='updatestate', clearable=True,
cmdmsg=_('last update was interrupted'), cmdmsg=_('last update was interrupted'),

tests/test-completion.t

bookmarks bookmarks
branch branch
branches branches
bundle bundle
cat cat
clone clone
commit commit
config config
continue
copy copy
diff diff
export export
files files
forget forget
graft graft
grep grep
heads heads
bookmarks: force, rev, delete, rename, inactive, list, template bookmarks: force, rev, delete, rename, inactive, list, template
branch: force, clean, rev branch: force, clean, rev
branches: active, closed, rev, template branches: active, closed, rev, template
bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
cat: output, rev, decode, include, exclude, template cat: output, rev, decode, include, exclude, template
clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure 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 commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos
config: untrusted, edit, local, global, template config: untrusted, edit, local, global, template
continue: dry-run
copy: after, force, include, exclude, dry-run copy: after, force, include, exclude, dry-run
debugancestor: debugancestor:
debugapplystreamclonebundle: debugapplystreamclonebundle:
debugbuilddag: mergeable-file, overwritten-file, new-file debugbuilddag: mergeable-file, overwritten-file, new-file
debugbundle: all, part-type, spec debugbundle: all, part-type, spec
debugcapabilities: debugcapabilities:
debugcheckstate: debugcheckstate:
debugcolor: style debugcolor: style

tests/test-help.t

basic commands: basic commands:
abort abort an unfinished operation (EXPERIMENTAL) abort abort an unfinished operation (EXPERIMENTAL)
add add the specified files on the next commit add add the specified files on the next commit
annotate, blame annotate, blame
show changeset information by line for each file show changeset information by line for each file
clone make a copy of an existing repository clone make a copy of an existing repository
commit, ci commit the specified files or all outstanding changes commit, ci commit the specified files or all outstanding changes
continue resumes an interrupted operation (EXPERIMENTAL)
diff diff repository (or selected files) diff diff repository (or selected files)
export dump the header and diffs for one or more changesets export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit forget forget the specified files on the next commit
init create a new repository in the given directory init create a new repository in the given directory
log, history show revision history of entire repository or files log, history show revision history of entire repository or files
merge merge another revision into working directory merge merge another revision into working directory
pull pull changes from the specified source pull pull changes from the specified source
push push changes to the specified destination push push changes to the specified destination
<tr><td> <tr><td>
<a href="/help/commit"> <a href="/help/commit">
commit commit
</a> </a>
</td><td> </td><td>
commit the specified files or all outstanding changes commit the specified files or all outstanding changes
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/continue">
continue
</a>
</td><td>
resumes an interrupted operation (EXPERIMENTAL)
</td></tr>
<tr><td>
<a href="/help/diff"> <a href="/help/diff">
diff diff
</a> </a>
</td><td> </td><td>
diff repository (or selected files) diff repository (or selected files)
</td></tr> </td></tr>
<tr><td> <tr><td>
<a href="/help/export"> <a href="/help/export">

tests/test-hgweb-json.t

"summary": "make a copy of an existing repository", "summary": "make a copy of an existing repository",
"topic": "clone" "topic": "clone"
}, },
{ {
"summary": "commit the specified files or all outstanding changes", "summary": "commit the specified files or all outstanding changes",
"topic": "commit" "topic": "commit"
}, },
{ {
"summary": "resumes an interrupted operation (EXPERIMENTAL)",
"topic": "continue"
},
{
"summary": "diff repository (or selected files)", "summary": "diff repository (or selected files)",
"topic": "diff" "topic": "diff"
}, },
{ {
"summary": "dump the header and diffs for one or more changesets", "summary": "dump the header and diffs for one or more changesets",
"topic": "export" "topic": "export"
}, },
{ {