This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9038

mergestate: extract overridable methods for making/restoring file backups
ClosedPublic

Authored by martinvonz on Sep 17 2020, 4:10 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe833ff4dd0ea: mergestate: extract overridable methods for making/restoring file backups
Summary

In-memory merge currently still uses on-disk mergestate. That's mostly
harmless (I don't think I've seen any problem it's actually
caused). It's still a little weird. I'm planning to add an in-memory
mergestate, which will be used with overlayworkingctx. This patch
prepares for that by extracting that logic, so it's easier to change
per subclass.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/mergestate.py (13 lines)

Diff 22705

mercurial/mergestate.py

@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())
def _make_backup(self, fctx, localkey):
self._repo.vfs.write(b'merge/' + localkey, fctx.data())
def _restore_backup(self, fctx, localkey, flags):
with self._repo.vfs(b'merge/' + localkey) as f:
fctx.write(f.read(), flags)
def add(self, fcl, fco, fca, fd): def add(self, fcl, fco, fca, fd):
"""add a new (potentially?) conflicting file the merge state """add a new (potentially?) conflicting file the merge state
fcl: file context for local, fcl: file context for local,
fco: file context for remote, fco: file context for remote,
fca: file context for ancestors, fca: file context for ancestors,
fd: file path of the resulting merge. fd: file path of the resulting merge.
note: also write the local version to the `.hg/merge` directory. note: also write the local version to the `.hg/merge` directory.
""" """
if fcl.isabsent(): if fcl.isabsent():
localkey = nullhex localkey = nullhex
else: else:
localkey = mergestate.getlocalkey(fcl.path()) localkey = mergestate.getlocalkey(fcl.path())
self._repo.vfs.write(b'merge/' + localkey, fcl.data()) self._make_backup(fcl, localkey)
self._state[fd] = [ self._state[fd] = [
MERGE_RECORD_UNRESOLVED, MERGE_RECORD_UNRESOLVED,
localkey, localkey,
fcl.path(), fcl.path(),
fca.path(), fca.path(),
hex(fca.filenode()), hex(fca.filenode()),
fco.path(), fco.path(),
hex(fco.filenode()), hex(fco.filenode()),
) )
% afile % afile
) )
elif flags == fla: elif flags == fla:
flags = flo flags = flo
if preresolve: if preresolve:
# restore local # restore local
if localkey != nullhex: if localkey != nullhex:
f = self._repo.vfs(b'merge/' + localkey) self._restore_backup(wctx[dfile], localkey, flags)
wctx[dfile].write(f.read(), flags)
f.close()
else: else:
wctx[dfile].remove(ignoremissing=True) wctx[dfile].remove(ignoremissing=True)
complete, merge_ret, deleted = filemerge.premerge( complete, merge_ret, deleted = filemerge.premerge(
self._repo, self._repo,
wctx, wctx,
self._local, self._local,
lfile, lfile,
fcd, fcd,