Mercurial > public > mercurial-scm > hg-stable
diff mercurial/ui.py @ 17059:fba17a64fa49
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Jun 2012 00:40:52 -0500 |
parents | 6409a5c75125 15d4d475de9e |
children | e7cfe3587ea4 |
line wrap: on
line diff
--- a/mercurial/ui.py Fri Jun 29 00:01:19 2012 +0200 +++ b/mercurial/ui.py Fri Jun 29 00:40:52 2012 -0500 @@ -19,6 +19,7 @@ self._ucfg = config.config() # untrusted self._trustusers = set() self._trustgroups = set() + self.callhooks = True if src: self.fout = src.fout @@ -31,6 +32,7 @@ self._trustusers = src._trustusers.copy() self._trustgroups = src._trustgroups.copy() self.environ = src.environ + self.callhooks = src.callhooks self.fixconfig() else: self.fout = sys.stdout