Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/unionrepo.py @ 41041:3913223417ea
manifest: accept narrowmatch into constructor instead of getting from repo
The manifest should ideally not know at all about the repo, so this is
just a little step towards cleaning that up.
Differential Revision: https://phab.mercurial-scm.org/D5469
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 03 Dec 2018 22:22:23 -0800 |
| parents | 55db747a21ad |
| children | 94e2f8437f6b |
comparison
equal
deleted
inserted
replaced
| 41040:2eeef8e577ac | 41041:3913223417ea |
|---|---|
| 210 | 210 |
| 211 @localrepo.unfilteredpropertycache | 211 @localrepo.unfilteredpropertycache |
| 212 def manifestlog(self): | 212 def manifestlog(self): |
| 213 rootstore = unionmanifest(self.svfs, self.repo2.svfs, | 213 rootstore = unionmanifest(self.svfs, self.repo2.svfs, |
| 214 self.unfiltered()._clrev) | 214 self.unfiltered()._clrev) |
| 215 return manifest.manifestlog(self.svfs, self, rootstore) | 215 return manifest.manifestlog(self.svfs, self, rootstore, |
| 216 self.narrowmatch()) | |
| 216 | 217 |
| 217 def _clrev(self, rev2): | 218 def _clrev(self, rev2): |
| 218 """map from repo2 changelog rev to temporary rev in self.changelog""" | 219 """map from repo2 changelog rev to temporary rev in self.changelog""" |
| 219 node = self.repo2.changelog.node(rev2) | 220 node = self.repo2.changelog.node(rev2) |
| 220 return self.changelog.rev(node) | 221 return self.changelog.rev(node) |