Mercurial > hg

comparison mercurial/ui.py @ 8140:7c47ac9620a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: simplify parent overlay logic
author Matt Mackall <mpm@selenic.com>
date Thu, 23 Apr 2009 15:40:10 -0500
parents 9302404b60f3
children e40b629bedd1
comparison
equal deleted inserted replaced
8139:9302404b60f3 8140:7c47ac9620a8
40 # we always trust global config files 40 # we always trust global config files
41 self.readconfig(util.rcpath(), assumetrusted=True) 41 self.readconfig(util.rcpath(), assumetrusted=True)
42 else: 42 else:
43 # parentui may point to an ui object which is already a child 43 # parentui may point to an ui object which is already a child
44 self.parentui = parentui.parentui or parentui 44 self.parentui = parentui.parentui or parentui
45 self.buffers = parentui.buffers
45 self.trusted_users = parentui.trusted_users.copy() 46 self.trusted_users = parentui.trusted_users.copy()
46 self.trusted_groups = parentui.trusted_groups.copy() 47 self.trusted_groups = parentui.trusted_groups.copy()
47 self.cdata = dupconfig(self.parentui.cdata) 48 self.cdata = dupconfig(self.parentui.cdata)
48 self.overlay = dupconfig(self.parentui.overlay)
49 self.ucdata = dupconfig(self.parentui.ucdata) 49 self.ucdata = dupconfig(self.parentui.ucdata)
50 if self.parentui is not parentui: 50
51 self.overlay = util.configparser() 51 # we want the overlay from the parent, not the root
52 updateconfig(parentui.overlay, self.overlay) 52 self.overlay = dupconfig(parentui.overlay)
53 self.buffers = parentui.buffers
54 53
55 def __getattr__(self, key): 54 def __getattr__(self, key):
56 return getattr(self.parentui, key) 55 return getattr(self.parentui, key)
57 56
58 _isatty = None 57 _isatty = None