Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 22677:cbb4414a5603

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: remove unused code for listing ignored files The call to repo.status() does not request ignored files to be listed, so remove the code for printing them.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 01 Oct 2014 12:50:18 -0700
parents 6e431e1635b6
children 21d5416b8a8a
comparison
equal deleted inserted replaced
22676:a014fdc97154 22677:cbb4414a5603
5784 ui.write(' [%s]' % current, label='bookmarks.current') 5784 ui.write(' [%s]' % current, label='bookmarks.current')
5785 for m in marks: 5785 for m in marks:
5786 ui.write(' ' + m, label='log.bookmark') 5786 ui.write(' ' + m, label='log.bookmark')
5787 ui.write('\n', label='log.bookmark') 5787 ui.write('\n', label='log.bookmark')
5788 5788
5789 st = list(repo.status(unknown=True))[:6] 5789 st = list(repo.status(unknown=True))[:5]
5790 5790
5791 c = repo.dirstate.copies() 5791 c = repo.dirstate.copies()
5792 copied, renamed = [], [] 5792 copied, renamed = [], []
5793 for d, s in c.iteritems(): 5793 for d, s in c.iteritems():
5794 if s in st[2]: 5794 if s in st[2]:
5812 ui.label(_('%d removed'), 'status.removed'), 5812 ui.label(_('%d removed'), 'status.removed'),
5813 ui.label(_('%d renamed'), 'status.copied'), 5813 ui.label(_('%d renamed'), 'status.copied'),
5814 ui.label(_('%d copied'), 'status.copied'), 5814 ui.label(_('%d copied'), 'status.copied'),
5815 ui.label(_('%d deleted'), 'status.deleted'), 5815 ui.label(_('%d deleted'), 'status.deleted'),
5816 ui.label(_('%d unknown'), 'status.unknown'), 5816 ui.label(_('%d unknown'), 'status.unknown'),
5817 ui.label(_('%d ignored'), 'status.ignored'),
5818 ui.label(_('%d unresolved'), 'resolve.unresolved'), 5817 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5819 ui.label(_('%d subrepos'), 'status.modified')] 5818 ui.label(_('%d subrepos'), 'status.modified')]
5820 t = [] 5819 t = []
5821 for s, l in zip(st, labels): 5820 for s, l in zip(st, labels):
5822 if s: 5821 if s:
5832 elif branch != parents[0].branch(): 5831 elif branch != parents[0].branch():
5833 t += _(' (new branch)') 5832 t += _(' (new branch)')
5834 elif (parents[0].closesbranch() and 5833 elif (parents[0].closesbranch() and
5835 pnode in repo.branchheads(branch, closed=True)): 5834 pnode in repo.branchheads(branch, closed=True)):
5836 t += _(' (head closed)') 5835 t += _(' (head closed)')
5837 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): 5836 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[8]):
5838 t += _(' (clean)') 5837 t += _(' (clean)')
5839 cleanworkdir = True 5838 cleanworkdir = True
5840 elif pnode not in bheads: 5839 elif pnode not in bheads:
5841 t += _(' (new branch head)') 5840 t += _(' (new branch head)')
5842 5841