Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 4238:ce6c364ebb2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7307d2e98b32
children 417c2068cb92
comparison
equal deleted inserted replaced
4231:83153299aab5 4238:ce6c364ebb2a
1140 elif self.pushable(i)[0]: 1140 elif self.pushable(i)[0]:
1141 stat = 'U' 1141 stat = 'U'
1142 else: 1142 else:
1143 stat = 'G' 1143 stat = 'G'
1144 pfx = '%d %s ' % (i, stat) 1144 pfx = '%d %s ' % (i, stat)
1145 elif status == 'U' and not self.pushable(i)[0]:
1146 continue
1145 self.ui.write('%s%s\n' % (pfx, displayname(patch))) 1147 self.ui.write('%s%s\n' % (pfx, displayname(patch)))
1146 else: 1148 else:
1147 msng_list = [] 1149 msng_list = []
1148 for root, dirs, files in os.walk(self.path): 1150 for root, dirs, files in os.walk(self.path):
1149 d = root[len(self.path) + 1:] 1151 d = root[len(self.path) + 1:]
1436 if patch: 1438 if patch:
1437 if patch not in q.series: 1439 if patch not in q.series:
1438 raise util.Abort(_("patch %s is not in series file") % patch) 1440 raise util.Abort(_("patch %s is not in series file") % patch)
1439 start = q.series.index(patch) + 1 1441 start = q.series.index(patch) + 1
1440 else: 1442 else:
1441 start = q.series_end() 1443 start = q.series_end(True)
1442 q.qseries(repo, start=start, summary=opts.get('summary')) 1444 q.qseries(repo, start=start, status='U', summary=opts.get('summary'))
1443 1445
1444 def qimport(ui, repo, *filename, **opts): 1446 def qimport(ui, repo, *filename, **opts):
1445 """import a patch 1447 """import a patch
1446 1448
1447 The patch will have the same name as its source file unless you 1449 The patch will have the same name as its source file unless you