equal
deleted
inserted
replaced
137 files.update_touched(origfiles) |
137 files.update_touched(origfiles) |
138 |
138 |
139 if writechangesetcopy: |
139 if writechangesetcopy: |
140 files.update_copies_from_p1(ctx.p1copies()) |
140 files.update_copies_from_p1(ctx.p1copies()) |
141 files.update_copies_from_p2(ctx.p2copies()) |
141 files.update_copies_from_p2(ctx.p2copies()) |
|
142 |
|
143 copy_sd = ctx.repo().filecopiesmode == b'changeset-sidedata' |
|
144 if copy_sd and len(ctx.parents()) > 1: |
|
145 # XXX this `mergestate.read` could be duplicated with a the merge state |
|
146 # reading in _process_files So we could refactor further to reuse it in |
|
147 # some cases. |
|
148 ms = mergestate.mergestate.read(repo) |
|
149 if ms.active(): |
|
150 for fname in sorted(ms._stateextras.keys()): |
|
151 might_removed = ms.extras(fname).get(b'merge-removal-candidate') |
|
152 if might_removed == b'yes': |
|
153 if fname in ctx: |
|
154 files.mark_salvaged(fname) |
142 |
155 |
143 return mn, files |
156 return mn, files |
144 |
157 |
145 |
158 |
146 def _process_files(tr, ctx, error=False): |
159 def _process_files(tr, ctx, error=False): |