Skip to content
Snippets Groups Projects
Commit b966e35a authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

unionrepo: properly handle hidden linkrev in revlog (issue5070)

The unionrepository have to do some special magic to handle linkrev of the
unioned filerev and manifestrev. That logic was done from a repoview and
obsolescence marker affecting bundled changeset could lead to a crash. We now
ensure we operate on unfiltered repository.
parent 7a8c4484
No related branches found
No related tags found
No related merge requests found
......@@ -211,10 +211,10 @@
@localrepo.unfilteredpropertycache
def manifest(self):
return unionmanifest(self.svfs, self.repo2.svfs,
self._clrev)
self.unfiltered()._clrev)
def url(self):
return self._url
def file(self, f):
return unionfilelog(self.svfs, f, self.repo2.svfs,
......@@ -215,10 +215,10 @@
def url(self):
return self._url
def file(self, f):
return unionfilelog(self.svfs, f, self.repo2.svfs,
self._clrev, self)
self.unfiltered()._clrev, self)
def close(self):
self.repo2.close()
......
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