Rev 2474: (John Arbash Meinel) Change aliases: help text to be on one line. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2474
revision-id: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
parent: pqm at pqm.ubuntu.com-20070430214656-2i2yfs1byf8ay10a
parent: john at arbash-meinel.com-20070430220441-wt7s23q3s2y2sg57
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-30 23:32:05 +0100
message:
  (John Arbash Meinel) Change aliases: help text to be on one line.
modified:
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
    ------------------------------------------------------------
    revno: 2472.1.2
    merged: john at arbash-meinel.com-20070430220441-wt7s23q3s2y2sg57
    parent: john at arbash-meinel.com-20070430210334-a543p33oz62yo26k
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2007-04-30 17:04:41 -0500
    message:
      Fix the one test that depended on 'aliases:\n'
    ------------------------------------------------------------
    revno: 2472.1.1
    merged: john at arbash-meinel.com-20070430210334-a543p33oz62yo26k
    parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2007-04-30 16:03:34 -0500
    message:
      (John Arbash Meinel) Change aliases: help text to be on one line.
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2007-04-24 02:43:56 +0000
+++ b/bzrlib/commands.py	2007-04-30 21:03:34 +0000
@@ -274,7 +274,7 @@
         result += 'usage: %s\n' % self._usage()
 
         if self.aliases:
-            result += 'aliases:\n'
+            result += 'aliases: '
             result += ', '.join(self.aliases) + '\n'
 
         result += '\n'

=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
--- a/bzrlib/tests/blackbox/test_too_much.py	2007-04-25 06:50:22 +0000
+++ b/bzrlib/tests/blackbox/test_too_much.py	2007-04-30 22:04:41 +0000
@@ -434,7 +434,7 @@
         runbzr("help slartibartfast", 3)
 
         out = capture("help ci")
-        out.index('aliases:\n')
+        out.index('aliases: ci, checkin\n')
 
         f = file('hello.txt', 'wt')
         f.write('some nice new content\n')