Mercurial > hg

changeset 14165:78bdfc756908

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.termwidth: never return 0 for terminal width Catch a case where the termwidth was being reported as 0 when I was connecting with TLMTask instead of NSTask in OSX. This caused the progress extension to print no progress. The termwidth should never return 0 so in case we would return 0, simply fall back to the default termwidth below which is 80.
author jfh <jason@jasonfharris.com>
date Mon, 18 Apr 2011 02:42:52 +0200
parents cb98fed52495
children 9cbff8a39a2a
files mercurial/posix.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/posix.py	Mon May 02 19:21:30 2011 +0200
+++ b/mercurial/posix.py	Mon Apr 18 02:42:52 2011 +0200
@@ -316,7 +316,9 @@
                 if not os.isatty(fd):
                     continue
                 arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8)
-                return array.array('h', arri)[1]
+                width = array.array('h', arri)[1]
+                if width > 0:
+                    return width
             except ValueError:
                 pass
             except IOError, e: