Skip to content
Snippets Groups Projects
Commit f23973ea3107 authored by Benoit Boissinot's avatar Benoit Boissinot
Browse files

fix filectxt to really work

- use a context instead of changelog.read
- changectx._id is not necessary
parent 6414ee2eb688
No related branches found
No related tags found
No related merge requests found
......@@ -11,5 +11,4 @@
def __init__(self, repo, changeid):
"""changeid is a revision number, node, or tag"""
self._repo = repo
self._id = changeid
......@@ -15,5 +14,5 @@
self._node = self._repo.lookup(self._id)
self._node = self._repo.lookup(changeid)
self._rev = self._repo.changelog.rev(self._node)
def changeset(self):
......@@ -74,6 +73,4 @@
fileid can be a file revision or node."""
self._repo = repo
self._path = path
self._id = changeid
self._fileid = fileid
......@@ -79,3 +76,5 @@
if self._id:
assert changeid or fileid
if not fileid:
# if given a changeset id, go ahead and look up the file
......@@ -81,4 +80,4 @@
# if given a changeset id, go ahead and look up the file
self._changeset = self._repo.changelog.read(self._id)
node, flag = self._repo.manifest.find(self._changeset[0], path)
self._changeid = changeid
self._changectx = self.changectx()
self._filelog = self._repo.file(self._path)
......@@ -84,5 +83,5 @@
self._filelog = self._repo.file(self._path)
self._filenode = node
elif self._fileid:
self._filenode = self._changectx.filenode(self._path)
else:
# else be lazy
self._filelog = self._repo.file(self._path)
......@@ -87,5 +86,6 @@
# else be lazy
self._filelog = self._repo.file(self._path)
self._filenode = self._filelog.lookup(self._fileid)
self._filenode = self._filelog.lookup(fileid)
self._changeid = self._filelog.linkrev(self._filenode)
self._filerev = self._filelog.rev(self._filenode)
......@@ -90,4 +90,4 @@
self._filerev = self._filelog.rev(self._filenode)
def changeset(self):
def changectx(self):
try:
......@@ -93,3 +93,3 @@
try:
return self._changeset
return self._changectx
except AttributeError:
......@@ -95,8 +95,8 @@
except AttributeError:
self._changeset = self._repo.changelog.read(self.node())
return self._changeset
self._changectx = changectx(self._repo, self._changeid)
return self._changectx
def filerev(self): return self._filerev
def filenode(self): return self._filenode
def filelog(self): return self._filelog
......@@ -98,15 +98,15 @@
def filerev(self): return self._filerev
def filenode(self): return self._filenode
def filelog(self): return self._filelog
def rev(self): return self.changeset().rev()
def node(self): return self.changeset().node()
def user(self): return self.changeset().user()
def date(self): return self.changeset().date()
def files(self): return self.changeset().files()
def description(self): return self.changeset().description()
def manifest(self): return self.changeset().manifest()
def rev(self): return self.changectx().rev()
def node(self): return self.changectx().node()
def user(self): return self.changectx().user()
def date(self): return self.changectx().date()
def files(self): return self.changectx().files()
def description(self): return self.changectx().description()
def manifest(self): return self.changectx().manifest()
def data(self): return self._filelog.read(self._filenode)
def metadata(self): return self._filelog.readmeta(self._filenode)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment