Mercurial > public > mercurial-scm > hg

comparison mercurial/mergestate.py @ 45271:7fc3c5fbc65f stable 5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: fix BC breakage introduced because of removal of a merge record In fcd0cff3400a I removed the usage of RECORD_RESOLVED_OTHER. However I also removed the reading support, hence if there is any user who runs into merge conflict with older version of hg, upgrades hg and then tries to read mergestate, they will end up with an MergeRecordUnsupportedError.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 01 Aug 2020 18:39:28 +0530
parents a5be403dd7a0
children fa18b02df8dd
comparison
equal deleted inserted replaced
45253:9b5723784aac 45271:7fc3c5fbc65f
93 # RECORD_MERGE_DRIVER_STATE entry 93 # RECORD_MERGE_DRIVER_STATE entry
94 ##### 94 #####
95 MERGE_DRIVER_STATE_UNMARKED = b'u' 95 MERGE_DRIVER_STATE_UNMARKED = b'u'
96 MERGE_DRIVER_STATE_MARKED = b'm' 96 MERGE_DRIVER_STATE_MARKED = b'm'
97 MERGE_DRIVER_STATE_SUCCESS = b's' 97 MERGE_DRIVER_STATE_SUCCESS = b's'
98
99 #####
100 # legacy records which are no longer used but kept to prevent breaking BC
101 #####
102 # This record was release in 5.4 and usage was removed in 5.5
103 LEGACY_RECORD_RESOLVED_OTHER = b'R'
98 104
99 105
100 ACTION_FORGET = b'f' 106 ACTION_FORGET = b'f'
101 ACTION_REMOVE = b'r' 107 ACTION_REMOVE = b'r'
102 ACTION_ADD = b'a' 108 ACTION_ADD = b'a'
247 elif rtype in ( 253 elif rtype in (
248 RECORD_MERGED, 254 RECORD_MERGED,
249 RECORD_CHANGEDELETE_CONFLICT, 255 RECORD_CHANGEDELETE_CONFLICT,
250 RECORD_PATH_CONFLICT, 256 RECORD_PATH_CONFLICT,
251 RECORD_MERGE_DRIVER_MERGE, 257 RECORD_MERGE_DRIVER_MERGE,
258 LEGACY_RECORD_RESOLVED_OTHER,
252 ): 259 ):
253 bits = record.split(b'\0') 260 bits = record.split(b'\0')
254 self._state[bits[0]] = bits[1:] 261 self._state[bits[0]] = bits[1:]
255 elif rtype == RECORD_FILE_VALUES: 262 elif rtype == RECORD_FILE_VALUES:
256 filename, rawextras = record.split(b'\0', 1) 263 filename, rawextras = record.split(b'\0', 1)