Show More
@@ -59,6 +59,7 b' Default effects may be overridden from t' | |||||
59 | ''' |
|
59 | ''' | |
60 |
|
60 | |||
61 | import os, sys |
|
61 | import os, sys | |
|
62 | import itertools | |||
62 |
|
63 | |||
63 | from mercurial import cmdutil, commands, extensions, error |
|
64 | from mercurial import cmdutil, commands, extensions, error | |
64 | from mercurial.i18n import _ |
|
65 | from mercurial.i18n import _ | |
@@ -142,14 +143,10 b' def colorqseries(orig, ui, repo, *dummy,' | |||||
142 | '''run the qseries command with colored output''' |
|
143 | '''run the qseries command with colored output''' | |
143 | ui.pushbuffer() |
|
144 | ui.pushbuffer() | |
144 | retval = orig(ui, repo, **opts) |
|
145 | retval = orig(ui, repo, **opts) | |
145 | patches = ui.popbuffer().splitlines() |
|
146 | patchlines = ui.popbuffer().splitlines() | |
146 | for patch in patches: |
|
147 | patchnames = repo.mq.series | |
147 | patchname = patch |
|
|||
148 | if opts['summary']: |
|
|||
149 | patchname = patchname.split(': ', 1)[0] |
|
|||
150 | if ui.verbose: |
|
|||
151 | patchname = patchname.lstrip().split(' ', 2)[-1] |
|
|||
152 |
|
148 | |||
|
149 | for patch, patchname in itertools.izip(patchlines, patchnames): | |||
153 | if opts['missing']: |
|
150 | if opts['missing']: | |
154 | effects = _patch_effects['missing'] |
|
151 | effects = _patch_effects['missing'] | |
155 | # Determine if patch is applied. |
|
152 | # Determine if patch is applied. |
General Comments 0
You need to be logged in to leave comments.
Login now