Mercurial > public > mercurial-scm > hg-stable
diff mercurial/dispatch.py @ 7948:de377b1a9a84
move encoding bits from util to encoding
In addition to cleaning up util, this gets rid of some circular dependencies.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 03 Apr 2009 14:51:48 -0500 |
| parents | 4a4c7f6a5912 |
| children | 1c2cf2e5dc9b |
line wrap: on
line diff
--- a/mercurial/dispatch.py Fri Apr 03 13:20:52 2009 -0500 +++ b/mercurial/dispatch.py Fri Apr 03 14:51:48 2009 -0500 @@ -8,7 +8,7 @@ from i18n import _ import os, sys, atexit, signal, pdb, socket, errno, shlex, time import util, commands, hg, fancyopts, extensions, hook, error -import cmdutil +import cmdutil, encoding import ui as _ui def run(): @@ -304,7 +304,7 @@ # check for fallback encoding fallback = lui.config('ui', 'fallbackencoding') if fallback: - util._fallbackencoding = fallback + encoding.fallbackencoding = fallback fullargs = args cmd, func, args, options, cmdoptions = _parse(lui, args) @@ -319,9 +319,9 @@ "and --repository may only be abbreviated as --repo!")) if options["encoding"]: - util._encoding = options["encoding"] + encoding.encoding = options["encoding"] if options["encodingmode"]: - util._encodingmode = options["encodingmode"] + encoding.encodingmode = options["encodingmode"] if options["time"]: def get_times(): t = os.times()