Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/unionrepo.py @ 47162:a07d5cb03a85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: rename `indexfile` to `_indexfile` We want to make the actual location of the indexfile and location more of an implementation details than what is is currently. In that process, we make the attribute private. Differential Revision: https://phab.mercurial-scm.org/D10574
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 May 2021 12:22:16 +0200
parents 8a1a51d31e85
children 8d3c2f9d4af7
comparison
equal deleted inserted replaced
47161:8a1a51d31e85 47162:a07d5cb03a85
163 def __init__(self, opener, opener2): 163 def __init__(self, opener, opener2):
164 changelog.changelog.__init__(self, opener) 164 changelog.changelog.__init__(self, opener)
165 linkmapper = None 165 linkmapper = None
166 changelog2 = changelog.changelog(opener2) 166 changelog2 = changelog.changelog(opener2)
167 unionrevlog.__init__( 167 unionrevlog.__init__(
168 self, opener, self.indexfile, changelog2, linkmapper 168 self, opener, self._indexfile, changelog2, linkmapper
169 ) 169 )
170 170
171 171
172 class unionmanifest(unionrevlog, manifest.manifestrevlog): 172 class unionmanifest(unionrevlog, manifest.manifestrevlog):
173 def __init__(self, nodeconstants, opener, opener2, linkmapper): 173 def __init__(self, nodeconstants, opener, opener2, linkmapper):
174 manifest.manifestrevlog.__init__(self, nodeconstants, opener) 174 manifest.manifestrevlog.__init__(self, nodeconstants, opener)
175 manifest2 = manifest.manifestrevlog(nodeconstants, opener2) 175 manifest2 = manifest.manifestrevlog(nodeconstants, opener2)
176 unionrevlog.__init__( 176 unionrevlog.__init__(
177 self, opener, self._revlog.indexfile, manifest2, linkmapper 177 self, opener, self._revlog._indexfile, manifest2, linkmapper
178 ) 178 )
179 179
180 180
181 class unionfilelog(filelog.filelog): 181 class unionfilelog(filelog.filelog):
182 def __init__(self, opener, path, opener2, linkmapper, repo): 182 def __init__(self, opener, path, opener2, linkmapper, repo):
183 filelog.filelog.__init__(self, opener, path) 183 filelog.filelog.__init__(self, opener, path)
184 filelog2 = filelog.filelog(opener2, path) 184 filelog2 = filelog.filelog(opener2, path)
185 self._revlog = unionrevlog( 185 self._revlog = unionrevlog(
186 opener, self._revlog.indexfile, filelog2._revlog, linkmapper 186 opener, self._revlog._indexfile, filelog2._revlog, linkmapper
187 ) 187 )
188 self._repo = repo 188 self._repo = repo
189 self.repotiprev = self._revlog.repotiprev 189 self.repotiprev = self._revlog.repotiprev
190 self.revlog2 = self._revlog.revlog2 190 self.revlog2 = self._revlog.revlog2
191 191