# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1336741746 -7200
# Node ID 05b55f5ff8d1c65a3934cbb7b6aa736638fa1c52
# Parent  8c3c9031f5aaf14153821bfeb89bc5f0e9835de6# Parent  052047753f7d0bb498339b14ce389e39cfeb20dc
merge with main

diff -r 8c3c9031f5aa -r 05b55f5ff8d1 hgext/children.py
--- 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
diff -r 8c3c9031f5aa -r 05b55f5ff8d1 hgext/fetch.py
--- 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
diff -r 8c3c9031f5aa -r 05b55f5ff8d1 mercurial/extensions.py
--- 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)