Mercurial > hg

changeset 14888:946f4381c1cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
alias: pass local ui to shell alias This avoids an additional config read
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Jul 2011 18:03:37 -0500
parents d6ba373c9a8f
children 28abca72c46c
files mercurial/dispatch.py
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dispatch.py	Fri Jul 15 16:06:54 2011 -0500
+++ b/mercurial/dispatch.py	Fri Jul 15 18:03:37 2011 -0500
@@ -481,7 +481,7 @@
 
     return path, lui
 
-def _checkshellalias(ui, args):
+def _checkshellalias(lui, ui, args):
     norepo = commands.norepo
     options = {}
 
@@ -493,8 +493,6 @@
     if not args:
         return
 
-    path, lui = _getlocal(ui, [options['repository']])
-
     cmdtable = commands.table.copy()
     addaliases(lui, cmdtable)
 
@@ -533,7 +531,7 @@
 
     # Now that we're operating in the right directory/repository with
     # the right config settings, check for shell aliases
-    shellaliasfn = _checkshellalias(ui, args)
+    shellaliasfn = _checkshellalias(lui, ui, args)
     if shellaliasfn:
         return shellaliasfn()