2811 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) |
2811 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags)) |
2812 ui.write((' ancestor path: %s (node %s)\n') |
2812 ui.write((' ancestor path: %s (node %s)\n') |
2813 % (afile, _hashornull(anode))) |
2813 % (afile, _hashornull(anode))) |
2814 ui.write((' other path: %s (node %s)\n') |
2814 ui.write((' other path: %s (node %s)\n') |
2815 % (ofile, _hashornull(onode))) |
2815 % (ofile, _hashornull(onode))) |
|
2816 elif rtype == 'f': |
|
2817 filename, rawextras = record.split('\0', 1) |
|
2818 extras = rawextras.split('\0') |
|
2819 i = 0 |
|
2820 extrastrings = [] |
|
2821 while i < len(extras): |
|
2822 extrastrings.append('%s = %s' % (extras[i], extras[i + 1])) |
|
2823 i += 2 |
|
2824 |
|
2825 ui.write(('file extras: %s (%s)\n') |
|
2826 % (filename, ', '.join(extrastrings))) |
2816 else: |
2827 else: |
2817 ui.write(('unrecognized entry: %s\t%s\n') |
2828 ui.write(('unrecognized entry: %s\t%s\n') |
2818 % (rtype, record.replace('\0', '\t'))) |
2829 % (rtype, record.replace('\0', '\t'))) |
2819 |
2830 |
2820 # Avoid mergestate.read() since it may raise an exception for unsupported |
2831 # Avoid mergestate.read() since it may raise an exception for unsupported |