This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4169

status: advertise --abort instead of 'update -C .' to abort graft
ClosedPublic

Authored by pulkit on Aug 9 2018, 6:18 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5b04b6204931: status: advertise --abort instead of 'update -C .' to abort graft
Summary

Recent release got us a --abort flag for 'hg graft' command which is nice UI and
we should advertise that to stop the graft instead of 'update -C .' which is
kind of ugly.

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

pulkit created this revision.Aug 9 2018, 6:18 AM
Closed by commit rHG5b04b6204931: status: advertise --abort instead of 'update -C .' to abort graft (authored by pulkit). · Explain WhyAug 9 2018, 2:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)
Mtests/test-graft.t (2 lines)

Diff 10131

mercurial/cmdutil.py

return _helpmessage('hg unshelve --continue', 'hg unshelve --abort') return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')
def _updatecleanmsg(dest=None): def _updatecleanmsg(dest=None):
warning = _('warning: this will discard uncommitted changes') warning = _('warning: this will discard uncommitted changes')
return 'hg update --clean %s (%s)' % (dest or '.', warning) return 'hg update --clean %s (%s)' % (dest or '.', warning)
def _graftmsg(): def _graftmsg():
# tweakdefaults requires `update` to have a rev hence the `.` # tweakdefaults requires `update` to have a rev hence the `.`
return _helpmessage('hg graft --continue', _updatecleanmsg()) return _helpmessage('hg graft --continue', 'hg graft --abort')
def _mergemsg(): def _mergemsg():
# tweakdefaults requires `update` to have a rev hence the `.` # tweakdefaults requires `update` to have a rev hence the `.`
return _helpmessage('hg commit', 'hg merge --abort') return _helpmessage('hg commit', 'hg merge --abort')
def _bisectmsg(): def _bisectmsg():
msg = _('To mark the changeset good: hg bisect --good\n' msg = _('To mark the changeset good: hg bisect --good\n'
'To mark the changeset bad: hg bisect --bad\n' 'To mark the changeset bad: hg bisect --bad\n'

tests/test-graft.t

# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# e # e
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg graft --continue # To continue: hg graft --continue
# To abort: hg update --clean . (warning: this will discard uncommitted changes) # To abort: hg graft --abort
Commit while interrupted should fail: Commit while interrupted should fail:
$ hg ci -m 'commit interrupted graft' $ hg ci -m 'commit interrupted graft'
abort: graft in progress abort: graft in progress
(use 'hg graft --continue' or 'hg graft --stop' to stop) (use 'hg graft --continue' or 'hg graft --stop' to stop)
[255] [255]