This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1330

hgext3rd: add hg continue and hg abort
Needs RevisionPublic

Authored by phillco on Nov 7 2017, 1:46 PM.
Tags
None
Subscribers
durham, quark

Details

Reviewers
quark
durham
Group Reviewers
Restricted Project
Summary

I hate having to remember and type which command I need to abort or continue.
Why make the user do that work? Life is short, and we already know what
statefiles exist and how to deal with them.

We could even have it loop until no statefiles are left, to deal with issues
where both a rebase state and a merge state are left.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Nov 7 2017, 1:46 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 7 2017, 1:46 PM
phillco updated this revision to Diff 3316.Nov 7 2017, 1:47 PM
phillco updated this revision to Diff 3317.
quark requested changes to this revision.Nov 7 2017, 5:01 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/continue.py
28

Instead of issuing a new dispatch request, you can lookup the command function using cmdutil.findcmd and execute that function directly.

hgext3rd/undo.py
127–129

Why is this change?

This revision now requires changes to proceed.Nov 7 2017, 5:01 PM
phillco added inline comments.Nov 7 2017, 5:04 PM
hgext3rd/continue.py
28

That might work better. I'll try it.

hgext3rd/undo.py
127–129

It might be obviated by your suggestion. I think it's related to dispatching twice. I'll debug it more if we actually want to go this way.

phillco updated this revision to Diff 3348.Nov 8 2017, 12:33 PM
quark added inline comments.Nov 8 2017, 2:28 PM
hgext3rd/continue.py
7

Add the from __future__ import absolute_import here.

20

Use from . import conflicttinfo instead.

durham requested changes to this revision.Nov 9 2017, 11:37 AM
durham added a subscriber: durham.

Probably needs a test once it's not a POC

hgext3rd/conflictinfo.py
68

Is merge/state used in any case other than hg merge? I have this feeling it is? If so, update --clean could lose user data and I don't think it's necessarily clear that 'hg abort' would do that.

hgext3rd/continue.py
34

Can we print a message saying what we're continueing/aborting? Like "continuing rebase (via hg rebase --continue) ..." or "aborting merge (via hg update --clean) ...". That way users know what action is being continued and knows what actually happening so they can figure out how to undo it if necessary.

This revision now requires changes to proceed.Nov 9 2017, 11:37 AM
phillco added inline comments.Nov 9 2017, 12:15 PM
hgext3rd/conflictinfo.py
68

Yeh, that's fair. It's a shame merge (the command) doesn't have a distinct statefile from merge.update (the function). Since we don't need to support the hg merge case at FB, I'll just have it detect the merge state file and print something in that case.

phillco edited the summary of this revision. (Show Details)Dec 13 2017, 7:05 PM

Revision Contents
Changeset List

PathPackages
Mhgext3rd/conflictinfo.py (12 lines)
AMhgext3rd/continue.py (48 lines)
Mhgext3rd/undo.py (3 lines)

Diff 3348

hgext3rd/conflictinfo.py

'to_continue': 'graft --continue', 'to_continue': 'graft --continue',
'to_abort': 'graft --abort'}], 'to_abort': 'graft --abort'}],
['updatestate', {'cmd': 'update', ['updatestate', {'cmd': 'update',
'to_continue': 'update', 'to_continue': 'update',
'to_abort': 'update --clean'}], 'to_abort': 'update --clean'}],
['rebasestate', {'cmd': 'rebase', ['rebasestate', {'cmd': 'rebase',
'to_continue': 'rebase --continue', 'to_continue': 'rebase --continue',
'to_abort': 'rebase --abort'}], 'to_abort': 'rebase --abort'}],
['merge/state', {'cmd': 'merge',
'to_continue': 'merge --continue',
'to_abort': 'update --clean'}],
['shelvedstate', {'cmd': 'unshelve', ['shelvedstate', {'cmd': 'unshelve',
'to_continue': 'unshelve --continue', 'to_continue': 'unshelve --continue',
'to_abort': 'unshelve --abort'}], 'to_abort': 'unshelve --abort'}],
['histedit-state', {'cmd': 'histedit', ['histedit-state', {'cmd': 'histedit',
'to_continue': 'histedit --continue', 'to_continue': 'histedit --continue',
'to_abort': 'histedit --abort'}], 'to_abort': 'histedit --abort'}],
# merge should be last, because some of the above leave their own state and
# a merge state in some pathological cases, and need to be aborted first.
['merge/state', {'cmd': 'merge',
'to_continue': 'merge --continue',
'to_abort': 'update --clean'}],
durhamUnsubmitted
Not Done

Is merge/state used in any case other than hg merge? I have this feeling it is? If so, update --clean could lose user data and I don't think it's necessarily clear that 'hg abort' would do that.

durham: Is merge/state used in any case other than hg merge? I have this feeling it is? If so, update…
phillcoAuthorUnsubmitted
Not Done

Yeh, that's fair. It's a shame merge (the command) doesn't have a distinct statefile from merge.update (the function). Since we don't need to support the hg merge case at FB, I'll just have it detect the merge state file and print something in that case.

