Mercurial > hg
diff mercurial/cmdutil.py @ 42530:dc3fdd1b5af4
state: created new class statecheck to handle unfinishedstates
For the purpose of handling states for various multistep operations like
`hg graft`, `hg histedit`, `hg bisect` et al a new class called statecheck
is created .This will help in having a unified approach towards these commands
and handle them with ease.
The class takes in 4 basic arguments which include the name of the command, the
name of the state file associated with it , clearable flag , allowcommit flag.
This also also adds the support of`checkunfinished()` and
`clearunfinished()` to the class.
Tests remain unchanged.
Differential Revision: https://phab.mercurial-scm.org/D6501
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Sun, 09 Jun 2019 00:43:36 +0530 |
parents | 5f2f6912c9e6 |
children | 5bddd2244814 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Jun 08 23:43:53 2019 +0530 +++ b/mercurial/cmdutil.py Sun Jun 09 00:43:36 2019 +0530 @@ -3314,6 +3314,7 @@ # - (desturl, destbranch, destpeer, outgoing) summaryremotehooks = util.hooks() + def checkunfinished(repo, commit=False): '''Look for an unfinished multistep operation, like graft, and abort if found. It's probably good to check this right before @@ -3321,28 +3322,29 @@ ''' # Check for non-clearable states first, so things like rebase will take # precedence over update. - for f, clearable, allowcommit, msg, hint in statemod.unfinishedstates: - if clearable or (commit and allowcommit): + for state in statemod._unfinishedstates: + if state._clearable or (commit and state._allowcommit): continue - if repo.vfs.exists(f): - raise error.Abort(msg, hint=hint) - - for f, clearable, allowcommit, msg, hint in statemod.unfinishedstates: - if not clearable or (commit and allowcommit): + if state.isunfinished(repo): + raise error.Abort(state.msg(), hint=state.hint()) + + for s in statemod._unfinishedstates: + if not s._clearable or (commit and s._allowcommit): continue - if repo.vfs.exists(f): - raise error.Abort(msg, hint=hint) + if s.isunfinished(repo): + raise error.Abort(s.msg(), hint=s.hint()) def clearunfinished(repo): '''Check for unfinished operations (as above), and clear the ones that are clearable. ''' - for f, clearable, allowcommit, msg, hint in statemod.unfinishedstates: - if not clearable and repo.vfs.exists(f): - raise error.Abort(msg, hint=hint) - for f, clearable, allowcommit, msg, hint in statemod.unfinishedstates: - if clearable and repo.vfs.exists(f): - util.unlink(repo.vfs.join(f)) + for state in statemod._unfinishedstates: + if not state._clearable and state.isunfinished(repo): + raise error.Abort(state.msg(), hint=state.hint()) + + for s in statemod._unfinishedstates: + if s._clearable and s.isunfinished(repo): + util.unlink(repo.vfs.join(s._fname)) afterresolvedstates = [ ('graftstate',