This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4168

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

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcf68e2649e0a: status: advertise --abort instead of 'update -C .' to abort a merge
Summary

status has a part where it shows the conflict information and how to continue or
abort. Couple of release ago, we got merge --abort and we should advertise that
instead of 'hg update -C .' which is kind of ugly.

I know we need to unify the logic here.

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.

Revision Contents
Changeset List

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

Diff 10129

mercurial/cmdutil.py

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', _updatecleanmsg())
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', _updatecleanmsg()) 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'
'To abort: hg bisect --reset\n') 'To abort: hg bisect --reset\n')
return _commentlines(msg) return _commentlines(msg)
def fileexistspredicate(filename): def fileexistspredicate(filename):

tests/test-conflict.t

# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a # a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# To continue: hg commit # To continue: hg commit
# To abort: hg update --clean . (warning: this will discard uncommitted changes) # To abort: hg merge --abort
$ cat a $ cat a
Small Mathematical Series. Small Mathematical Series.
1 1
2 2
3 3
<<<<<<< working copy: 618808747361 - test: branch2 <<<<<<< working copy: 618808747361 - test: branch2