This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9043

mergestate: move commit() from base class to on-disk subclass
ClosedPublic

Authored by martinvonz on Sep 18 2020, 2:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0e75c088f0dc: mergestate: move commit() from base class to on-disk subclass
Summary

The commit message doesn't do anything in the in-memory case, and it's
_makerecords() is also not needed in that case, so let's move it
down to the on-disk subclass (i.e. the mergestate class). Sorry I
missed this earlier.

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.

Event Timeline

martinvonz created this revision.Sep 18 2020, 2:20 AM
pulkit added a subscriber: pulkit.Sep 18 2020, 2:53 AM
pulkit added inline comments.
mercurial/mergestate.py
816

Removal of mergedriver seems like an unrelated change here.

martinvonz updated this revision to Diff 22712.Sep 18 2020, 2:56 AM
martinvonz added inline comments.Sep 18 2020, 2:56 AM
mercurial/mergestate.py
816

Removal of mergedriver seems like an unrelated change here.

Indeed. Fixed.

pulkit accepted this revision.Sep 18 2020, 2:57 AM
This revision is now accepted and ready to land.Sep 18 2020, 2:57 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (121 lines)

Diff 22714

mercurial/mergestate.py

Returns True if there appears to be mergestate. This is a rough proxy Returns True if there appears to be mergestate. This is a rough proxy
for "is a merge in progress." for "is a merge in progress."
""" """
return bool(self._local) or bool(self._state) return bool(self._local) or bool(self._state)
def commit(self): def commit(self):
"""Write current state on disk (if necessary)""" """Write current state on disk (if necessary)"""
if self._dirty:
records = self._makerecords()
self._writerecords(records)
self._dirty = False
def _makerecords(self):
records = []
records.append((RECORD_LOCAL, hex(self._local)))
records.append((RECORD_OTHER, hex(self._other)))
if self.mergedriver:
records.append(
(
RECORD_MERGE_DRIVER_STATE,
b'\0'.join([self.mergedriver, self._mdstate]),
)
)
# 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 pycompat.iteritems(self._state):
if v[0] == MERGE_RECORD_DRIVER_RESOLVED:
# Driver-resolved merge. These are stored in 'D' records.
records.append(
(RECORD_MERGE_DRIVER_MERGE, b'\0'.join([filename] + v))
)
elif v[0] in (
MERGE_RECORD_UNRESOLVED_PATH,
MERGE_RECORD_RESOLVED_PATH,
):
# Path conflicts. These are stored in 'P' records. The current
# resolution state ('pu' or 'pr') is stored within the record.
records.append(
(RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
)
elif v[1] == nullhex or v[6] == nullhex:
# 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(
(RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
)
else:
# Normal files. These are stored in 'F' records.
records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
for filename, extras in sorted(pycompat.iteritems(self._stateextras)):
rawextras = b'\0'.join(
b'%s\0%s' % (k, v) for k, v in pycompat.iteritems(extras)
)
records.append(
(RECORD_FILE_VALUES, b'%s\0%s' % (filename, rawextras))
)
if self._labels is not None:
labels = b'\0'.join(self._labels)
records.append((RECORD_LABELS, labels))
return records
@staticmethod @staticmethod
def getlocalkey(path): def getlocalkey(path):
"""hash the path of a local file context for storage in the .hg/merge """hash the path of a local file context for storage in the .hg/merge
directory.""" directory."""
return hex(hashutil.sha1(path).digest()) return hex(hashutil.sha1(path).digest())
rtype, record = record[0:1], record[1:] rtype, record = record[0:1], record[1:]
records.append((rtype, record)) records.append((rtype, record))
f.close() f.close()
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
return records return records
def commit(self):
if self._dirty:
records = self._makerecords()
self._writerecords(records)
self._dirty = False
def _makerecords(self):
records = []
records.append((RECORD_LOCAL, hex(self._local)))
records.append((RECORD_OTHER, hex(self._other)))
if self.mergedriver:
records.append(
(
RECORD_MERGE_DRIVER_STATE,
b'\0'.join([self.mergedriver, self._mdstate]),
)
)
# 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 pycompat.iteritems(self._state):
if v[0] == MERGE_RECORD_DRIVER_RESOLVED:
# Driver-resolved merge. These are stored in 'D' records.
records.append(
(RECORD_MERGE_DRIVER_MERGE, b'\0'.join([filename] + v))
)
elif v[0] in (
MERGE_RECORD_UNRESOLVED_PATH,
MERGE_RECORD_RESOLVED_PATH,
):
# Path conflicts. These are stored in 'P' records. The current
# resolution state ('pu' or 'pr') is stored within the record.
records.append(
(RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
)
elif v[1] == nullhex or v[6] == nullhex:
# 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(
(RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
)
else:
# Normal files. These are stored in 'F' records.
records.append((RECORD_MERGED, b'\0'.join([filename] + v)))
for filename, extras in sorted(pycompat.iteritems(self._stateextras)):
rawextras = b'\0'.join(
b'%s\0%s' % (k, v) for k, v in pycompat.iteritems(extras)
)
records.append(
(RECORD_FILE_VALUES, b'%s\0%s' % (filename, rawextras))
)
if self._labels is not None:
labels = b'\0'.join(self._labels)
records.append((RECORD_LABELS, labels))
return records
def _writerecords(self, records): def _writerecords(self, records):
"""Write current state on disk (both v1 and v2)""" """Write current state on disk (both v1 and v2)"""
self._writerecordsv1(records) self._writerecordsv1(records)
self._writerecordsv2(records) self._writerecordsv2(records)
def _writerecordsv1(self, records): def _writerecordsv1(self, records):
"""Write current state on disk in a version 1 file""" """Write current state on disk in a version 1 file"""
f = self._repo.vfs(self.statepathv1, b'wb') f = self._repo.vfs(self.statepathv1, b'wb')
def _make_backup(self, fctx, localkey): def _make_backup(self, fctx, localkey):
self._backups[localkey] = fctx.data() self._backups[localkey] = fctx.data()
def _restore_backup(self, fctx, localkey, flags): def _restore_backup(self, fctx, localkey, flags):
fctx.write(self._backups[localkey], flags) fctx.write(self._backups[localkey], flags)
@util.propertycache @util.propertycache
def mergedriver(self): def mergedriver(self):
pulkitUnsubmitted
Not Done

Removal of mergedriver seems like an unrelated change here.

pulkit: Removal of `mergedriver` seems like an unrelated change here.
martinvonzAuthorUnsubmitted
Done

Removal of mergedriver seems like an unrelated change here.

Indeed. Fixed.

martinvonz: > Removal of mergedriver seems like an unrelated change here. Indeed. Fixed.
configmergedriver = self._repo.ui.config( configmergedriver = self._repo.ui.config(
b'experimental', b'mergedriver' b'experimental', b'mergedriver'
) )
if configmergedriver: if configmergedriver:
raise error.InMemoryMergeConflictsError( raise error.InMemoryMergeConflictsError(
b"in-memory merge does not support mergedriver" b"in-memory merge does not support mergedriver"
) )
return None return None
def commit(self):
pass
def recordupdates(repo, actions, branchmerge, getfiledata): def recordupdates(repo, actions, branchmerge, getfiledata):
"""record merge actions to the dirstate""" """record merge actions to the dirstate"""
# remove (must come first) # remove (must come first)
for f, args, msg in actions.get(ACTION_REMOVE, []): for f, args, msg in actions.get(ACTION_REMOVE, []):
if branchmerge: if branchmerge:
repo.dirstate.remove(f) repo.dirstate.remove(f)
else: else: