equal
deleted
inserted
replaced
2105 fm_extras.end() |
2105 fm_extras.end() |
2106 |
2106 |
2107 fm_files.end() |
2107 fm_files.end() |
2108 |
2108 |
2109 fm_extras = fm.nested(b'extras') |
2109 fm_extras = fm.nested(b'extras') |
2110 for f, d in sorted(pycompat.iteritems(ms._stateextras)): |
2110 for f, d in sorted(pycompat.iteritems(ms.allextras())): |
2111 if f in ms: |
2111 if f in ms: |
2112 # If file is in mergestate, we have already processed it's extras |
2112 # If file is in mergestate, we have already processed it's extras |
2113 continue |
2113 continue |
2114 for k, v in pycompat.iteritems(d): |
2114 for k, v in pycompat.iteritems(d): |
2115 fm_extras.startitem() |
2115 fm_extras.startitem() |