Mercurial > public > mercurial-scm > hg

comparison mercurial/pure/parsers.py @ 48154:7a8c9869e4fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: replace call to new_merged The constructor is on its way out, so we inline the last relevant call before dropping it. Differential Revision: https://phab.mercurial-scm.org/D11598
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 09:12:52 +0200
parents c29d312657d2
children b2af515b4faf
comparison
equal deleted inserted replaced
48153:c29d312657d2 48154:7a8c9869e4fe
160 160
161 Since the dirstate-v1 format is frozen, the signature of this function 161 Since the dirstate-v1 format is frozen, the signature of this function
162 is not expected to change, unlike the __init__ one. 162 is not expected to change, unlike the __init__ one.
163 """ 163 """
164 if state == b'm': 164 if state == b'm':
165 return cls.new_merged() 165 return cls(wc_tracked=True, p1_tracked=True, p2_info=True)
166 elif state == b'a': 166 elif state == b'a':
167 return cls.new_added() 167 return cls.new_added()
168 elif state == b'r': 168 elif state == b'r':
169 if size == NONNORMAL: 169 if size == NONNORMAL:
170 p1_tracked = True 170 p1_tracked = True