# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2014-12-14 01:43:01
# Node ID 3fec2a3c768b287d9dd03c3e8b537dd8a444573f
# Parent  40e62fbd735631b1d2695c967026ad523e350a64

subrepo: reset 'self.ui' to the subrepo copy of 'ui' in the hgsubrepo class

Creation of the subrepo's '_repo' object creates a new 'ui' by combining the
parent repo's 'baseui' and reading in the subrepo's hgrc file.  This simply
avoids 'self.ui' and 'self._repo.ui' pointing to different objects, which seems
like a potential source of bugs.

Git and Svn subrepos are unchanged, because they don't have their own ui, and
have always used their parent's for their configuration.

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -523,6 +523,7 @@ class hgsubrepo(abstractsubrepo):
         root = r.wjoin(path)
         create = not r.wvfs.exists('%s/.hg' % path)
         self._repo = hg.repository(r.baseui, root, create=create)
+        self.ui = self._repo.ui
         for s, k in [('ui', 'commitsubrepos')]:
             v = r.ui.config(s, k)
             if v: