Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 37174:daef13da66fe
context: avoid using a context object as a changeid
I find it misleading to pass changeid=changectx. It currently works to
do that because there's weird (IMO) handling of it in
basectx.__new__. I'm planning on removing that code. Passing changeid
as "changeid" and context as "context" makes it more readable.
Note that the documentation of filectx.__init__ doesn't even seem to
be aware that a changeid can be a context ("changeset revision, node,
or tag").
Differential Revision: https://phab.mercurial-scm.org/D2967
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 29 Mar 2018 21:29:15 -0700 |
| parents | db90a5793103 |
| children | bb47dc2f71a0 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Mar 29 21:15:40 2018 -0700 +++ b/mercurial/localrepo.py Thu Mar 29 21:29:15 2018 -0700 @@ -1086,10 +1086,11 @@ if f not in pctx and s not in pctx: self.dirstate.copy(None, f) - def filectx(self, path, changeid=None, fileid=None): + def filectx(self, path, changeid=None, fileid=None, changectx=None): """changeid can be a changeset revision, node, or tag. fileid can be a file revision or node.""" - return context.filectx(self, path, changeid, fileid) + return context.filectx(self, path, changeid, fileid, + changectx=changectx) def getcwd(self): return self.dirstate.getcwd()