equal
deleted
inserted
replaced
3 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
3 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
4 # |
4 # |
5 # This software may be used and distributed according to the terms |
5 # This software may be used and distributed according to the terms |
6 # of the GNU General Public License, incorporated herein by reference. |
6 # of the GNU General Public License, incorporated herein by reference. |
7 |
7 |
8 import os, ConfigParser |
8 import ConfigParser |
9 from i18n import gettext as _ |
9 from i18n import gettext as _ |
10 from demandload import * |
10 from demandload import * |
11 demandload(globals(), "re socket sys util") |
11 demandload(globals(), "os re socket sys util") |
12 |
12 |
13 class ui(object): |
13 class ui(object): |
14 def __init__(self, verbose=False, debug=False, quiet=False, |
14 def __init__(self, verbose=False, debug=False, quiet=False, |
15 interactive=True, parentui=None): |
15 interactive=True, parentui=None): |
16 self.overlay = {} |
16 self.overlay = {} |
24 self.debugflag = self.configbool("ui", "debug") |
24 self.debugflag = self.configbool("ui", "debug") |
25 self.interactive = self.configbool("ui", "interactive", True) |
25 self.interactive = self.configbool("ui", "interactive", True) |
26 |
26 |
27 self.updateopts(verbose, debug, quiet, interactive) |
27 self.updateopts(verbose, debug, quiet, interactive) |
28 self.diffcache = None |
28 self.diffcache = None |
|
29 else: |
|
30 self.cdata._defaults = parentui.cdata._defaults |
|
31 for key, value in parentui.cdata._sections.iteritems(): |
|
32 self.cdata._sections[key] = value.copy() |
29 |
33 |
30 def __getattr__(self, key): |
34 def __getattr__(self, key): |
31 return getattr(self.parentui, key) |
35 return getattr(self.parentui, key) |
32 |
36 |
33 def updateopts(self, verbose=False, debug=False, quiet=False, |
37 def updateopts(self, verbose=False, debug=False, quiet=False, |
195 t = re.sub("(?m)^HG:.*\n", "", t) |
199 t = re.sub("(?m)^HG:.*\n", "", t) |
196 |
200 |
197 os.unlink(name) |
201 os.unlink(name) |
198 |
202 |
199 return t |
203 return t |
200 |
|