| hg-reviewers |
This shifts the definitions and defaults of _statecheck()
class to addunfinished() registration method.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| """a utility class that deals with multistep operations like graft, | """a utility class that deals with multistep operations like graft, | ||||
| histedit, bisect, update etc and check whether such commands | histedit, bisect, update etc and check whether such commands | ||||
| are in an unfinished conditition or not and return appropriate message | are in an unfinished conditition or 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, allowcommit, reportonly, | ||||
| reportonly=False, continueflag=False, stopflag=False , | continueflag, stopflag, cmdmsg, cmdhint, statushint): | ||||
| cmdmsg="", cmdhint="", statushint=""): | |||||
| """opname is the name the command or operation | |||||
| fname is the file name in which data should be stored in .hg directory. | |||||
| It is None for merge command. | |||||
| clearable boolean determines whether or not interrupted states can be | |||||
| cleared by running `hg update -C .` which in turn deletes the | |||||
| state file. | |||||
| allowcommit boolean decides whether commit is allowed during interrupted | |||||
| state or not. | |||||
| reportonly flag is used for operations like bisect where we just | |||||
| need to detect the operation using 'hg status --verbose' | |||||
| continueflag is a boolean determines whether or not a command supports | |||||
| `--continue` option or not. | |||||
| stopflag is a boolean that determines whether or not a command supports | |||||
| --stop flag | |||||
| cmdmsg is used to pass a different status message in case standard | |||||
| message of the format "abort: cmdname in progress" is not desired. | |||||
| cmdhint is used to pass a different hint message in case standard | |||||
| message of the format "To continue: hg cmdname --continue | |||||
| To abort: hg cmdname --abort" is not desired. | |||||
| statushint 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 | |||||
| """ | |||||
| 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._statushint = statushint | |||||
| self._cmdmsg = cmdmsg | |||||
| self._stopflag = stopflag | |||||
| self._reportonly = reportonly | self._reportonly = reportonly | ||||
| self._continueflag = continueflag | self._continueflag = continueflag | ||||
| self._stopflag = stopflag | |||||
| self._cmdmsg = cmdmsg | |||||
| self._cmdhint = cmdhint | |||||
| self._statushint = statushint | |||||
| def statusmsg(self): | def statusmsg(self): | ||||
| """returns the hint message corresponding to the command for | """returns the hint message corresponding to the command for | ||||
| hg status --verbose | hg status --verbose | ||||
| """ | """ | ||||
| if not self._statushint: | if not self._statushint: | ||||
| hint = (_('To continue: hg %s --continue\n' | hint = (_('To continue: hg %s --continue\n' | ||||
| 'To abort: hg %s --abort') % (self._opname, | 'To abort: hg %s --abort') % (self._opname, | ||||
| if self._opname == 'merge': | if self._opname == 'merge': | ||||
| return len(repo[None].parents()) > 1 | return len(repo[None].parents()) > 1 | ||||
| else: | else: | ||||
| return repo.vfs.exists(self._fname) | return repo.vfs.exists(self._fname) | ||||
| # A list of statecheck objects for multistep operations like graft. | # A list of statecheck objects for multistep operations like graft. | ||||
| _unfinishedstates = [] | _unfinishedstates = [] | ||||
| def addunfinished(opname, **kwargs): | def addunfinished(opname, fname, clearable=False, allowcommit=False, | ||||
| reportonly=False, continueflag=False, stopflag=False, | |||||
| cmdmsg="", cmdhint="", statushint=""): | |||||
| """this registers a new command or operation to unfinishedstates | """this registers a new command or operation to unfinishedstates | ||||
| opname is the name the command or operation | |||||
| fname is the file name in which data should be stored in .hg directory. | |||||
| It is None for merge command. | |||||
| clearable boolean determines whether or not interrupted states can be | |||||
| cleared by running `hg update -C .` which in turn deletes the | |||||
| state file. | |||||
| allowcommit boolean decides whether commit is allowed during interrupted | |||||
| state or not. | |||||
| reportonly flag is used for operations like bisect where we just | |||||
| need to detect the operation using 'hg status --verbose' | |||||
| continueflag is a boolean determines whether or not a command supports | |||||
| `--continue` option or not. | |||||
| stopflag is a boolean that determines whether or not a command supports | |||||
| --stop flag | |||||
| cmdmsg is used to pass a different status message in case standard | |||||
| message of the format "abort: cmdname in progress" is not desired. | |||||
| cmdhint is used to pass a different hint message in case standard | |||||
| message of the format "To continue: hg cmdname --continue | |||||
| To abort: hg cmdname --abort" is not desired. | |||||
| statushint 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 | |||||
| """ | """ | ||||
| statecheckobj = _statecheck(opname, **kwargs) | statecheckobj = _statecheck(opname, fname, clearable, allowcommit, | ||||
| reportonly, continueflag, stopflag, cmdmsg, | |||||
| cmdhint, statushint) | |||||
| if opname == 'merge': | if opname == 'merge': | ||||
| _unfinishedstates.append(statecheckobj) | _unfinishedstates.append(statecheckobj) | ||||
| else: | else: | ||||
| _unfinishedstates.insert(0, statecheckobj) | _unfinishedstates.insert(0, statecheckobj) | ||||
| addunfinished( | addunfinished( | ||||
| 'graft', fname='graftstate', clearable=True, stopflag=True, | 'graft', fname='graftstate', clearable=True, stopflag=True, | ||||
| continueflag=True, | continueflag=True, | ||||