This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3687

shelve: check the actual shelvestate in morestatus
ClosedPublic

Authored by lothiraldan on Jun 5 2018, 6:56 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8459e8d2f729: shelve: check the actual shelvestate in morestatus
Summary

The rebasestate is a lower level implementation details that we are trying to
remove.

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

lothiraldan created this revision.Jun 5 2018, 6:56 AM
durin42 accepted this revision.Jun 25 2018, 10:50 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:50 AM
Closed by commit rHG8459e8d2f729: shelve: check the actual shelvestate in morestatus (authored by lothiraldan). · Explain WhyJun 25 2018, 11:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 9288

mercurial/cmdutil.py

def _mergepredicate(repo): def _mergepredicate(repo):
return len(repo[None].parents()) > 1 return len(repo[None].parents()) > 1
STATES = ( STATES = (
# (state, predicate to detect states, helpful message function) # (state, predicate to detect states, helpful message function)
('histedit', fileexistspredicate('histedit-state'), _histeditmsg), ('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
('bisect', fileexistspredicate('bisect.state'), _bisectmsg), ('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
('graft', fileexistspredicate('graftstate'), _graftmsg), ('graft', fileexistspredicate('graftstate'), _graftmsg),
('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg), ('unshelve', fileexistspredicate('shelvedstate'), _unshelvemsg),
('rebase', fileexistspredicate('rebasestate'), _rebasemsg), ('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
# The merge state is part of a list that will be iterated over. # The merge state is part of a list that will be iterated over.
# They need to be last because some of the other unfinished states may also # They need to be last because some of the other unfinished states may also
# be in a merge or update state (eg. rebase, histedit, graft, etc). # be in a merge or update state (eg. rebase, histedit, graft, etc).
# We want those to have priority. # We want those to have priority.
('merge', _mergepredicate, _mergemsg), ('merge', _mergepredicate, _mergemsg),
) )