Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/unionrepo.py @ 30384:f2d146d1e8d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: add unionmanifestlog support As part of deprecating manifest, we need to make the union repo support manifestlog.
author Durham Goode <durham@fb.com>
date Fri, 11 Nov 2016 01:20:13 -0800
parents 1767723f71cf
children 20a42325fdef
comparison
equal deleted inserted replaced
30383:31de088945cd 30384:f2d146d1e8d6
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)