150 return changelog.changelog.revision(self, nodeorrev) |
150 return changelog.changelog.revision(self, nodeorrev) |
151 |
151 |
152 def baserevdiff(self, rev1, rev2): |
152 def baserevdiff(self, rev1, rev2): |
153 return changelog.changelog.revdiff(self, rev1, rev2) |
153 return changelog.changelog.revdiff(self, rev1, rev2) |
154 |
154 |
155 class unionmanifest(unionrevlog, manifest.manifest): |
155 class unionmanifest(unionrevlog, manifest.manifestrevlog): |
156 def __init__(self, opener, opener2, linkmapper): |
156 def __init__(self, opener, opener2, linkmapper): |
157 manifest.manifest.__init__(self, opener) |
157 manifest.manifestrevlog.__init__(self, opener) |
158 manifest2 = manifest.manifest(opener2) |
158 manifest2 = manifest.manifestrevlog(opener2) |
159 unionrevlog.__init__(self, opener, self.indexfile, manifest2, |
159 unionrevlog.__init__(self, opener, self.indexfile, manifest2, |
160 linkmapper) |
160 linkmapper) |
161 |
161 |
162 def baserevision(self, nodeorrev): |
162 def baserevision(self, nodeorrev): |
163 return manifest.manifest.revision(self, nodeorrev) |
163 return manifest.manifestrevlog.revision(self, nodeorrev) |
164 |
164 |
165 def baserevdiff(self, rev1, rev2): |
165 def baserevdiff(self, rev1, rev2): |
166 return manifest.manifest.revdiff(self, rev1, rev2) |
166 return manifest.manifestrevlog.revdiff(self, rev1, rev2) |
167 |
167 |
168 class unionfilelog(unionrevlog, filelog.filelog): |
168 class unionfilelog(unionrevlog, filelog.filelog): |
169 def __init__(self, opener, path, opener2, linkmapper, repo): |
169 def __init__(self, opener, path, opener2, linkmapper, repo): |
170 filelog.filelog.__init__(self, opener, path) |
170 filelog.filelog.__init__(self, opener, path) |
171 filelog2 = filelog.filelog(opener2, path) |
171 filelog2 = filelog.filelog(opener2, path) |