phillco: Yeh, that's fair. It's a shame merge (the command) doesn't have a distinct statefile from merge.
] ]
def extsetup(ui): def extsetup(ui):
extensions.wrapcommand(commands.table, 'resolve', _resolve) extensions.wrapcommand(commands.table, 'resolve', _resolve)
# Returns which command got us into the conflicted merge state. Since these # Returns which command got us into the conflicted merge state. Since these
# states are mutually exclusive, we can use the existence of any one statefile # states are mutually exclusive, we can use the existence of any one statefile
# as proof of culpability. # as proof of culpability.
def _findconflictcommand(repo): def findconflictcommand(repo):
for path, data in CONFLICTSTATES: for path, data in CONFLICTSTATES:
if repo.vfs.exists(path): if repo.vfs.exists(path):
return data return data
return None return None
# To become a block in commands.py/resolve(). # To become a block in commands.py/resolve().
def _resolve(orig, ui, repo, *pats, **opts): def _resolve(orig, ui, repo, *pats, **opts):
# This block is duplicated from commands.py to maintain behavior. # This block is duplicated from commands.py to maintain behavior.
info = _summarizefileconflicts(mergestate, path, workingctx) info = _summarizefileconflicts(mergestate, path, workingctx)
if info is not None: if info is not None:
fileconflicts.append(info) fileconflicts.append(info)
info = _summarizepathconflicts(mergestate, path) info = _summarizepathconflicts(mergestate, path)
if info is not None: if info is not None:
pathconflicts.append(info) pathconflicts.append(info)
cmd = _findconflictcommand(repo) cmd = findconflictcommand(repo)
formatter.startitem() formatter.startitem()
formatter.write('conflicts', '%s\n', fileconflicts) formatter.write('conflicts', '%s\n', fileconflicts)
formatter.write('pathconflicts', '%s\n', pathconflicts) formatter.write('pathconflicts', '%s\n', pathconflicts)
formatter.write('command', '%s\n', _findconflictcommand(repo)) formatter.write('command', '%s\n', _findconflictcommand(repo))
if cmd: if cmd:
formatter.write('command', '%s\n', cmd['cmd']) # Deprecated formatter.write('command', '%s\n', cmd['cmd']) # Deprecated
formatter.write('command_details', '%s\n', cmd) formatter.write('command_details', '%s\n', cmd)
else: else:

hgext3rd/continue.py

  • This file was added.
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""continues an interrupted command (figures out what command you interupted)
quarkUnsubmitted
Not Done

Add the from __future__ import absolute_import here.

quark: Add the `from __future__ import absolute_import` here.
"""
from mercurial import (
cmdutil,
dispatch,
error,
extensions,
registrar
)
from mercurial.i18n import _
from hgext3rd.conflictinfo import findconflictcommand
quarkUnsubmitted
Not Done

Use from . import conflicttinfo instead.

quark: Use `from . import conflicttinfo` instead.
cmdtable = {}
command = registrar.command(cmdtable)
testedwith = 'ships-with-fb-hgext'
def _rerun(ui, repo, cmd):
req = dispatch.request(cmd, ui=ui, repo=repo)
dispatch.dispatch(req)
quarkUnsubmitted
Not Done

Instead of issuing a new dispatch request, you can lookup the command function using cmdutil.findcmd and execute that function directly.

quark: Instead of issuing a new dispatch request, you can lookup the command function using `cmdutil.
phillcoAuthorUnsubmitted
Not Done

That might work better. I'll try it.

phillco: That might work better. I'll try it.
@command('continue', [], _('hg continue'))
def continuecmd(ui, repo, *revs, **opts):
"""continues an interrupted command
"""
cmd = findconflictcommand(repo)
durhamUnsubmitted
Not Done

Can we print a message saying what we're continueing/aborting? Like "continuing rebase (via hg rebase --continue) ..." or "aborting merge (via hg update --clean) ...". That way users know what action is being continued and knows what actually happening so they can figure out how to undo it if necessary.

durham: Can we print a message saying what we're continueing/aborting? Like "continuing rebase (via hg…
if cmd is None:
raise error.Abort(_('nothing to continue'))
_rerun(ui, repo, cmd['to_continue'].split(' '))
@command('abort', [], _('hg abort'))
def abortcmd(ui, repo, *revs, **opts):
"""aborts an interrupted command
"""
cmd = findconflictcommand(repo)
if cmd is None:
raise error.Abort(_('nothing to abort'))
_rerun(ui, repo, cmd['to_abort'].split(' '))

hgext3rd/undo.py

finally: finally:
# record changes to repo # record changes to repo
if triggered and triggered[0]: if triggered and triggered[0]:
# invalidatevolatilesets should really be done in Mercurial's # invalidatevolatilesets should really be done in Mercurial's
# transaction handling code. We workaround it here before that # transaction handling code. We workaround it here before that
# upstream change. # upstream change.
repo.invalidatevolatilesets() repo.invalidatevolatilesets()
safelog(repo, command) safelog(repo, command)
if '_undologactive' in os.environ:
del os.environ['_undologactive'] del os.environ['_undologactive']
quarkUnsubmitted
Not Done

Why is this change?

quark: Why is this change?
phillcoAuthorUnsubmitted
Not Done

It might be obviated by your suggestion. I think it's related to dispatching twice. I'll debug it more if we actually want to go this way.

phillco: It might be obviated by your suggestion. I think it's related to dispatching twice. I'll debug…
return result return result
# Write: Log control # Write: Log control
def safelog(repo, command): def safelog(repo, command):
'''boilerplate for log command '''boilerplate for log command
input: input: