comparison mercurial/ui.py @ 8187:d2504744e7a5

ui: less links to parentui
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Apr 2009 16:50:43 -0500
parents b97abc7c1135
children d2899a856f9f
comparison
equal deleted inserted replaced
8186:6a0018cdb2fe 8187:d2504744e7a5
23 self.parentui = None 23 self.parentui = None
24 self.trusted_users = {} 24 self.trusted_users = {}
25 self.trusted_groups = {} 25 self.trusted_groups = {}
26 26
27 if parentui: 27 if parentui:
28 # parentui may point to an ui object which is already a child
29 self.parentui = parentui.parentui or parentui 28 self.parentui = parentui.parentui or parentui
30 self.cdata.update(self.parentui.cdata) 29 self.cdata = self.parentui.cdata.copy()
31 self.ucdata.update(self.parentui.ucdata) 30 self.ucdata = self.parentui.ucdata.copy()
32 # we want the overlay from the parent, not the root 31 self.overlay = parentui.overlay.copy()
33 self.overlay.update(parentui.overlay)
34 self.buffers = parentui.buffers
35 self.trusted_users = parentui.trusted_users.copy() 32 self.trusted_users = parentui.trusted_users.copy()
36 self.trusted_groups = parentui.trusted_groups.copy() 33 self.trusted_groups = parentui.trusted_groups.copy()
34 self.buffers = parentui.buffers
37 self.fixconfig() 35 self.fixconfig()
38 else: 36 else:
39 # we always trust global config files 37 # we always trust global config files
40 for f in util.rcpath(): 38 for f in util.rcpath():
41 self.readconfig(f, assumetrusted=True) 39 self.readconfig(f, assumetrusted=True)
42
43 def __getattr__(self, key):
44 return getattr(self.parentui, key)
45 40
46 _isatty = None 41 _isatty = None
47 def isatty(self): 42 def isatty(self):
48 if ui._isatty is None: 43 if ui._isatty is None:
49 try: 44 try: