# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1185032259 -7200
# Node ID d1bee415406e8922fbb0548edb513fd0afa07711
# Parent  c79e3fa6dc292a5ec2473ec7799b02a30859efc9# Parent  10afa3fab6b4a219cff732d5d2bee354ec4d1166
merge with crew-stable

diff --git a/mercurial/changelog.py b/mercurial/changelog.py
--- a/mercurial/changelog.py
+++ b/mercurial/changelog.py
@@ -42,7 +42,7 @@ class appender:
     def flush(self):
         pass
     def close(self):
-        close(self.fp)
+        self.fp.close()
 
     def seek(self, offset, whence=0):
         '''virtual file offset spans real file and data'''
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -316,7 +316,7 @@ def dispatch(ui, args, argv0=None):
         util._fallbackencoding = fallback
 
     fullargs = args
-    cmd, func, args, options, cmdoptions = parse(ui, args)
+    cmd, func, args, options, cmdoptions = parse(lui, args)
 
     if options["config"]:
         raise util.Abort(_("Option --config may not be abbreviated!"))