This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6956

unfinishedstate: suggested `hg update .` (including `.`) to complete update
ClosedPublic

Authored by martinvonz on Oct 3 2019, 4:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8c4f32b907e6: unfinishedstate: suggested `hg update .` (including `.`) to complete update
Summary

hg update can update to a different and undesired commit. For users
who have commands.update.requiredest=yes, it's even an error to run
just `hg update.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Oct 3 2019, 4:18 PM
martinvonz added a commit: rHG8c4f32b907e6: unfinishedstate: suggested `hg update .` (including `.`) to complete update.Oct 4 2019, 10:32 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8c4f32b907e6: unfinishedstate: suggested `hg update .` (including `.`) to complete update (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
spectral added a subscriber: spectral.Oct 4 2019, 11:06 AM
spectral added inline comments.
mercurial/state.py
204

I wonder if it would be possible to portably quote the . so that users don't think it's just sitting on the end there. Something like hg update '.' If not, then we should surround the entire thing in quotes if possible, something like To continue: 'hg update .'

Thoughts?

martinvonz added inline comments.Oct 15 2019, 9:47 AM
mercurial/state.py
204

We often quote the whole command like you did in your second example. However, I don't really want to do that with all the commands here (e.g. the bisect commands a few lines down). We could quote just the '.', but I think it's already quite clear from the context that the . is part of the command -- the spaces before it makes it look like it's not part of a sentence.

Revision Contents
Changeset List

PathPackages
Mmercurial/state.py (2 lines)
Mtests/test-merge1.t (2 lines)

Diff 16788

mercurial/state.py

_unfinishedstates.append(statecheckobj) _unfinishedstates.append(statecheckobj)
else: else:
_unfinishedstates.insert(0, statecheckobj) _unfinishedstates.insert(0, statecheckobj)
addunfinished( addunfinished(
'update', fname='updatestate', clearable=True, 'update', fname='updatestate', clearable=True,
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"),
statushint=_("To continue: hg update") statushint=_("To continue: hg update .")
spectralUnsubmitted
Not Done

I wonder if it would be possible to portably quote the . so that users don't think it's just sitting on the end there. Something like hg update '.' If not, then we should surround the entire thing in quotes if possible, something like To continue: 'hg update .'

Thoughts?

spectral: I wonder if it would be possible to portably quote the `.` so that users don't think it's just…
martinvonzAuthorUnsubmitted
Done

We often quote the whole command like you did in your second example. However, I don't really want to do that with all the commands here (e.g. the bisect commands a few lines down). We could quote just the '.', but I think it's already quite clear from the context that the . is part of the command -- the spaces before it makes it look like it's not part of a sentence.

martinvonz: We often quote the whole command like you did in your second example. However, I don't really…
) )
addunfinished( addunfinished(
'bisect', fname='bisect.state', allowcommit=True, reportonly=True, 'bisect', fname='bisect.state', allowcommit=True, reportonly=True,
statushint=_('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')
) )
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.statusmsg()) return (state._opname, state.statusmsg())

tests/test-merge1.t

commit: 1 unknown (interrupted update) commit: 1 unknown (interrupted update)
update: 1 new changesets (update) update: 1 new changesets (update)
phases: 2 draft phases: 2 draft
Detect interrupted update by hg status --verbose Detect interrupted update by hg status --verbose
$ hg status -v $ hg status -v
? b/nonempty ? b/nonempty
# The repository is in an unfinished *update* state. # The repository is in an unfinished *update* state.
# To continue: hg update # To continue: hg update .
$ rm b/nonempty $ rm b/nonempty
$ hg up $ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg sum $ hg sum
parent: 1:b8bb4a988f25 tip parent: 1:b8bb4a988f25 tip