Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
17058:d5422faf648c | 17059:fba17a64fa49 |
---|---|
17 self._ocfg = config.config() # overlay | 17 self._ocfg = config.config() # overlay |
18 self._tcfg = config.config() # trusted | 18 self._tcfg = config.config() # trusted |
19 self._ucfg = config.config() # untrusted | 19 self._ucfg = config.config() # untrusted |
20 self._trustusers = set() | 20 self._trustusers = set() |
21 self._trustgroups = set() | 21 self._trustgroups = set() |
22 self.callhooks = True | |
22 | 23 |
23 if src: | 24 if src: |
24 self.fout = src.fout | 25 self.fout = src.fout |
25 self.ferr = src.ferr | 26 self.ferr = src.ferr |
26 self.fin = src.fin | 27 self.fin = src.fin |
29 self._ucfg = src._ucfg.copy() | 30 self._ucfg = src._ucfg.copy() |
30 self._ocfg = src._ocfg.copy() | 31 self._ocfg = src._ocfg.copy() |
31 self._trustusers = src._trustusers.copy() | 32 self._trustusers = src._trustusers.copy() |
32 self._trustgroups = src._trustgroups.copy() | 33 self._trustgroups = src._trustgroups.copy() |
33 self.environ = src.environ | 34 self.environ = src.environ |
35 self.callhooks = src.callhooks | |
34 self.fixconfig() | 36 self.fixconfig() |
35 else: | 37 else: |
36 self.fout = sys.stdout | 38 self.fout = sys.stdout |
37 self.ferr = sys.stderr | 39 self.ferr = sys.stderr |
38 self.fin = sys.stdin | 40 self.fin = sys.stdin |