equal
deleted
inserted
replaced
2382 fm_extras.end() |
2382 fm_extras.end() |
2383 |
2383 |
2384 fm_files.end() |
2384 fm_files.end() |
2385 |
2385 |
2386 fm_extras = fm.nested(b'extras') |
2386 fm_extras = fm.nested(b'extras') |
2387 for f, d in sorted(pycompat.iteritems(ms.allextras())): |
2387 for f, d in sorted(ms.allextras().items()): |
2388 if f in ms: |
2388 if f in ms: |
2389 # If file is in mergestate, we have already processed it's extras |
2389 # If file is in mergestate, we have already processed it's extras |
2390 continue |
2390 continue |
2391 for k, v in d.items(): |
2391 for k, v in d.items(): |
2392 fm_extras.startitem() |
2392 fm_extras.startitem() |
2886 ).result() |
2886 ).result() |
2887 |
2887 |
2888 ui.status(pycompat.bytestr(r) + b'\n') |
2888 ui.status(pycompat.bytestr(r) + b'\n') |
2889 return not r |
2889 return not r |
2890 else: |
2890 else: |
2891 for k, v in sorted(pycompat.iteritems(target.listkeys(namespace))): |
2891 for k, v in sorted(target.listkeys(namespace).items()): |
2892 ui.write( |
2892 ui.write( |
2893 b"%s\t%s\n" |
2893 b"%s\t%s\n" |
2894 % (stringutil.escapestr(k), stringutil.escapestr(v)) |
2894 % (stringutil.escapestr(k), stringutil.escapestr(v)) |
2895 ) |
2895 ) |
2896 finally: |
2896 finally: |