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