Mercurial > hg
changeset 9877:d266aa7606ce
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 18 Nov 2009 00:19:42 +0100 |
| parents | 6e8a16dd3e30 (current diff) c51494c53841 (diff) |
| children | a1886801d466 |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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])
--- 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)
--- 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