[MERGE] use terminal_width() for pending-merge display

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Adeodato Simó wrote:
> Hi. From the NEWS file:
> 
>   | * On Unix, detect terminal width using an ioctl not just $COLUMNS.
>   |   Use terminal width for single-line logs from ``bzr log --line`` and
>   |   pending-merge display.  (Robert Widhopf-Fenk, Gustavo Niemeyer)
> 
> However, the fix merged in rev. 1707 only changed `bzr log --line`,
> leaving status.py untouched.
> 
> The attached small patch fixes the code to match the NEWS entry.
> 
> 

Looks pretty good. At some point we're going to need to have tests for
this sort of thing. But your fix is small, so I went ahead and merged
it. (You didn't add more code that is untested, just changed existing
semi-tested code).

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEtjsCJdeBCYSNAAMRAuV8AJ0S91T9KszUPSzQbZlmKesAf0WI7gCfaQ2r
MlPgW16ysbVjd2oWZOglUtQ=
=jvTr
-----END PGP SIGNATURE-----