# HG changeset patch # User Matt Mackall # Date 1240519210 18000 # Node ID 7c47ac9620a856efaad60284b9b5598cd350ae72 # Parent 9302404b60f354b964c415ec9efbc08798278087 ui: simplify parent overlay logic diff -r 9302404b60f3 -r 7c47ac9620a8 mercurial/ui.py --- a/mercurial/ui.py Thu Apr 23 15:40:10 2009 -0500 +++ b/mercurial/ui.py Thu Apr 23 15:40:10 2009 -0500 @@ -42,15 +42,14 @@ else: # parentui may point to an ui object which is already a child self.parentui = parentui.parentui or parentui + self.buffers = parentui.buffers self.trusted_users = parentui.trusted_users.copy() self.trusted_groups = parentui.trusted_groups.copy() self.cdata = dupconfig(self.parentui.cdata) - self.overlay = dupconfig(self.parentui.overlay) self.ucdata = dupconfig(self.parentui.ucdata) - if self.parentui is not parentui: - self.overlay = util.configparser() - updateconfig(parentui.overlay, self.overlay) - self.buffers = parentui.buffers + + # we want the overlay from the parent, not the root + self.overlay = dupconfig(parentui.overlay) def __getattr__(self, key): return getattr(self.parentui, key)