Mercurial > hg
changeset 30310:5c379b1f56c7
scmutil: make termwidth() obtain stdio from ui
I'm getting rid of direct sys.stderr|out|in references so Py3 porting will
be slightly easier.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 20 Oct 2016 21:42:11 +0900 |
| parents | 4b1af1c867fa |
| children | 80708959161a |
| files | mercurial/scmposix.py mercurial/scmwindows.py mercurial/ui.py |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmposix.py Thu Oct 20 21:38:44 2016 +0900 +++ b/mercurial/scmposix.py Thu Oct 20 21:42:11 2016 +0900 @@ -41,11 +41,11 @@ else: return [os.path.expanduser('~/.hgrc')] -def termwidth(): +def termwidth(ui): try: import array import termios - for dev in (sys.stderr, sys.stdout, sys.stdin): + for dev in (ui.ferr, ui.fout, ui.fin): try: try: fd = dev.fileno()
--- a/mercurial/scmwindows.py Thu Oct 20 21:38:44 2016 +0900 +++ b/mercurial/scmwindows.py Thu Oct 20 21:42:11 2016 +0900 @@ -53,5 +53,5 @@ path.append(os.path.join(userprofile, '.hgrc')) return path -def termwidth(): +def termwidth(ui): return win32.termwidth()
--- a/mercurial/ui.py Thu Oct 20 21:38:44 2016 +0900 +++ b/mercurial/ui.py Thu Oct 20 21:42:11 2016 +0900 @@ -822,7 +822,7 @@ return int(encoding.environ['COLUMNS']) except ValueError: pass - return scmutil.termwidth() + return scmutil.termwidth(self) def formatted(self): '''should formatted output be used?