mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
merge with main
This commit is contained in:
commit
efd8c0f868
@ -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
|
||||
|
@ -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
|
||||
|
@ -301,7 +301,7 @@ def disabledext(name):
|
||||
|
||||
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 @@ def disabledcmd(ui, cmd, strict=False):
|
||||
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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user