| durin42 |
| hg-reviewers |
Named constants are superior to magic values.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| RECORD_PATH_CONFLICT = b'P' | RECORD_PATH_CONFLICT = b'P' | ||||
| RECORD_MERGE_DRIVER_STATE = b'm' | RECORD_MERGE_DRIVER_STATE = b'm' | ||||
| RECORD_FILE_VALUES = b'f' | RECORD_FILE_VALUES = b'f' | ||||
| RECORD_LABELS = b'l' | RECORD_LABELS = b'l' | ||||
| 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_MARKED = b'm' | |||||
| MERGE_DRIVER_STATE_SUCCESS = b's' | |||||
| 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`. | ||||
| for var in ('localctx', 'otherctx'): | for var in ('localctx', 'otherctx'): | ||||
| if var in vars(self): | if var in vars(self): | ||||
| delattr(self, var) | delattr(self, var) | ||||
| if node: | if node: | ||||
| self._local = node | self._local = node | ||||
| self._other = other | self._other = other | ||||
| self._readmergedriver = None | self._readmergedriver = None | ||||
| if self.mergedriver: | if self.mergedriver: | ||||
| self._mdstate = 's' | self._mdstate = MERGE_DRIVER_STATE_SUCCESS | ||||
| else: | else: | ||||
| self._mdstate = 'u' | self._mdstate = MERGE_DRIVER_STATE_UNMARKED | ||||
| shutil.rmtree(self._repo.vfs.join('merge'), True) | shutil.rmtree(self._repo.vfs.join('merge'), True) | ||||
| self._results = {} | self._results = {} | ||||
| self._dirty = False | self._dirty = False | ||||
| def _read(self): | def _read(self): | ||||
| """Analyse each record content to restore a serialized state from disk | """Analyse each record content to restore a serialized state from disk | ||||
| This function process "record" entry produced by the de-serialization | This function process "record" entry produced by the de-serialization | ||||
| of on disk file. | of on disk file. | ||||
| """ | """ | ||||
| self._state = {} | self._state = {} | ||||
| self._stateextras = {} | self._stateextras = {} | ||||
| self._local = None | self._local = None | ||||
| self._other = None | self._other = None | ||||
| for var in ('localctx', 'otherctx'): | for var in ('localctx', 'otherctx'): | ||||
| if var in vars(self): | if var in vars(self): | ||||
| delattr(self, var) | delattr(self, var) | ||||
| self._readmergedriver = None | self._readmergedriver = None | ||||
| self._mdstate = 's' | self._mdstate = MERGE_DRIVER_STATE_SUCCESS | ||||
| unsupported = set() | unsupported = set() | ||||
| records = self._readrecords() | records = self._readrecords() | ||||
| for rtype, record in records: | for rtype, record in records: | ||||
| if rtype == RECORD_LOCAL: | if rtype == RECORD_LOCAL: | ||||
| self._local = bin(record) | self._local = bin(record) | ||||
| elif rtype == RECORD_OTHER: | elif rtype == RECORD_OTHER: | ||||
| self._other = bin(record) | self._other = bin(record) | ||||
| elif rtype == RECORD_MERGE_DRIVER_STATE: | elif rtype == RECORD_MERGE_DRIVER_STATE: | ||||
| bits = record.split('\0', 1) | bits = record.split('\0', 1) | ||||
| mdstate = bits[1] | mdstate = bits[1] | ||||
| if len(mdstate) != 1 or mdstate not in 'ums': | if len(mdstate) != 1 or mdstate not in ( | ||||
| MERGE_DRIVER_STATE_UNMARKED, MERGE_DRIVER_STATE_MARKED, | |||||
| MERGE_DRIVER_STATE_SUCCESS): | |||||
| # the merge driver should be idempotent, so just rerun it | # the merge driver should be idempotent, so just rerun it | ||||
| mdstate = 'u' | mdstate = MERGE_DRIVER_STATE_UNMARKED | ||||
| self._readmergedriver = bits[0] | self._readmergedriver = bits[0] | ||||
| self._mdstate = mdstate | self._mdstate = mdstate | ||||
| elif rtype in (RECORD_MERGED, RECORD_CHANGEDELETE_CONFLICT, | elif rtype in (RECORD_MERGED, RECORD_CHANGEDELETE_CONFLICT, | ||||
| RECORD_PATH_CONFLICT, RECORD_MERGE_DRIVER_MERGE): | RECORD_PATH_CONFLICT, RECORD_MERGE_DRIVER_MERGE): | ||||
| bits = record.split('\0') | bits = record.split('\0') | ||||
| self._state[bits[0]] = bits[1:] | self._state[bits[0]] = bits[1:] | ||||
| elif rtype == RECORD_FILE_VALUES: | elif rtype == RECORD_FILE_VALUES: | ||||
| progress(_updating, z, item=f, total=numupdates, unit=_files) | progress(_updating, z, item=f, total=numupdates, unit=_files) | ||||
| ms.resolve(f, wctx) | ms.resolve(f, wctx) | ||||
| finally: | finally: | ||||
| ms.commit() | ms.commit() | ||||
| unresolved = ms.unresolvedcount() | unresolved = ms.unresolvedcount() | ||||
| if usemergedriver and not unresolved and ms.mdstate() != 's': | if (usemergedriver and not unresolved | ||||
| and ms.mdstate() != MERGE_DRIVER_STATE_SUCCESS): | |||||
| if not driverconclude(repo, ms, wctx, labels=labels): | if not driverconclude(repo, ms, wctx, labels=labels): | ||||
| # XXX setting unresolved to at least 1 is a hack to make sure we | # XXX setting unresolved to at least 1 is a hack to make sure we | ||||
| # error out | # error out | ||||
| unresolved = max(unresolved, 1) | unresolved = max(unresolved, 1) | ||||
| ms.commit() | ms.commit() | ||||
| msupdated, msmerged, msremoved = ms.counts() | msupdated, msmerged, msremoved = ms.counts() | ||||