5835 if ui.quiet: |
5835 if ui.quiet: |
5836 show = states[:4] |
5836 show = states[:4] |
5837 else: |
5837 else: |
5838 show = states[:5] |
5838 show = states[:5] |
5839 |
5839 |
5840 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), |
5840 m = scmutil.match(repo[node2], pats, opts) |
|
5841 stat = repo.status(node1, node2, m, |
5841 'ignored' in show, 'clean' in show, 'unknown' in show, |
5842 'ignored' in show, 'clean' in show, 'unknown' in show, |
5842 opts.get('subrepos')) |
5843 opts.get('subrepos')) |
5843 changestates = zip(states, 'MAR!?IC', stat) |
5844 changestates = zip(states, 'MAR!?IC', stat) |
5844 |
5845 |
5845 if (opts.get('all') or opts.get('copies') |
5846 if (opts.get('all') or opts.get('copies') |
5846 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
5847 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
5847 copy = copies.pathcopies(repo[node1], repo[node2]) |
5848 copy = copies.pathcopies(repo[node1], repo[node2], m) |
5848 |
5849 |
5849 fm = ui.formatter('status', opts) |
5850 fm = ui.formatter('status', opts) |
5850 fmt = '%s' + end |
5851 fmt = '%s' + end |
5851 showchar = not opts.get('no_status') |
5852 showchar = not opts.get('no_status') |
5852 |
5853 |