Mercurial > hg-stable
comparison mercurial/mergestate.py @ 45166:a5be403dd7a0
mergestate: document what mergestate._results is for
Understanding that dict is important for understanding how mergestate is
performing operations on dirstate.
Differential Revision: https://phab.mercurial-scm.org/D8739
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 09 Jul 2020 18:43:38 +0530 |
parents | 01c4dccfd6b5 |
children | 7fc3c5fbc65f c515c54f6530 |
comparison
equal
deleted
inserted
replaced
45165:01c4dccfd6b5 | 45166:a5be403dd7a0 |
---|---|
265 elif rtype == RECORD_LABELS: | 265 elif rtype == RECORD_LABELS: |
266 labels = record.split(b'\0', 2) | 266 labels = record.split(b'\0', 2) |
267 self._labels = [l for l in labels if len(l) > 0] | 267 self._labels = [l for l in labels if len(l) > 0] |
268 elif not rtype.islower(): | 268 elif not rtype.islower(): |
269 unsupported.add(rtype) | 269 unsupported.add(rtype) |
270 # contains a mapping of form: | |
271 # {filename : (merge_return_value, action_to_be_performed} | |
272 # these are results of re-running merge process | |
273 # this dict is used to perform actions on dirstate caused by re-running | |
274 # the merge | |
270 self._results = {} | 275 self._results = {} |
271 self._dirty = False | 276 self._dirty = False |
272 | 277 |
273 if unsupported: | 278 if unsupported: |
274 raise error.UnsupportedMergeRecords(unsupported) | 279 raise error.UnsupportedMergeRecords(unsupported) |