4803 show = states[:4] |
4803 show = states[:4] |
4804 else: |
4804 else: |
4805 show = states[:5] |
4805 show = states[:5] |
4806 |
4806 |
4807 m = scmutil.match(repo[node2], pats, opts) |
4807 m = scmutil.match(repo[node2], pats, opts) |
4808 stat = repo.status(node1, node2, m, |
|
4809 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
4810 opts.get('subrepos')) |
|
4811 if terse: |
4808 if terse: |
4812 stat = cmdutil.tersestatus(repo.root, stat, terse, |
4809 # we need to compute clean and unknown to terse |
4813 repo.dirstate._ignore, opts.get('ignored')) |
4810 stat = repo.status(node1, node2, m, |
|
4811 'ignored' in show or 'i' in terse, |
|
4812 True, True, opts.get('subrepos')) |
|
4813 |
|
4814 stat = cmdutil.tersedir(stat, terse) |
|
4815 else: |
|
4816 stat = repo.status(node1, node2, m, |
|
4817 'ignored' in show, 'clean' in show, |
|
4818 'unknown' in show, opts.get('subrepos')) |
|
4819 |
4814 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) |
4820 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) |
4815 |
4821 |
4816 if (opts.get('all') or opts.get('copies') |
4822 if (opts.get('all') or opts.get('copies') |
4817 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
4823 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
4818 copy = copies.pathcopies(repo[node1], repo[node2], m) |
4824 copy = copies.pathcopies(repo[node1], repo[node2], m) |