Mercurial > hg
view hgext/alias.py @ 6858:8f256bf98219
Add support for multiple possible bisect results (issue1228, issue1182)
The real reason for both issue is that bisect can not handle cases where there
are multiple possibilities for the result.
Example (from issue1228):
rev 0 -> good
rev 1 -> skipped
rev 2 -> skipped
rev 3 -> skipped
rev 4 -> bad
Note that this patch does not only fix the reported Assertion Error but also
the problem of a non converging bisect:
hg init
for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done
hg bisect -b 2
hg bisect -g 0
hg bisect -s
From this state on, you can:
a) mark as bad forever (non converging!)
b) mark as good to get an inconsistent state
c) skip for the Assertion Error
Minor description and code edits by pmezard.
author | Bernhard Leiner <bleiner@gmail.com> |
---|---|
date | Sat, 02 Aug 2008 22:10:10 +0200 |
parents | 18a9fbb5cd78 |
children | f7d545a866e8 |
line wrap: on
line source
# Copyright (C) 2007 Brendan Cully <brendan@kublai.com> # This file is published under the GNU GPL. '''allow user-defined command aliases To use, create entries in your hgrc of the form [alias] mycmd = cmd --args ''' from mercurial.cmdutil import findcmd, UnknownCommand, AmbiguousCommand from mercurial import commands cmdtable = {} class RecursiveCommand(Exception): pass class lazycommand(object): '''defer command lookup until needed, so that extensions loaded after alias can be aliased''' def __init__(self, ui, name, target): self._ui = ui self._name = name self._target = target self._cmd = None def __len__(self): self._resolve() return len(self._cmd) def __getitem__(self, key): self._resolve() return self._cmd[key] def __iter__(self): self._resolve() return self._cmd.__iter__() def _resolve(self): if self._cmd is not None: return try: self._cmd = findcmd(self._ui, self._target, commands.table)[1] if self._cmd == self: raise RecursiveCommand() if self._target in commands.norepo.split(' '): commands.norepo += ' %s' % self._name return except UnknownCommand: msg = '*** [alias] %s: command %s is unknown' % \ (self._name, self._target) except AmbiguousCommand: msg = '*** [alias] %s: command %s is ambiguous' % \ (self._name, self._target) except RecursiveCommand: msg = '*** [alias] %s: circular dependency on %s' % \ (self._name, self._target) def nocmd(*args, **opts): self._ui.warn(msg + '\n') return 1 nocmd.__doc__ = msg self._cmd = (nocmd, [], '') commands.norepo += ' %s' % self._name def uisetup(ui): for cmd, target in ui.configitems('alias'): if not target: ui.warn('*** [alias] %s: no definition\n' % cmd) continue args = target.split(' ') tcmd = args.pop(0) if args: ui.setconfig('defaults', cmd, ' '.join(args)) cmdtable[cmd] = lazycommand(ui, cmd, tcmd)