equal
deleted
inserted
replaced
205 self.ui.setconfig('phases', 'publish', False, 'unionrepo') |
205 self.ui.setconfig('phases', 'publish', False, 'unionrepo') |
206 |
206 |
207 @localrepo.unfilteredpropertycache |
207 @localrepo.unfilteredpropertycache |
208 def changelog(self): |
208 def changelog(self): |
209 return unionchangelog(self.svfs, self.repo2.svfs) |
209 return unionchangelog(self.svfs, self.repo2.svfs) |
|
210 |
|
211 @localrepo.unfilteredpropertycache |
|
212 def manifestlog(self): |
|
213 rootstore = unionmanifest(self.svfs, self.repo2.svfs, |
|
214 self.unfiltered()._clrev) |
|
215 return manifest.manifestlog(self.svfs, self, rootstore) |
210 |
216 |
211 def _clrev(self, rev2): |
217 def _clrev(self, rev2): |
212 """map from repo2 changelog rev to temporary rev in self.changelog""" |
218 """map from repo2 changelog rev to temporary rev in self.changelog""" |
213 node = self.repo2.changelog.node(rev2) |
219 node = self.repo2.changelog.node(rev2) |
214 return self.changelog.rev(node) |
220 return self.changelog.rev(node) |