equal
deleted
inserted
replaced
2894 extrastrings.append('%s = %s' % (extras[i], extras[i + 1])) |
2894 extrastrings.append('%s = %s' % (extras[i], extras[i + 1])) |
2895 i += 2 |
2895 i += 2 |
2896 |
2896 |
2897 ui.write(('file extras: %s (%s)\n') |
2897 ui.write(('file extras: %s (%s)\n') |
2898 % (filename, ', '.join(extrastrings))) |
2898 % (filename, ', '.join(extrastrings))) |
|
2899 elif rtype == 'l': |
|
2900 labels = record.split('\0', 2) |
|
2901 labels = [l for l in labels if len(l) > 0] |
|
2902 ui.write(('labels:\n')) |
|
2903 ui.write((' local: %s\n' % labels[0])) |
|
2904 ui.write((' other: %s\n' % labels[1])) |
|
2905 if len(labels) > 2: |
|
2906 ui.write((' base: %s\n' % labels[2])) |
2899 else: |
2907 else: |
2900 ui.write(('unrecognized entry: %s\t%s\n') |
2908 ui.write(('unrecognized entry: %s\t%s\n') |
2901 % (rtype, record.replace('\0', '\t'))) |
2909 % (rtype, record.replace('\0', '\t'))) |
2902 |
2910 |
2903 # Avoid mergestate.read() since it may raise an exception for unsupported |
2911 # Avoid mergestate.read() since it may raise an exception for unsupported |
2906 ms = mergemod.mergestate(repo) |
2914 ms = mergemod.mergestate(repo) |
2907 |
2915 |
2908 # sort so that reasonable information is on top |
2916 # sort so that reasonable information is on top |
2909 v1records = ms._readrecordsv1() |
2917 v1records = ms._readrecordsv1() |
2910 v2records = ms._readrecordsv2() |
2918 v2records = ms._readrecordsv2() |
2911 order = 'LOm' |
2919 order = 'LOml' |
2912 def key(r): |
2920 def key(r): |
2913 idx = order.find(r[0]) |
2921 idx = order.find(r[0]) |
2914 if idx == -1: |
2922 if idx == -1: |
2915 return (1, r[1]) |
2923 return (1, r[1]) |
2916 else: |
2924 else: |