Merge lp:~bialix/bzr-tiplog/win32-tty into lp:bzr-tiplog

[Alexander Belchenko]

Windows-specific fix to make sure output is properly formatted without extra blank lines.

[Brian de Alwis (slyguy)]

Ugh. I've merged your change, but I wonder if this shouldn't be put into bzrlib.osutils.terminal_width instead.

[Brian de Alwis (slyguy)]

review: Approve

[Alexander Belchenko (bialix)]

Brian de Alwis пишет:
> Ugh. I've merged your change, but I wonder if this shouldn't be put into bzrlib.osutils.terminal_width instead.

I really don't know. I've raised that problem some time ago at Bazaar
sprint, but there was no conclusion.

--
All the dude wanted was his rug back

=== modified file 'commands.py'
--- commands.py	2011-10-04 13:47:16 +0000
+++ commands.py	2011-10-05 12:50:27 +0000
@@ -16,6 +16,7 @@
 
 """Tiplog specific commands"""
 
+import sys
 from bzrlib import (
     errors,
     )
@@ -108,6 +109,10 @@
             self.tzlocal = None
 
         self.text_width = terminal_width()
+        if sys.platform == 'win32':
+            # on Windows fully filled line will add extra blank line
+            # so we need to keep one blank character at the end
+            self.text_width = self.text_width - 1
 
         tiplog = TipLogger(branch)