This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2970

context: set repo property in basectx
ClosedPublic

Authored by martinvonz on Mar 30 2018, 2:09 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfbe34945220d: context: set repo property in basectx
Summary

It seems like a good practice to call the super constructor. Let's
start by passing the repo along to basectx so it can assign it to a
private attribute. We should perhaps pass the rev and node along as
well, but that requires more work before it can be done.

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.Mar 30 2018, 2:09 AM
indygreg accepted this revision.Mar 30 2018, 1:28 PM
This revision is now accepted and ready to land.Mar 30 2018, 1:28 PM
Closed by commit rHGfbe34945220d: context: set repo property in basectx (authored by martinvonz). · Explain WhyMar 30 2018, 1:29 PM
This revision was automatically updated to reflect the committed changes.
indygreg updated this revision to Diff 7394.Mar 30 2018, 2:12 PM
indygreg added a comment.Mar 30 2018, 2:14 PM

I accidentally pushed this. Derp.

indygreg added a comment.Mar 30 2018, 2:15 PM

I mean accidentally pushed to Phabricator after the queuing. The queueing was correct.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (8 lines)

Diff 7393

mercurial/context.py

class basectx(object): class basectx(object):
"""A basectx object represents the common logic for its children: """A basectx object represents the common logic for its children:
changectx: read-only context that is already present in the repo, changectx: read-only context that is already present in the repo,
workingctx: a context that represents the working directory and can workingctx: a context that represents the working directory and can
be committed, be committed,
memctx: a context that represents changes in-memory and can also memctx: a context that represents changes in-memory and can also
be committed.""" be committed."""
def __init__(self, repo):
self._repo = repo
def __bytes__(self): def __bytes__(self):
return short(self.node()) return short(self.node())
__str__ = encoding.strmethod(__bytes__) __str__ = encoding.strmethod(__bytes__)
def __repr__(self): def __repr__(self):
return r"<%s %s>" % (type(self).__name__, str(self)) return r"<%s %s>" % (type(self).__name__, str(self))
return error.FilteredRepoLookupError(msg) return error.FilteredRepoLookupError(msg)
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, changeid='.'): def __init__(self, repo, changeid='.'):
"""changeid is a revision number, node, or tag""" """changeid is a revision number, node, or tag"""
super(changectx, self).__init__(repo)
if changeid == '': if changeid == '':
changeid = '.' changeid = '.'
self._repo = repo
try: try:
if isinstance(changeid, int): if isinstance(changeid, int):
self._node = repo.changelog.node(changeid) self._node = repo.changelog.node(changeid)
self._rev = changeid self._rev = changeid
return return
if not pycompat.ispy3 and isinstance(changeid, long): if not pycompat.ispy3 and isinstance(changeid, long):
changeid = "%d" % changeid changeid = "%d" % changeid
return [filectx(self._repo, self._path, fileid=x, return [filectx(self._repo, self._path, fileid=x,
filelog=self._filelog) for x in c] filelog=self._filelog) for x in c]
class committablectx(basectx): class committablectx(basectx):
"""A committablectx object provides common functionality for a context that """A committablectx object provides common functionality for a context that
wants the ability to commit, e.g. workingctx or memctx.""" wants the ability to commit, e.g. workingctx or memctx."""
def __init__(self, repo, text="", user=None, date=None, extra=None, def __init__(self, repo, text="", user=None, date=None, extra=None,
changes=None): changes=None):
self._repo = repo super(committablectx, self).__init__(repo)
self._rev = None self._rev = None
self._node = None self._node = None
self._text = text self._text = text
if date: if date:
self._date = dateutil.parsedate(date) self._date = dateutil.parsedate(date)
if user: if user:
self._user = user self._user = user
if changes: if changes:
'copied': str? (path or None) 'copied': str? (path or None)
} }
If `exists` is True, `flags` must be non-None and 'date' is non-None. If it If `exists` is True, `flags` must be non-None and 'date' is non-None. If it
is `False`, the file was deleted. is `False`, the file was deleted.
""" """
def __init__(self, repo): def __init__(self, repo):
super(overlayworkingctx, self).__init__(repo) super(overlayworkingctx, self).__init__(repo)
self._repo = repo
self.clean() self.clean()
def setbase(self, wrappedctx): def setbase(self, wrappedctx):
self._wrappedctx = wrappedctx self._wrappedctx = wrappedctx
self._parents = [wrappedctx] self._parents = [wrappedctx]
# Drop old manifest cache as it is now out of date. # Drop old manifest cache as it is now out of date.
# This is necessary when, e.g., rebasing several nodes with one # This is necessary when, e.g., rebasing several nodes with one
# ``overlayworkingctx`` (e.g. with --collapse). # ``overlayworkingctx`` (e.g. with --collapse).