Show More
@@ -1384,13 +1384,16 b' class queue(object):' | |||||
1384 | def displayname(pfx, patchname): |
|
1384 | def displayname(pfx, patchname): | |
1385 | if summary: |
|
1385 | if summary: | |
1386 | ph = patchheader(self.join(patchname)) |
|
1386 | ph = patchheader(self.join(patchname)) | |
1387 | msg = ph.message |
|
1387 | msg = ph.message and ph.message[0] or '' | |
1388 | msg = msg and ': ' + msg[0] or ': ' |
|
1388 | if self.ui.interactive(): | |
|
1389 | width = util.termwidth() - len(pfx) - len(patchname) - 2 | |||
|
1390 | if width > 0: | |||
|
1391 | msg = util.ellipsis(msg, width) | |||
|
1392 | else: | |||
|
1393 | msg = '' | |||
|
1394 | msg = "%s%s: %s" % (pfx, patchname, msg) | |||
1389 | else: |
|
1395 | else: | |
1390 |
msg = |
|
1396 | msg = pfx + patchname | |
1391 | msg = "%s%s%s" % (pfx, patchname, msg) |
|
|||
1392 | if self.ui.interactive(): |
|
|||
1393 | msg = util.ellipsis(msg, util.termwidth()) |
|
|||
1394 | self.ui.write(msg + '\n') |
|
1397 | self.ui.write(msg + '\n') | |
1395 |
|
1398 | |||
1396 | applied = set([p.name for p in self.applied]) |
|
1399 | applied = set([p.name for p in self.applied]) |
@@ -143,8 +143,10 b' echo % pop/push -a in subdir' | |||||
143 | hg qpop -a |
|
143 | hg qpop -a | |
144 | hg --traceback qpush -a |
|
144 | hg --traceback qpush -a | |
145 |
|
145 | |||
|
146 | # setting columns & interactive tests truncating (issue1912) | |||
146 | echo % qseries |
|
147 | echo % qseries | |
147 | hg qseries |
|
148 | COLUMNS=4 hg qseries --config ui.interactive=true | |
|
149 | COLUMNS=20 hg qseries --config ui.interactive=true -vs | |||
148 | hg qpop |
|
150 | hg qpop | |
149 | hg qseries -vs |
|
151 | hg qseries -vs | |
150 | hg qpush |
|
152 | hg qpush |
@@ -130,6 +130,8 b' now at: test2.patch' | |||||
130 | % qseries |
|
130 | % qseries | |
131 | test.patch |
|
131 | test.patch | |
132 | test2.patch |
|
132 | test2.patch | |
|
133 | 0 A test.patch: f... | |||
|
134 | 1 A test2.patch: | |||
133 | popping test2.patch |
|
135 | popping test2.patch | |
134 | now at: test.patch |
|
136 | now at: test.patch | |
135 | 0 A test.patch: foo bar |
|
137 | 0 A test.patch: foo bar |
General Comments 0
You need to be logged in to leave comments.
Login now