This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8551

context: implement mergestate() method
ClosedPublic

Authored by durin42 on May 18 2020, 6:07 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe607099d8b93: context: implement mergestate() method
rHGf3b69aecfdc3: context: implement mergestate() method
Summary

This will let us have the mergestate storage be controlled by the context. In
particular, for working contexts we should use the existing mergestate, but
for overlay contexts it's inappropriate to drop files in .hg/merge.

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/context.py (12 lines)

Diff 21460

mercurial/context.py

) )
from . import ( from . import (
copies, copies,
dagop, dagop,
encoding, encoding,
error, error,
fileset, fileset,
match as matchmod, match as matchmod,
mergestate as mergestatemod,
obsolete as obsmod, obsolete as obsmod,
patch, patch,
pathutil, pathutil,
phases, phases,
pycompat, pycompat,
repoview, repoview,
scmutil, scmutil,
sparse, sparse,
r.removed.sort() r.removed.sort()
r.deleted.sort() r.deleted.sort()
r.unknown.sort() r.unknown.sort()
r.ignored.sort() r.ignored.sort()
r.clean.sort() r.clean.sort()
return r return r
def mergestate(self, clean=False):
"""Get a mergestate object for this context."""
raise NotImplementedError(
'%s does not implement mergestate()' % self.__class__
)
class changectx(basectx): class changectx(basectx):
"""A changecontext object makes access to data related to a particular """A changecontext object makes access to data related to a particular
changeset convenient. It represents a read-only context already present in changeset convenient. It represents a read-only context already present in
the repo.""" the repo."""
def __init__(self, repo, rev, node, maybe_filtered=True): def __init__(self, repo, rev, node, maybe_filtered=True):
super(changectx, self).__init__(repo) super(changectx, self).__init__(repo)
# write changes out explicitly, because nesting wlock at # write changes out explicitly, because nesting wlock at
# runtime may prevent 'wlock.release()' in 'repo.commit()' # runtime may prevent 'wlock.release()' in 'repo.commit()'
# from immediately doing so for subsequent changing files # from immediately doing so for subsequent changing files
self._repo.dirstate.write(self._repo.currenttransaction()) self._repo.dirstate.write(self._repo.currenttransaction())
sparse.aftercommit(self._repo, node) sparse.aftercommit(self._repo, node)
def mergestate(self, clean=False):
if clean:
return mergestatemod.mergestate.clean(self._repo)
return mergestatemod.mergestate.read(self._repo)
class committablefilectx(basefilectx): class committablefilectx(basefilectx):
"""A committablefilectx provides common functionality for a file context """A committablefilectx provides common functionality for a file context
that wants the ability to commit, e.g. workingfilectx or memfilectx.""" that wants the ability to commit, e.g. workingfilectx or memfilectx."""
def __init__(self, repo, path, filelog=None, ctx=None): def __init__(self, repo, path, filelog=None, ctx=None):
self._repo = repo self._repo = repo
self._path = path self._path = path