facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

[morestatus] aborting a graft requires "hg update --clean"

Browse Source 
Summary: Show that users should run "hg update --clean ." instead of just "hg update ."

Test Plan:
Ran "hg status" in the middle of a graft with unresolved merge conflicts, and
saw the updated message.

Reviewers: durham, rmcelroy

Subscribers: net-systems-diffs@, yogeshwer, mjpieters

Differential Revision: https://phabricator.fb.com/D3002215
This commit is contained in:
Adam Simpkins 2016-03-02 15:14:03 -08:00
parent 2e7cda45b5
commit 0e86b1b621
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
morestatus.py
View File

@ -18,6 +18,8 @@ from mercurial import scmutil
UPDATEARGS = 'updateargs'
HG_UPDATE_CLEAN = ('hg update --clean . (warning: this will '
'erase all uncommitted changed)')
def prefixlines(raw):
@ -62,7 +64,7 @@ def unshelvemsg(repo, ui):
def graftmsg(repo, ui):
# tweakdefaults requires `update` to have a rev hence the `.`
helpmessage(ui, 'hg graft --continue', 'hg update .')
helpmessage(ui, 'hg graft --continue', HG_UPDATE_CLEAN)
def updatemsg(repo, ui):
previousargs = repo.vfs.tryread(UPDATEARGS)
@ -75,8 +77,7 @@ def updatemsg(repo, ui):
def mergemsg(repo, ui):
# tweakdefaults requires `update` to have a rev hence the `.`
helpmessage(ui, 'hg commit', 'hg update --clean . (warning: this will '
'erase all uncommitted changed)')
helpmessage(ui, 'hg commit', HG_UPDATE_CLEAN)
def bisectmsg(repo, ui):
msg = _('To mark the commit good: hg bisect --good\n'