Mercurial > hg
changeset 4238:ce6c364ebb2a
Fix issue443: inconsistent output of "hg qunapplied -v"
1. Don't skip over unpushable (guarded) unapplied patches.
2. Don't display unpushable patches, unless -v is given, otherwise
guarded and unguarded patches can't be distinguished.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 17 Mar 2007 18:46:52 +0100 |
| parents | 83153299aab5 |
| children | 417c2068cb92 |
| files | hgext/mq.py |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Fri Mar 16 00:22:59 2007 -0300 +++ b/hgext/mq.py Sat Mar 17 18:46:52 2007 +0100 @@ -1142,6 +1142,8 @@ else: stat = 'G' pfx = '%d %s ' % (i, stat) + elif status == 'U' and not self.pushable(i)[0]: + continue self.ui.write('%s%s\n' % (pfx, displayname(patch))) else: msng_list = [] @@ -1438,8 +1440,8 @@ raise util.Abort(_("patch %s is not in series file") % patch) start = q.series.index(patch) + 1 else: - start = q.series_end() - q.qseries(repo, start=start, summary=opts.get('summary')) + start = q.series_end(True) + q.qseries(repo, start=start, status='U', summary=opts.get('summary')) def qimport(ui, repo, *filename, **opts): """import a patch