Mercurial > hg
changeset 4963:d1bee415406e
merge with crew-stable
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 21 Jul 2007 17:37:39 +0200 |
| parents | c79e3fa6dc29 (current diff) 10afa3fab6b4 (diff) |
| children | a28661788f2f |
| files | mercurial/changelog.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/changelog.py Sat Jul 21 10:43:29 2007 +0200 +++ b/mercurial/changelog.py Sat Jul 21 17:37:39 2007 +0200 @@ -42,7 +42,7 @@ 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'''
--- a/mercurial/cmdutil.py Sat Jul 21 10:43:29 2007 +0200 +++ b/mercurial/cmdutil.py Sat Jul 21 17:37:39 2007 +0200 @@ -316,7 +316,7 @@ 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!"))