Merge lp:~joke/bzr/bugfix353370 into lp:bzr

[Joke de Buhr]

[Joke de Buhr (joke)]

It's a quick two line fix which pretends the terminal width is very large to prevent broken lines when using a pager like less.

  bzr help commands | less

It does not try to prevent the actual line formating code from formating which would be a better solution.

[Ian Clatworthy (ian-clatworthy)]

As you say, not necessarily the final solution but still an improvement from where we are today.

review: Approve

[John A Meinel (jameinel)]

Do we need something like "getattr(sys.stdout, 'isatty')" maybe not, but sys.stdout sometimes gets redirected to crazy things.

I suppose this could be YAGNI. Anyone else have an opinion?

review: Needs Information

[Vincent Ladeuil (vila)]

I agree with John about being careful when accessing sys.stdout
(even if StringIO objects provides a isatty()).

I'd also really like to have a comment there explaining the magic value
(why 10.000 and not 65536 or 1024 ?) and the intent (a value big enough
to never truncate lines ?).

I'll tweak and merge.

review: Needs Fixing

[Joke de Buhr (joke)]

> I agree with John about being careful when accessing sys.stdout
> (even if StringIO objects provides a isatty()).
>
> I'd also really like to have a comment there explaining the magic value
> (why 10.000 and not 65536 or 1024 ?) and the intent (a value big enough
> to never truncate lines ?).
>
> I'll tweak and merge.

10000 is a number which:
 - would probably be big enough to never truncate lines.
 - representable as an 16bit unsigned integer ( 2^(16-1) ).

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2009-10-15 04:01:26 +0000
+++ bzrlib/osutils.py	2009-10-15 11:10:26 +0000
@@ -1296,6 +1296,9 @@
 
 def terminal_width():
     """Return estimated terminal width."""
+    if not sys.stdout.isatty():
+        return 10000
+
     if sys.platform == 'win32':
         return win32utils.get_console_size()[0]
     width = 0