| durin42 |
| hg-reviewers |
Named constants are easier to read than short string values.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| RECORD_OVERRIDE = b't' | RECORD_OVERRIDE = b't' | ||||
| RECORD_UNSUPPORTED_MANDATORY = b'X' | RECORD_UNSUPPORTED_MANDATORY = b'X' | ||||
| RECORD_UNSUPPORTED_ADVISORY = b'x' | RECORD_UNSUPPORTED_ADVISORY = b'x' | ||||
| MERGE_DRIVER_STATE_UNMARKED = b'u' | MERGE_DRIVER_STATE_UNMARKED = b'u' | ||||
| MERGE_DRIVER_STATE_MARKED = b'm' | MERGE_DRIVER_STATE_MARKED = b'm' | ||||
| MERGE_DRIVER_STATE_SUCCESS = b's' | MERGE_DRIVER_STATE_SUCCESS = b's' | ||||
| MERGE_RECORD_UNRESOLVED = b'u' | |||||
| MERGE_RECORD_RESOLVED = b'r' | |||||
| MERGE_RECORD_UNRESOLVED_PATH = b'pu' | |||||
| MERGE_RECORD_RESOLVED_PATH = b'pr' | |||||
| MERGE_RECORD_DRIVER_RESOLVED = b'd' | |||||
| class mergestate(object): | class mergestate(object): | ||||
| '''track 3-way merge state of individual files | '''track 3-way merge state of individual files | ||||
| The merge state is stored on disk when needed. Two files are used: one with | The merge state is stored on disk when needed. Two files are used: one with | ||||
| an old format (version 1), and one with a new format (version 2). Version 2 | an old format (version 1), and one with a new format (version 2). Version 2 | ||||
| stores a superset of the data in version 1, including new kinds of records | stores a superset of the data in version 1, including new kinds of records | ||||
| in the future. For more about the new format, see the documentation for | in the future. For more about the new format, see the documentation for | ||||
| `_readrecordsv2`. | `_readrecordsv2`. | ||||
| records.append((RECORD_MERGE_DRIVER_STATE, '\0'.join([ | records.append((RECORD_MERGE_DRIVER_STATE, '\0'.join([ | ||||
| self.mergedriver, self._mdstate]))) | self.mergedriver, self._mdstate]))) | ||||
| # Write out state items. In all cases, the value of the state map entry | # Write out state items. In all cases, the value of the state map entry | ||||
| # is written as the contents of the record. The record type depends on | # is written as the contents of the record. The record type depends on | ||||
| # the type of state that is stored, and capital-letter records are used | # the type of state that is stored, and capital-letter records are used | ||||
| # to prevent older versions of Mercurial that do not support the feature | # to prevent older versions of Mercurial that do not support the feature | ||||
| # from loading them. | # from loading them. | ||||
| for filename, v in self._state.iteritems(): | for filename, v in self._state.iteritems(): | ||||
| if v[0] == 'd': | if v[0] == MERGE_RECORD_DRIVER_RESOLVED: | ||||
| # Driver-resolved merge. These are stored in 'D' records. | # Driver-resolved merge. These are stored in 'D' records. | ||||
| records.append((RECORD_MERGE_DRIVER_MERGE, | records.append((RECORD_MERGE_DRIVER_MERGE, | ||||
| '\0'.join([filename] + v))) | '\0'.join([filename] + v))) | ||||
| elif v[0] in ('pu', 'pr'): | elif v[0] in (MERGE_RECORD_UNRESOLVED_PATH, | ||||
| MERGE_RECORD_RESOLVED_PATH): | |||||
| # Path conflicts. These are stored in 'P' records. The current | # Path conflicts. These are stored in 'P' records. The current | ||||
| # resolution state ('pu' or 'pr') is stored within the record. | # resolution state ('pu' or 'pr') is stored within the record. | ||||
| records.append((RECORD_PATH_CONFLICT, | records.append((RECORD_PATH_CONFLICT, | ||||
| '\0'.join([filename] + v))) | '\0'.join([filename] + v))) | ||||
| elif v[1] == nullhex or v[6] == nullhex: | elif v[1] == nullhex or v[6] == nullhex: | ||||
| # Change/Delete or Delete/Change conflicts. These are stored in | # Change/Delete or Delete/Change conflicts. These are stored in | ||||
| # 'C' records. v[1] is the local file, and is nullhex when the | # 'C' records. v[1] is the local file, and is nullhex when the | ||||
| # file is deleted locally ('dc'). v[6] is the remote file, and | # file is deleted locally ('dc'). v[6] is the remote file, and | ||||
| note: also write the local version to the `.hg/merge` directory. | note: also write the local version to the `.hg/merge` directory. | ||||
| """ | """ | ||||
| if fcl.isabsent(): | if fcl.isabsent(): | ||||
| hash = nullhex | hash = nullhex | ||||
| else: | else: | ||||
| hash = hex(hashlib.sha1(fcl.path()).digest()) | hash = hex(hashlib.sha1(fcl.path()).digest()) | ||||
| self._repo.vfs.write('merge/' + hash, fcl.data()) | self._repo.vfs.write('merge/' + hash, fcl.data()) | ||||
| self._state[fd] = ['u', hash, fcl.path(), | self._state[fd] = [MERGE_RECORD_UNRESOLVED, hash, fcl.path(), | ||||
| fca.path(), hex(fca.filenode()), | fca.path(), hex(fca.filenode()), | ||||
| fco.path(), hex(fco.filenode()), | fco.path(), hex(fco.filenode()), | ||||
| fcl.flags()] | fcl.flags()] | ||||
| self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())} | self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())} | ||||
| self._dirty = True | self._dirty = True | ||||
| def addpath(self, path, frename, forigin): | def addpath(self, path, frename, forigin): | ||||
| """add a new conflicting path to the merge state | """add a new conflicting path to the merge state | ||||
| path: the path that conflicts | path: the path that conflicts | ||||
| frename: the filename the conflicting file was renamed to | frename: the filename the conflicting file was renamed to | ||||
| forigin: origin of the file ('l' or 'r' for local/remote) | forigin: origin of the file ('l' or 'r' for local/remote) | ||||
| """ | """ | ||||
| self._state[path] = ['pu', frename, forigin] | self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin] | ||||
| self._dirty = True | self._dirty = True | ||||
| def __contains__(self, dfile): | def __contains__(self, dfile): | ||||
| return dfile in self._state | return dfile in self._state | ||||
| def __getitem__(self, dfile): | def __getitem__(self, dfile): | ||||
| return self._state[dfile][0] | return self._state[dfile][0] | ||||
| def mdstate(self): | def mdstate(self): | ||||
| return self._mdstate | return self._mdstate | ||||
| def unresolved(self): | def unresolved(self): | ||||
| """Obtain the paths of unresolved files.""" | """Obtain the paths of unresolved files.""" | ||||
| for f, entry in self._state.iteritems(): | for f, entry in self._state.iteritems(): | ||||
| if entry[0] in ('u', 'pu'): | if entry[0] in (MERGE_RECORD_UNRESOLVED, | ||||
| MERGE_RECORD_UNRESOLVED_PATH): | |||||
| yield f | yield f | ||||
| def driverresolved(self): | def driverresolved(self): | ||||
| """Obtain the paths of driver-resolved files.""" | """Obtain the paths of driver-resolved files.""" | ||||
| for f, entry in self._state.items(): | for f, entry in self._state.items(): | ||||
| if entry[0] == 'd': | if entry[0] == MERGE_RECORD_DRIVER_RESOLVED: | ||||
| yield f | yield f | ||||
| def extras(self, filename): | def extras(self, filename): | ||||
| return self._stateextras.setdefault(filename, {}) | return self._stateextras.setdefault(filename, {}) | ||||
| def _resolve(self, preresolve, dfile, wctx): | def _resolve(self, preresolve, dfile, wctx): | ||||
| """rerun merge process for file path `dfile`""" | """rerun merge process for file path `dfile`""" | ||||
| if self[dfile] in 'rd': | if self[dfile] in (MERGE_RECORD_RESOLVED, | ||||
| MERGE_RECORD_DRIVER_RESOLVED): | |||||
| return True, 0 | return True, 0 | ||||
| stateentry = self._state[dfile] | stateentry = self._state[dfile] | ||||
| state, hash, lfile, afile, anode, ofile, onode, flags = stateentry | state, hash, 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('ancestorlinknode') | anccommitnode = extras.get('ancestorlinknode') | ||||
| if anccommitnode: | if anccommitnode: | ||||
| actx = self._repo[anccommitnode] | actx = self._repo[anccommitnode] | ||||
| fco, fca, | fco, fca, | ||||
| labels=self._labels) | labels=self._labels) | ||||
| if r is None: | if r is None: | ||||
| # no real conflict | # no real conflict | ||||
| del self._state[dfile] | del self._state[dfile] | ||||
| self._stateextras.pop(dfile, None) | self._stateextras.pop(dfile, None) | ||||
| self._dirty = True | self._dirty = True | ||||
| elif not r: | elif not r: | ||||
| self.mark(dfile, 'r') | self.mark(dfile, MERGE_RECORD_RESOLVED) | ||||
| if complete: | if complete: | ||||
| action = None | action = None | ||||
| if deleted: | if deleted: | ||||
| if fcd.isabsent(): | if fcd.isabsent(): | ||||
| # dc: local picked. Need to drop if present, which may | # dc: local picked. Need to drop if present, which may | ||||
| # happen on re-resolves. | # happen on re-resolves. | ||||
| action = 'f' | action = 'f' | ||||