Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D955
merge: improve comments in mergestate._makerecordsClosedPublic
merge: improve comments in mergestate._makerecords
ClosedPublic
Authored by mbthomas on Oct 5 2017, 11:06 AM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (25 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas | ||
| Closed | mbthomas |
Diff 2559
Diff 2559
mercurial/merge.py
| def _makerecords(self): | def _makerecords(self): | ||||
| records = [] | records = [] | ||||
| records.append(('L', hex(self._local))) | records.append(('L', hex(self._local))) | ||||
| records.append(('O', hex(self._other))) | records.append(('O', hex(self._other))) | ||||
| if self.mergedriver: | if self.mergedriver: | ||||
| records.append(('m', '\0'.join([ | records.append(('m', '\0'.join([ | ||||
| self.mergedriver, self._mdstate]))) | self.mergedriver, self._mdstate]))) | ||||
| for d, v in self._state.iteritems(): | # 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 | |||||
| # 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 | |||||
| # from loading them. | |||||
| for filename, v in self._state.iteritems(): | |||||
| if v[0] == 'd': | if v[0] == 'd': | ||||
| records.append(('D', '\0'.join([d] + v))) | # Driver-resolved merge. These are stored in 'D' records. | ||||
| records.append(('D', '\0'.join([filename] + v))) | |||||
| elif v[0] in ('pu', 'pr'): | elif v[0] in ('pu', 'pr'): | ||||
| records.append(('P', '\0'.join([d] + v))) | # Path conflicts. These are stored in 'P' records. The current | ||||
| # v[1] == local ('cd'), v[6] == other ('dc') -- not supported by | # resolution state ('pu' or 'pr') is stored within the record. | ||||
| # older versions of Mercurial | records.append(('P', '\0'.join([filename] + v))) | ||||
| elif v[1] == nullhex or v[6] == nullhex: | elif v[1] == nullhex or v[6] == nullhex: | ||||
| records.append(('C', '\0'.join([d] + v))) | # Change/Delete or Delete/Change conflicts. These are stored in | ||||
| # '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 | |||||
| # is nullhex when the file is deleted remotely ('cd'). | |||||
| records.append(('C', '\0'.join([filename] + v))) | |||||
| else: | else: | ||||
| records.append(('F', '\0'.join([d] + v))) | # Normal files. These are stored in 'F' records. | ||||
| records.append(('F', '\0'.join([filename] + v))) | |||||
| for filename, extras in sorted(self._stateextras.iteritems()): | for filename, extras in sorted(self._stateextras.iteritems()): | ||||
| rawextras = '\0'.join('%s\0%s' % (k, v) for k, v in | rawextras = '\0'.join('%s\0%s' % (k, v) for k, v in | ||||
| extras.iteritems()) | extras.iteritems()) | ||||
| records.append(('f', '%s\0%s' % (filename, rawextras))) | records.append(('f', '%s\0%s' % (filename, rawextras))) | ||||
| if self._labels is not None: | if self._labels is not None: | ||||
| labels = '\0'.join(self._labels) | labels = '\0'.join(self._labels) | ||||
| records.append(('l', labels)) | records.append(('l', labels)) | ||||
| return records | return records | ||||