| hg-reviewers |
I suspect this was a static method just because it made merge.py feel
less messy, but now we have a mergestate package so we can do better.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| def _droponode(data): | def _droponode(data): | ||||
| # used for compatibility for v1 | # used for compatibility for v1 | ||||
| bits = data.split(b'\0') | bits = data.split(b'\0') | ||||
| bits = bits[:-2] + bits[-1:] | bits = bits[:-2] + bits[-1:] | ||||
| return b'\0'.join(bits) | return b'\0'.join(bits) | ||||
| def _filectxorabsent(hexnode, ctx, f): | |||||
| if hexnode == nullhex: | |||||
| return filemerge.absentfilectx(ctx, f) | |||||
| else: | |||||
| return ctx[f] | |||||
| # Merge state record types. See ``mergestate`` docs for more. | # Merge state record types. See ``mergestate`` docs for more. | ||||
| RECORD_LOCAL = b'L' | RECORD_LOCAL = b'L' | ||||
| RECORD_OTHER = b'O' | RECORD_OTHER = b'O' | ||||
| RECORD_MERGED = b'F' | RECORD_MERGED = b'F' | ||||
| RECORD_CHANGEDELETE_CONFLICT = b'C' | RECORD_CHANGEDELETE_CONFLICT = b'C' | ||||
| RECORD_MERGE_DRIVER_MERGE = b'D' | RECORD_MERGE_DRIVER_MERGE = b'D' | ||||
| RECORD_PATH_CONFLICT = b'P' | RECORD_PATH_CONFLICT = b'P' | ||||
| RECORD_MERGE_DRIVER_STATE = b'm' | RECORD_MERGE_DRIVER_STATE = b'm' | ||||
| state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry | state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry | ||||
| octx = self._repo[self._other] | octx = self._repo[self._other] | ||||
| extras = self.extras(dfile) | extras = self.extras(dfile) | ||||
| anccommitnode = extras.get(b'ancestorlinknode') | anccommitnode = extras.get(b'ancestorlinknode') | ||||
| if anccommitnode: | if anccommitnode: | ||||
| actx = self._repo[anccommitnode] | actx = self._repo[anccommitnode] | ||||
| else: | else: | ||||
| actx = None | actx = None | ||||
| fcd = self._filectxorabsent(localkey, wctx, dfile) | fcd = _filectxorabsent(localkey, wctx, dfile) | ||||
| fco = self._filectxorabsent(onode, octx, ofile) | fco = _filectxorabsent(onode, octx, ofile) | ||||
| # TODO: move this to filectxorabsent | # TODO: move this to filectxorabsent | ||||
| fca = self._repo.filectx(afile, fileid=anode, changectx=actx) | fca = self._repo.filectx(afile, fileid=anode, changectx=actx) | ||||
| # "premerge" x flags | # "premerge" x flags | ||||
| flo = fco.flags() | flo = fco.flags() | ||||
| fla = fca.flags() | fla = fca.flags() | ||||
| if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: | if b'x' in flags + flo + fla and b'l' not in flags + flo + fla: | ||||
| if fca.node() == nullid and flags != flo: | if fca.node() == nullid and flags != flo: | ||||
| if preresolve: | if preresolve: | ||||
| action = ACTION_ADD_MODIFIED | action = ACTION_ADD_MODIFIED | ||||
| else: | else: | ||||
| action = ACTION_ADD | action = ACTION_ADD | ||||
| # else: regular merges (no action necessary) | # else: regular merges (no action necessary) | ||||
| self._results[dfile] = r, action | self._results[dfile] = r, action | ||||
| return complete, r | return complete, r | ||||
| def _filectxorabsent(self, hexnode, ctx, f): | |||||
| if hexnode == nullhex: | |||||
| return filemerge.absentfilectx(ctx, f) | |||||
| else: | |||||
| return ctx[f] | |||||
| def preresolve(self, dfile, wctx): | def preresolve(self, dfile, wctx): | ||||
| """run premerge process for dfile | """run premerge process for dfile | ||||
| Returns whether the merge is complete, and the exit code.""" | Returns whether the merge is complete, and the exit code.""" | ||||
| return self._resolve(True, dfile, wctx) | return self._resolve(True, dfile, wctx) | ||||
| def resolve(self, dfile, wctx): | def resolve(self, dfile, wctx): | ||||
| """run merge process (assuming premerge was run) for dfile | """run merge process (assuming premerge was run) for dfile | ||||