| hg-reviewers |
This was introduced in last cycle however while working on refactoring
mergestate, I realized it's unncessary.
This will break users who did a merge using previous version, did this kind of
storage and before commiting updated the mercurial version.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| RECORD_MERGE_DRIVER_MERGE = b'D' | RECORD_MERGE_DRIVER_MERGE = b'D' | ||||
| 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' | ||||
| RECORD_RESOLVED_OTHER = b'R' | |||||
| 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_UNRESOLVED = b'u' | ||||
| MERGE_RECORD_RESOLVED = b'r' | MERGE_RECORD_RESOLVED = b'r' | ||||
| MERGE_RECORD_UNRESOLVED_PATH = b'pu' | MERGE_RECORD_UNRESOLVED_PATH = b'pu' | ||||
| self._readmergedriver = bits[0] | self._readmergedriver = bits[0] | ||||
| self._mdstate = mdstate | self._mdstate = mdstate | ||||
| elif rtype in ( | elif rtype in ( | ||||
| RECORD_MERGED, | RECORD_MERGED, | ||||
| RECORD_CHANGEDELETE_CONFLICT, | RECORD_CHANGEDELETE_CONFLICT, | ||||
| RECORD_PATH_CONFLICT, | RECORD_PATH_CONFLICT, | ||||
| RECORD_MERGE_DRIVER_MERGE, | RECORD_MERGE_DRIVER_MERGE, | ||||
| RECORD_RESOLVED_OTHER, | |||||
| ): | ): | ||||
| bits = record.split(b'\0') | bits = record.split(b'\0') | ||||
| self._state[bits[0]] = bits[1:] | self._state[bits[0]] = bits[1:] | ||||
| elif rtype == RECORD_FILE_VALUES: | elif rtype == RECORD_FILE_VALUES: | ||||
| filename, rawextras = record.split(b'\0', 1) | filename, rawextras = record.split(b'\0', 1) | ||||
| extraparts = rawextras.split(b'\0') | extraparts = rawextras.split(b'\0') | ||||
| extras = {} | extras = {} | ||||
| i = 0 | i = 0 | ||||
| MERGE_RECORD_RESOLVED_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( | records.append( | ||||
| (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v)) | (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v)) | ||||
| ) | ) | ||||
| elif v[0] == MERGE_RECORD_MERGED_OTHER: | elif v[0] == MERGE_RECORD_MERGED_OTHER: | ||||
| records.append( | records.append((RECORD_MERGED, b'\0'.join([filename] + v))) | ||||
| (RECORD_RESOLVED_OTHER, b'\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 | ||||
| # is nullhex when the file is deleted remotely ('cd'). | # is nullhex when the file is deleted remotely ('cd'). | ||||
| records.append( | records.append( | ||||
| (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v)) | (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v)) | ||||
| ) | ) | ||||