Bazaar

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

675652-bzr-columns-0
Merge into bzr.dev

Proposed by Neil Martinsen-Burrell on 2011-01-10

Status:

Merged

Approved by:

Vincent Ladeuil on 2011-01-11

Approved revision:

no longer in the source branch.

Merged at revision:

5598

Proposed branch:

lp://staging/~nmb/bzr/675652-bzr-columns-0

Merge into:

lp://staging/bzr

Diff against target:

65 lines (+19/-2)

4 files modified

bzrlib/osutils.py (+8/-2)
bzrlib/tests/blackbox/test_help.py (+4/-0)
bzrlib/tests/test_osutils.py (+4/-0)
doc/en/release-notes/bzr-2.3.txt (+3/-0)

To merge this branch:

bzr merge lp://staging/~nmb/bzr/675652-bzr-columns-0

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Vincent Ladeuil		Approve on 2011-01-11
Martin Pool	2011-01-10	Approve on 2011-01-10
Review via email: mp+45660@code.staging.launchpad.net

Commit message

Accept 0 to mean no limit for BZR_COLUMNS

Description of the change

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

Revision history for this message

Martin Pool (mbp) wrote on 2011-01-10:

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

vote approve

Martin

review: Approve

Revision history for this message

Neil Martinsen-Burrell (nmb) wrote on 2011-01-10:

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.

Revision history for this message

Vincent Ladeuil (vila) wrote on 2011-01-11:

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

review: Approve

Revision history for this message

Vincent Ladeuil (vila) wrote on 2011-01-11:

sent to pqm by email