Merge lp:~nmb/bzr/675652-bzr-columns-0 into lp:bzr

[Neil Martinsen-Burrell]

Accept 0 to mean no limit for BZR_COLUMNS

This change fixes bug 675652 by allowing the environment variable BZR_COLUMNS to be set to 0 to indicate no preference for terminal width.

[Martin Pool (mbp)]

That makes sense to me. I guess you also checked it does fix the
issue interactively?

  vote approve

Martin

review: Approve

[Neil Martinsen-Burrell (nmb)]

On Jan 10, 2011, at 0:01, Martin Pool <email address hidden> wrote:

> Review: Approve
> That makes sense to me. I guess you also checked it does fix the
> issue interactively?

It works correctly interactively, that is, it fixes the traceback in the bug and for log and stat it provides unlimited line lengths. However, 'bzr help' uses a default width of 80 characters when osutils.terminal_width() returns None, which doesn't seem to be what the bug reporter wants. However, I think that is a separate UI bug from fixing the traceback.

[Vincent Ladeuil (vila)]

IIRC the help 80 default width is not under our direct control anyway and will probably require a more invasive change.

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2010-11-06 02:32:43 +0000
+++ bzrlib/osutils.py	2011-01-10 05:34:04 +0000
@@ -1461,10 +1461,16 @@
     # a similar effect.
 
     # If BZR_COLUMNS is set, take it, user is always right
+    # Except if they specified 0 in which case, impose no limit here
     try:
-        return int(os.environ['BZR_COLUMNS'])
+        width = int(os.environ['BZR_COLUMNS'])
     except (KeyError, ValueError):
-        pass
+        width = None
+    if width is not None:
+        if width > 0:
+            return width
+        else:
+            return None
 
     isatty = getattr(sys.stdout, 'isatty', None)
     if isatty is None or not isatty():

=== modified file 'bzrlib/tests/blackbox/test_help.py'
--- bzrlib/tests/blackbox/test_help.py	2010-08-29 14:32:45 +0000
+++ bzrlib/tests/blackbox/test_help.py	2011-01-10 05:34:04 +0000
@@ -104,6 +104,10 @@
         self.assertEquals(dash_help, qmark_long)
         self.assertEquals(dash_help, qmark_cmds)
 
+    def test_help_width_zero(self):
+        self.overrideEnv('BZR_COLUMNS', '0')
+        self.run_bzr('help commands')
+
     def test_hidden(self):
         help_commands = self.run_bzr('help commands')[0]
         help_hidden = self.run_bzr('help hidden-commands')[0]

=== modified file 'bzrlib/tests/test_osutils.py'
--- bzrlib/tests/test_osutils.py	2010-12-16 15:29:10 +0000
+++ bzrlib/tests/test_osutils.py	2011-01-10 05:34:04 +0000
@@ -1988,6 +1988,10 @@
         self.overrideEnv('BZR_COLUMNS', '12')
         self.assertEqual(12, osutils.terminal_width())
 
+    def test_BZR_COLUMNS_0_no_limit(self):
+        self.overrideEnv('BZR_COLUMNS', '0')
+        self.assertEqual(None, osutils.terminal_width())
+
     def test_falls_back_to_COLUMNS(self):
         self.overrideEnv('BZR_COLUMNS', None)
         self.assertNotEqual('42', os.environ['COLUMNS'])

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2010-12-24 16:30:36 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-01-10 05:34:04 +0000
@@ -55,6 +55,9 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* The BZR_COLUMNS environment variable can be set to 0 to indicate no
+  limitation on the width of the terminal.  (Neil Martinsen-Burrell, #675652)
+
 Documentation
 *************