| indygreg |
| hg-reviewers |
This is hopefully not very controverial. I found the initialization
before this patch unorthodox. It wasn't clear which properties the
object was supposed to have.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/mergestate.py (33 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| ms._read() | ms._read() | ||||
| return ms | return ms | ||||
| def __init__(self, repo): | def __init__(self, repo): | ||||
| """Initialize the merge state. | """Initialize the merge state. | ||||
| Do not use this directly! Instead call read() or clean().""" | Do not use this directly! Instead call read() or clean().""" | ||||
| self._repo = repo | self._repo = repo | ||||
| self._dirty = False | self._state = {} | ||||
| self._stateextras = collections.defaultdict(dict) | |||||
| self._local = None | |||||
| self._other = None | |||||
| self._labels = None | self._labels = None | ||||
| self._readmergedriver = None | |||||
| self._mdstate = MERGE_DRIVER_STATE_UNMARKED | |||||
| # contains a mapping of form: | |||||
| # {filename : (merge_return_value, action_to_be_performed} | |||||
| # these are results of re-running merge process | |||||
| # this dict is used to perform actions on dirstate caused by re-running | |||||
| # the merge | |||||
| self._results = {} | |||||
| self._dirty = False | |||||
| def reset(self): | def reset(self): | ||||
| shutil.rmtree(self._repo.vfs.join(b'merge'), True) | shutil.rmtree(self._repo.vfs.join(b'merge'), True) | ||||
| def start(self, node, other, labels=None): | def start(self, node, other, labels=None): | ||||
| self._local = node | self._local = node | ||||
| self._other = other | self._other = other | ||||
| self._labels = labels | self._labels = labels | ||||
| self._state = {} | |||||
| self._stateextras = collections.defaultdict(dict) | |||||
| self._readmergedriver = None | |||||
| if self.mergedriver: | if self.mergedriver: | ||||
| self._mdstate = MERGE_DRIVER_STATE_SUCCESS | self._mdstate = MERGE_DRIVER_STATE_SUCCESS | ||||
| else: | |||||
| self._mdstate = MERGE_DRIVER_STATE_UNMARKED | |||||
| self._results = {} | |||||
| 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._stateextras = collections.defaultdict(dict) | |||||
| self._local = None | |||||
| self._other = None | |||||
| self._readmergedriver = None | |||||
| self._mdstate = MERGE_DRIVER_STATE_SUCCESS | 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) | ||||
| i += 2 | i += 2 | ||||
| self._stateextras[filename] = extras | self._stateextras[filename] = extras | ||||
| elif rtype == RECORD_LABELS: | elif rtype == RECORD_LABELS: | ||||
| labels = record.split(b'\0', 2) | labels = record.split(b'\0', 2) | ||||
| self._labels = [l for l in labels if len(l) > 0] | self._labels = [l for l in labels if len(l) > 0] | ||||
| elif not rtype.islower(): | elif not rtype.islower(): | ||||
| unsupported.add(rtype) | unsupported.add(rtype) | ||||
| # contains a mapping of form: | |||||
| # {filename : (merge_return_value, action_to_be_performed} | |||||
| # these are results of re-running merge process | |||||
| # this dict is used to perform actions on dirstate caused by re-running | |||||
| # the merge | |||||
| self._results = {} | |||||
| self._dirty = False | |||||
| if unsupported: | if unsupported: | ||||
| raise error.UnsupportedMergeRecords(unsupported) | raise error.UnsupportedMergeRecords(unsupported) | ||||
| def _readrecords(self): | def _readrecords(self): | ||||
| """Read merge state from disk and return a list of record (TYPE, data) | """Read merge state from disk and return a list of record (TYPE, data) | ||||
| We read data from both v1 and v2 files and decide which one to use. | We read data from both v1 and v2 files and decide which one to use. | ||||