This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6504

statecheck: fix for hint message format
AbandonedPublic

Authored by taapas1128 on Jun 8 2019, 4:58 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Summary

This makes two separate message formats for checkunfinished() and
getrepostate() as there were previously present.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jun 8 2019, 4:58 PM
taapas1128 updated this revision to Diff 15406.Jun 9 2019, 8:53 AM
taapas1128 updated this revision to Diff 15409.Jun 9 2019, 10:48 AM
taapas1128 updated this revision to Diff 15427.Jun 10 2019, 1:55 PM
taapas1128 updated this revision to Diff 15430.Jun 10 2019, 2:33 PM
taapas1128 updated this revision to Diff 15441.Jun 11 2019, 9:48 AM
taapas1128 updated this revision to Diff 15481.Jun 13 2019, 9:19 AM
taapas1128 updated this revision to Diff 15498.Jun 13 2019, 4:44 PM
taapas1128 updated this revision to Diff 15500.Jun 13 2019, 4:51 PM
taapas1128 updated this revision to Diff 15502.Jun 13 2019, 5:42 PM
taapas1128 updated this revision to Diff 15504.Jun 13 2019, 5:45 PM
taapas1128 updated this revision to Diff 15507.Jun 14 2019, 4:34 AM
taapas1128 updated this revision to Diff 15530.Jun 15 2019, 6:40 AM
taapas1128 updated this revision to Diff 15538.Jun 17 2019, 7:37 AM
taapas1128 updated this revision to Diff 15540.Jun 17 2019, 7:54 AM
taapas1128 updated this revision to Diff 15542.Jun 17 2019, 8:06 AM
taapas1128 updated this revision to Diff 15554.Jun 17 2019, 2:09 PM
taapas1128 updated this revision to Diff 15557.Jun 17 2019, 5:30 PM
taapas1128 updated this revision to Diff 15566.Jun 18 2019, 3:47 AM
pulkit added a subscriber: pulkit.Jun 18 2019, 7:21 AM

This changes the old message format used by unfinishedstates
to the format which was used by STATES.

The commit message seems outdated.

Also I think we can fold this one in previous patch so that there are no un-necessary test changes. @martinvonz what do you think?

taapas1128 retitled this revision from statecheck: changed hint message format to statecheck: fix for hint message format.Jun 18 2019, 8:24 AM
taapas1128 edited the summary of this revision. (Show Details)
taapas1128 updated this revision to Diff 15571.
taapas1128 updated this revision to Diff 15585.Jun 18 2019, 1:06 PM
taapas1128 abandoned this revision.Jun 18 2019, 2:42 PM

Revision Contents
Changeset List

Diff 15557

hgext/transplant.py

return n and nodemod.hex(n) or '' return n and nodemod.hex(n) or ''
def extsetup(ui): def extsetup(ui):
statemod.addunfinished ( statemod.addunfinished (
'transplant', 'transplant',
fname = 'transplant/journal', fname = 'transplant/journal',
clearable = True, clearable = True,
allowcommit = False, allowcommit = False,
statushint = _('To continue: hg transplant --continue\n'
'To abort: hg update'),
cmdhint = _("use 'hg transplant --continue' or 'hg update' to abort") cmdhint = _("use 'hg transplant --continue' or 'hg update' to abort")
) )
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = [revsettransplanted, kwtransplanted] i18nfunctions = [revsettransplanted, kwtransplanted]

mercurial/state.py

