Mercurial > hg
comparison mercurial/ui.py @ 39840:a9f56e4501c1
merge with stable
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 26 Sep 2018 08:46:56 -0700 |
| parents | 24e493ec2229 23a00bc90a3c |
| children | 0d403e9f049a |
comparison
equal
deleted
inserted
replaced
| 39839:9e8fcd2e78c1 | 39840:a9f56e4501c1 |
|---|---|
| 232 | 232 |
| 233 if src: | 233 if src: |
| 234 self.fout = src.fout | 234 self.fout = src.fout |
| 235 self.ferr = src.ferr | 235 self.ferr = src.ferr |
| 236 self.fin = src.fin | 236 self.fin = src.fin |
| 237 self._finoutredirected = src._finoutredirected | |
| 237 self.pageractive = src.pageractive | 238 self.pageractive = src.pageractive |
| 238 self._disablepager = src._disablepager | 239 self._disablepager = src._disablepager |
| 239 self._tweaked = src._tweaked | 240 self._tweaked = src._tweaked |
| 240 | 241 |
| 241 self._tcfg = src._tcfg.copy() | 242 self._tcfg = src._tcfg.copy() |
| 256 self._blockedtimes = src._blockedtimes | 257 self._blockedtimes = src._blockedtimes |
| 257 else: | 258 else: |
| 258 self.fout = procutil.stdout | 259 self.fout = procutil.stdout |
| 259 self.ferr = procutil.stderr | 260 self.ferr = procutil.stderr |
| 260 self.fin = procutil.stdin | 261 self.fin = procutil.stdin |
| 262 self._finoutredirected = False | |
| 261 self.pageractive = False | 263 self.pageractive = False |
| 262 self._disablepager = False | 264 self._disablepager = False |
| 263 self._tweaked = False | 265 self._tweaked = False |
| 264 | 266 |
| 265 # shared read-only environment | 267 # shared read-only environment |