[PATCH 4 of 5] mq: use ui.formatted() instead of ui.plain()

Dan Villiom Podlaski Christiansen danchr at gmail.com
Mon Jun 7 09:23:50 CDT 2010


# HG changeset patch
# User Dan Villiom Podlaski Christiansen <danchr at gmail.com>
# Date 1275917583 -7200
# Node ID 1093e4ca31fe226c174e1ab9243b2929477ca8f7
# Parent  b7b18d67f502486919d68a3c5e44aa37b1b49be4
mq: use ui.formatted() instead of ui.plain().

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1422,7 +1422,7 @@ class queue(object):
             if summary:
                 ph = patchheader(self.join(patchname), self.plainmode)
                 msg = ph.message and ph.message[0] or ''
-                if not self.ui.plain():
+                if self.ui.formatted():
                     width = util.termwidth() - len(pfx) - len(patchname) - 2
                     if width > 0:
                         msg = util.ellipsis(msg, width)
diff --git a/tests/test-mq b/tests/test-mq
--- a/tests/test-mq
+++ b/tests/test-mq
@@ -166,10 +166,10 @@ echo % pop/push -a in subdir
 hg qpop -a
 hg --traceback qpush -a
 
-# setting columns & interactive tests truncating (issue1912)
+# setting columns & formatted tests truncating (issue1912)
 echo % qseries
-COLUMNS=4 hg qseries --config ui.interactive=true
-COLUMNS=20 hg qseries --config ui.interactive=true -vs
+COLUMNS=4 hg qseries --config ui.formatted=true
+COLUMNS=20 hg qseries --config ui.formatted=true -vs
 hg qpop
 hg qseries -vs
 hg sum | grep mq


More information about the Mercurial-devel mailing list