equal
deleted
inserted
replaced
5204 'ignored' in show, 'clean' in show, 'unknown' in show, |
5204 'ignored' in show, 'clean' in show, 'unknown' in show, |
5205 opts.get('subrepos')) |
5205 opts.get('subrepos')) |
5206 changestates = zip(states, 'MAR!?IC', stat) |
5206 changestates = zip(states, 'MAR!?IC', stat) |
5207 |
5207 |
5208 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
5208 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
5209 ctx1 = repo[node1] |
5209 copy = copies.pathcopies(repo[node1], repo[node2]) |
5210 ctx2 = repo[node2] |
|
5211 added = stat[1] |
|
5212 if node2 is None: |
|
5213 added = stat[0] + stat[1] # merged? |
|
5214 |
|
5215 for k, v in copies.pathcopies(ctx1, ctx2).iteritems(): |
|
5216 if k in added: |
|
5217 copy[k] = v |
|
5218 elif v in added: |
|
5219 copy[v] = k |
|
5220 |
5210 |
5221 for state, char, files in changestates: |
5211 for state, char, files in changestates: |
5222 if state in show: |
5212 if state in show: |
5223 format = "%s %%s%s" % (char, end) |
5213 format = "%s %%s%s" % (char, end) |
5224 if opts.get('no_status'): |
5214 if opts.get('no_status'): |