histedit, bisect, update etc and check whether such commands histedit, bisect, update etc and check whether such commands
are in an unfinished conditition of not and return appropriate message are in an unfinished conditition of 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=False, allowcommit=False, def __init__(self, opname, fname, clearable=False, allowcommit=False,
cmdmsg="", cmdhint=""): cmdmsg="", cmdhint="", statushint="", stopflag=False):
"""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.
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 use 'hg cmdname --continue' or message of the format "To continue: hg cmdname --continue
'hg cmdname --abort'" is not desired. To abort: hg cmdname --abort" is not desired.
status hint is used to pass a different status message in case standard
message of the format ('To continue: hg cmdname --continue'
'To abort: hg cmdname --abort') is not desired
stopflag is a boolean that determines whether or not a command supports
--stop flag
""" """
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._cmdhint = cmdhint self._cmdhint = cmdhint
self._statushint = statushint
self._cmdmsg = cmdmsg self._cmdmsg = cmdmsg
self._stopflag = stopflag
def hint(self): def hint(self, status=False):
"""returns the hint message corresponding to the command""" """returns the hint message corresponding to the command"""
if status:
if not self._statushint:
hint = (_('To continue: hg %s --continue\n'
'To abort: hg %s --abort') % (self._opname,
self._opname))
if self._stopflag:
hint = hint + (_('\nTo stop: hg %s --stop') %
(self._opname))
return hint
return self._statushint
else:
if not self._cmdhint: if not self._cmdhint:
return (_("use 'hg %s --continue' or 'hg %s --abort'") % return (_("use 'hg %s --continue' or 'hg %s --abort'") %
(self._opname, self._opname)) (self._opname, self._opname))
return self._cmdhint return self._cmdhint
def msg(self): def msg(self):
"""returns the status message corresponding to the command""" """returns the status message corresponding to the command"""
if not self._cmdmsg: if not self._cmdmsg:
return _('%s in progress') % (self._opname) return _('%s in progress') % (self._opname)
return self._cmdmsg return self._cmdmsg
def isunfinished(self, repo): def isunfinished(self, repo):
else: else:
_unfinishedstates.insert(0, statecheckobj) _unfinishedstates.insert(0, statecheckobj)
addunfinished( addunfinished(
'graft', 'graft',
fname = 'graftstate', fname = 'graftstate',
clearable = True, clearable = True,
allowcommit = False, allowcommit = False,
cmdhint = _("use 'hg graft --continue' or 'hg graft --stop' to stop") cmdhint = _("use 'hg graft --continue' or 'hg graft --stop' to stop"),
stopflag = True
) )
addunfinished( addunfinished(
'update', 'update',
fname = 'updatestate', fname = 'updatestate',
clearable = True, clearable = True,
allowcommit = False, allowcommit = False,
cmdmsg = _('last update was interrupted'), cmdmsg = _('last update was interrupted'),
cmdhint = _("use 'hg update' to get a consistent checkout") cmdhint = _("use 'hg update' to get a consistent checkout")
) )
addunfinished( addunfinished(
'bisect', 'bisect',
fname = 'bisect.state', fname = 'bisect.state',
clearable = False, clearable = False,
allowcommit = True, allowcommit = True,
cmdhint = _('To mark the changeset good: hg bisect --good\n' statushint = _('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')
) )
addunfinished( addunfinished(
'merge', 'merge',
fname = None, fname = None,
clearable = True, clearable = True,
allowcommit = True, allowcommit = True,
cmdhint = _('To continue: hg commit\n' statushint = _('To continue: hg commit\n'
'To abort: hg merge --abort') 'To abort: hg merge --abort'),
cmdhint = _("use 'hg commit' or 'hg merge --abort'")
) )
def checkunfinished(repo, commit=False, mergeskip=False): def checkunfinished(repo, commit=False, mergeskip=False):
'''Look for an unfinished multistep operation, like graft, and abort '''Look for an unfinished multistep operation, like graft, and abort
if found. It's probably good to check this right before if found. It's probably good to check this right before
bailifchanged(). bailifchanged().
''' '''
# Check for non-clearable states first, so things like rebase will take # Check for non-clearable states first, so things like rebase will take
def getrepostate(repo): def getrepostate(repo):
# experimental config: commands.status.skipstates # experimental config: commands.status.skipstates
skip = set(repo.ui.configlist('commands', 'status.skipstates')) skip = set(repo.ui.configlist('commands', 'status.skipstates'))
for state in _unfinishedstates: for state in _unfinishedstates:
if state._opname in skip: if state._opname in skip:
continue continue
if state.isunfinished(repo): if state.isunfinished(repo):
return (state._opname, state.hint()) return (state._opname, state.hint(status=True))

tests/test-graft.t

# The repository is in an unfinished *graft* state. # The repository is in an unfinished *graft* state.
# 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
# use 'hg graft --continue' or 'hg graft --stop' to stop # To continue: hg graft --continue
# To abort: hg graft --abort
# To stop: hg graft --stop
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]

tests/test-histedit-fold.t

# The repository is in an unfinished *histedit* state. # The repository is in an unfinished *histedit* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# file # file
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg histedit --continue' or 'hg histedit --abort' # To continue: hg histedit --continue
# To abort: hg histedit --abort
$ hg resolve -l $ hg resolve -l
U file U file
$ hg revert -r 'p1()' file $ hg revert -r 'p1()' file
$ hg resolve --mark file $ hg resolve --mark file
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --continue $ hg histedit --continue

tests/test-rebase-conflicts.t

# The repository is in an unfinished *rebase* state. # The repository is in an unfinished *rebase* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# common # common
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg rebase --continue' or 'hg rebase --abort' # To continue: hg rebase --continue
# To abort: hg rebase --abort
Try to continue without solving the conflict: Try to continue without solving the conflict:
$ hg rebase --continue $ hg rebase --continue
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [255]

tests/test-shelve.t

# The repository is in an unfinished *unshelve* state. # The repository is in an unfinished *unshelve* state.
# Unresolved merge conflicts: # Unresolved merge conflicts:
# #
# a/a # a/a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
# use 'hg unshelve --continue' or 'hg unshelve --abort' # To continue: hg unshelve --continue
# To abort: hg unshelve --abort
ensure that we have a merge with unresolved conflicts ensure that we have a merge with unresolved conflicts
#if phasebased #if phasebased
$ hg heads -q --template '{rev}\n' $ hg heads -q --template '{rev}\n'
8 8
5 5
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: a summary: a
-- trying to pull in the shelve bits -- trying to pull in the shelve bits
-- unshelve should abort otherwise, it'll eat my second parent. -- unshelve should abort otherwise, it'll eat my second parent.
$ hg unshelve $ hg unshelve
abort: merge in progress abort: merge in progress
(To continue: hg commit (use 'hg commit' or 'hg merge --abort')
To abort: hg merge --abort)
[255] [255]
$ cd .. $ cd ..

tests/test-strip.t

parent: 1:ef3a871183d7 parent: 1:ef3a871183d7
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: c summary: c
##strip not allowed with merge in progress ##strip not allowed with merge in progress
$ hg strip 4 $ hg strip 4
abort: merge in progress abort: merge in progress
(To continue: hg commit (use 'hg commit' or 'hg merge --abort')
To abort: hg merge --abort)
[255] [255]
##strip allowed --force with merge in progress ##strip allowed --force with merge in progress
$ hg strip 4 --force $ hg strip 4 --force
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
after strip of merge parent after strip of merge parent

tests/test-transplant.t

$ hg ci -Amb1 -d '0 0' $ hg ci -Amb1 -d '0 0'
adding b1 adding b1
created new head created new head
$ hg merge 1 $ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg transplant 1 $ hg transplant 1
abort: merge in progress abort: merge in progress
(To continue: hg commit (use 'hg commit' or 'hg merge --abort')
To abort: hg merge --abort)
[255] [255]
$ hg up -qC tip $ hg up -qC tip
$ echo b0 > b1 $ echo b0 > b1
$ hg transplant 1 $ hg transplant 1
abort: uncommitted changes abort: uncommitted changes
[255] [255]
$ hg up -qC tip $ hg up -qC tip
$ echo b2 > b2 $ echo b2 > b2
(use 'hg transplant --continue' or 'hg update' to abort) (use 'hg transplant --continue' or 'hg update' to abort)
[255] [255]
$ hg status -v $ hg status -v
A bar A bar
? baz.rej ? baz.rej
? foo.rej ? foo.rej
# The repository is in an unfinished *transplant* state. # The repository is in an unfinished *transplant* state.
# use 'hg transplant --continue' or 'hg update' to abort # To continue: hg transplant --continue
# To abort: hg update
$ echo fixed > baz $ echo fixed > baz
$ hg transplant --continue $ hg transplant --continue
9d6d6b5a8275 transplanted as d80c49962290 9d6d6b5a8275 transplanted as d80c49962290
applying 1dab759070cf applying 1dab759070cf
1dab759070cf transplanted to aa0ffe6bd5ae 1dab759070cf transplanted to aa0ffe6bd5ae
$ cd .. $ cd ..