# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1258499982 -3600
# Node ID d266aa7606ce82fa926a1d3389453d7cb7b8f200
# Parent  6e8a16dd3e304cba005b3498c7d3e6fc1ccac8cb# Parent  c51494c538411b4e9c365445a6b0dcaf168e20b0
Merge with stable

diff -r 6e8a16dd3e30 -r d266aa7606ce hgext/mq.py
--- a/hgext/mq.py	Wed Nov 11 17:48:00 2009 +0100
+++ b/hgext/mq.py	Wed Nov 18 00:19:42 2009 +0100
@@ -1384,13 +1384,16 @@
         def displayname(pfx, patchname):
             if summary:
                 ph = patchheader(self.join(patchname))
-                msg = ph.message
-                msg = msg and ': ' + msg[0] or ': '
+                msg = ph.message and ph.message[0] or ''
+                if self.ui.interactive():
+                    width = util.termwidth() - len(pfx) - len(patchname) - 2
+                    if width > 0:
+                        msg = util.ellipsis(msg, width)
+                    else:
+                        msg = ''
+                msg = "%s%s: %s" % (pfx, patchname, msg)
             else:
-                msg = ''
-            msg = "%s%s%s" % (pfx, patchname, msg)
-            if self.ui.interactive():
-                msg = util.ellipsis(msg, util.termwidth())
+                msg = pfx + patchname
             self.ui.write(msg + '\n')
 
         applied = set([p.name for p in self.applied])
diff -r 6e8a16dd3e30 -r d266aa7606ce mercurial/commands.py
--- a/mercurial/commands.py	Wed Nov 11 17:48:00 2009 +0100
+++ b/mercurial/commands.py	Wed Nov 18 00:19:42 2009 +0100
@@ -2931,7 +2931,11 @@
 
     branch = ctx.branch()
     bheads = repo.branchheads(branch)
-    ui.status(_('branch: %s\n') % branch)
+    m = _('branch: %s\n') % branch
+    if branch != 'default':
+        ui.write(m)
+    else:
+        ui.status(m)
 
     st = list(repo.status(unknown=True))[:7]
     ms = merge_.mergestate(repo)
diff -r 6e8a16dd3e30 -r d266aa7606ce tests/test-mq
--- a/tests/test-mq	Wed Nov 11 17:48:00 2009 +0100
+++ b/tests/test-mq	Wed Nov 18 00:19:42 2009 +0100
@@ -143,8 +143,10 @@
 hg qpop -a
 hg --traceback qpush -a
 
+# setting columns & interactive tests truncating (issue1912)
 echo % qseries
-hg qseries
+COLUMNS=4 hg qseries --config ui.interactive=true
+COLUMNS=20 hg qseries --config ui.interactive=true -vs
 hg qpop
 hg qseries -vs
 hg qpush
diff -r 6e8a16dd3e30 -r d266aa7606ce tests/test-mq.out
--- a/tests/test-mq.out	Wed Nov 11 17:48:00 2009 +0100
+++ b/tests/test-mq.out	Wed Nov 18 00:19:42 2009 +0100
@@ -130,6 +130,8 @@
 % qseries
 test.patch
 test2.patch
+0 A test.patch: f...
+1 A test2.patch: 
 popping test2.patch
 now at: test.patch
 0 A test.patch: foo bar