Mercurial > hg-stable
changeset 16671:05b55f5ff8d1
merge with main
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 11 May 2012 15:09:06 +0200 |
| parents | 8c3c9031f5aa (current diff) 052047753f7d (diff) |
| children | d046eb97d21e |
| files | |
| diffstat | 3 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/children.py Fri May 11 14:48:24 2012 +0200 +++ b/hgext/children.py Fri May 11 15:09:06 2012 +0200 @@ -8,7 +8,11 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -'''command to display child changesets''' +'''command to display child changesets (DEPRECATED) + +This extension is deprecated. You should use :hg:`log -r +"children(REV)"` instead. +''' from mercurial import cmdutil from mercurial.commands import templateopts
--- a/hgext/fetch.py Fri May 11 14:48:24 2012 +0200 +++ b/hgext/fetch.py Fri May 11 15:09:06 2012 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -'''pull, update and merge in one command''' +'''pull, update and merge in one command (DEPRECATED)''' from mercurial.i18n import _ from mercurial.node import nullid, short
--- a/mercurial/extensions.py Fri May 11 14:48:24 2012 +0200 +++ b/mercurial/extensions.py Fri May 11 15:09:06 2012 +0200 @@ -301,7 +301,7 @@ def disabledcmd(ui, cmd, strict=False): '''import disabled extensions until cmd is found. - returns (cmdname, extname, doc)''' + returns (cmdname, extname, module)''' paths = _disabledpaths(strip_init=True) if not paths: @@ -329,18 +329,19 @@ cmd = aliases[0] return (cmd, name, mod) + ext = None # first, search for an extension with the same name as the command path = paths.pop(cmd, None) if path: ext = findcmd(cmd, cmd, path) - if ext: - return ext - - # otherwise, interrogate each extension until there's a match - for name, path in paths.iteritems(): - ext = findcmd(cmd, name, path) - if ext: - return ext + if not ext: + # otherwise, interrogate each extension until there's a match + for name, path in paths.iteritems(): + ext = findcmd(cmd, name, path) + if ext: + break + if ext and 'DEPRECATED' not in ext.__doc__: + return ext raise error.UnknownCommand(cmd)