Mercurial > public > mercurial-scm > hg
comparison mercurial/util.py @ 9552:f0417b6ff98a
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Oct 2009 00:59:46 -0500 |
parents | 8b8920209317 ba8a86d86fd6 |
children | ceb0f59e1327 |
comparison
equal
deleted
inserted
replaced
9551:3e698434b990 | 9552:f0417b6ff98a |
---|---|
1219 continue | 1219 continue |
1220 arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) | 1220 arri = fcntl.ioctl(fd, termios.TIOCGWINSZ, '\0' * 8) |
1221 return array.array('h', arri)[1] | 1221 return array.array('h', arri)[1] |
1222 except ValueError: | 1222 except ValueError: |
1223 pass | 1223 pass |
1224 except IOError, e: | |
1225 if e[0] == errno.EINVAL: | |
1226 pass | |
1227 else: | |
1228 raise | |
1224 except ImportError: | 1229 except ImportError: |
1225 pass | 1230 pass |
1226 return 80 | 1231 return 80 |
1227 | 1232 |
1228 def wrap(line, hangindent, width=None): | 1233 def wrap(line, hangindent, width=None): |