equal
deleted
inserted
replaced
2545 if version == 1: |
2545 if version == 1: |
2546 onode = 'not stored in v1 format' |
2546 onode = 'not stored in v1 format' |
2547 flags = r[7] |
2547 flags = r[7] |
2548 else: |
2548 else: |
2549 onode, flags = r[7:9] |
2549 onode, flags = r[7:9] |
2550 ui.write(('file: %s (state "%s", hash %s)\n') |
2550 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n') |
2551 % (f, state, hash)) |
2551 % (f, rtype, state, hash)) |
2552 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) |
2552 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) |
2553 ui.write((' ancestor path: %s (node %s)\n') % (afile, anode)) |
2553 ui.write((' ancestor path: %s (node %s)\n') % (afile, anode)) |
2554 ui.write((' other path: %s (node %s)\n') % (ofile, onode)) |
2554 ui.write((' other path: %s (node %s)\n') % (ofile, onode)) |
2555 else: |
2555 else: |
2556 ui.write(('unrecognized entry: %s\t%s\n') |
2556 ui.write(('unrecognized entry: %s\t%s\n') |