Rev 3202: (bialix) List possible values for BZR_SSH environment variable in in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3202
revision-id:pqm at pqm.ubuntu.com-20080128234850-jaxf44mvz2q8m2v5
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
parent: bialix at ukr.net-20080128220453-hrb3yb1v8y3u52pq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-01-28 23:48:50 +0000
message:
  (bialix) List possible values for BZR_SSH environment variable in
   env-variables help topic. (#181842)
modified:
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
    ------------------------------------------------------------
    revno: 3193.3.3
    revision-id:bialix at ukr.net-20080128220453-hrb3yb1v8y3u52pq
    parent: bialix at ukr.net-20080128150314-ful6toglzzq7drx2
    parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: st.short
    timestamp: Tue 2008-01-29 00:04:53 +0200
    message:
      merge bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
      bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
      bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 3193.3.2
    revision-id:bialix at ukr.net-20080128150314-ful6toglzzq7drx2
    parent: bialix at ukr.net-20080128084459-1algjfge3awz8ypu
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: st.short
    timestamp: Mon 2008-01-28 17:03:14 +0200
    message:
      better formatting of pending merges (short/no-short): actual length of prefix is used
    modified:
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
    ------------------------------------------------------------
    revno: 3193.3.1
    revision-id:bialix at ukr.net-20080128084459-1algjfge3awz8ypu
    parent: pqm at pqm.ubuntu.com-20080118055224-sskoia4bcpxd8wzu
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: st.short
    timestamp: Mon 2008-01-28 10:44:59 +0200
    message:
      fit very long revision summary to terminal_width-1 for show_pending_merges(short=True).
    modified:
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py	2007-10-16 16:02:01 +0000
+++ b/bzrlib/status.py	2008-01-28 15:03:14 +0000
@@ -168,13 +168,15 @@
         ignore.add(merge)
         try:
             from bzrlib.osutils import terminal_width
-            width = terminal_width()
+            width = terminal_width() - 1    # we need one extra space to avoid
+                                            # extra blank lines
             m_revision = branch.repository.get_revision(merge)
             if short:
-                prefix = 'P  '
+                prefix = 'P   '
             else:
-                prefix = ' '
-            to_file.write(prefix + ' ' + line_log(m_revision, width - 4))
+                prefix = '  '
+            to_file.write(prefix)
+            to_file.write(line_log(m_revision, width - len(prefix)))
             to_file.write('\n')
             inner_merges = branch.repository.get_ancestry(merge)
             assert inner_merges[0] is None
@@ -185,10 +187,11 @@
                     continue
                 mm_revision = branch.repository.get_revision(mmerge)
                 if short:
-                    prefix = 'P.  '
+                    prefix = 'P.   '
                 else:
-                    prefix = '   '
-                to_file.write(prefix + ' ' + line_log(mm_revision, width - 5))
+                    prefix = '    '
+                to_file.write(prefix)
+                to_file.write(line_log(mm_revision, width - len(prefix)))
                 to_file.write('\n')
                 ignore.add(mmerge)
         except errors.NoSuchRevision: