| hg-reviewers |
changegroup generation accesses this attribute. We should make it
public and expose it on the interface.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (2 lines) | |||
| M | mercurial/manifest.py (13 lines) | |||
| M | mercurial/repository.py (6 lines) |
| fclnodes[n] = clnode | fclnodes[n] = clnode | ||||
| return clnode | return clnode | ||||
| return lookupmflinknode | return lookupmflinknode | ||||
| while tmfnodes: | while tmfnodes: | ||||
| tree, nodes = tmfnodes.popitem() | tree, nodes = tmfnodes.popitem() | ||||
| store = mfl.getstorage(tree) | store = mfl.getstorage(tree) | ||||
| if not self._filematcher.visitdir(store._tree[:-1] or '.'): | if not self._filematcher.visitdir(store.tree[:-1] or '.'): | ||||
| prunednodes = [] | prunednodes = [] | ||||
| else: | else: | ||||
| frev, flr = store.rev, store.linkrev | frev, flr = store.rev, store.linkrev | ||||
| prunednodes = [n for n in nodes | prunednodes = [n for n in nodes | ||||
| if flr(frev(n)) not in commonrevs] | if flr(frev(n)) not in commonrevs] | ||||
| if tree and not prunednodes: | if tree and not prunednodes: | ||||
| continue | continue | ||||
| if tree: | if tree: | ||||
| assert self._treeondisk, 'opts is %r' % opts | assert self._treeondisk, 'opts is %r' % opts | ||||
| if indexfile is None: | if indexfile is None: | ||||
| indexfile = '00manifest.i' | indexfile = '00manifest.i' | ||||
| if tree: | if tree: | ||||
| indexfile = "meta/" + tree + indexfile | indexfile = "meta/" + tree + indexfile | ||||
| self._tree = tree | self.tree = tree | ||||
| # The dirlogcache is kept on the root manifest log | # The dirlogcache is kept on the root manifest log | ||||
| if tree: | if tree: | ||||
| self._dirlogcache = dirlogcache | self._dirlogcache = dirlogcache | ||||
| else: | else: | ||||
| self._dirlogcache = {'': self} | self._dirlogcache = {'': self} | ||||
| self._revlog = revlog.revlog(opener, indexfile, | self._revlog = revlog.revlog(opener, indexfile, | ||||
| # only root indexfile is cached | # only root indexfile is cached | ||||
| @property | @property | ||||
| def fulltextcache(self): | def fulltextcache(self): | ||||
| return self._fulltextcache | return self._fulltextcache | ||||
| def clearcaches(self, clear_persisted_data=False): | def clearcaches(self, clear_persisted_data=False): | ||||
| self._revlog.clearcaches() | self._revlog.clearcaches() | ||||
| self._fulltextcache.clear(clear_persisted_data=clear_persisted_data) | self._fulltextcache.clear(clear_persisted_data=clear_persisted_data) | ||||
| self._dirlogcache = {self._tree: self} | self._dirlogcache = {self.tree: self} | ||||
| def dirlog(self, d): | def dirlog(self, d): | ||||
| if d: | if d: | ||||
| assert self._treeondisk | assert self._treeondisk | ||||
| if d not in self._dirlogcache: | if d not in self._dirlogcache: | ||||
| mfrevlog = manifestrevlog(self.opener, d, | mfrevlog = manifestrevlog(self.opener, d, | ||||
| self._dirlogcache, | self._dirlogcache, | ||||
| treemanifest=self._treeondisk) | treemanifest=self._treeondisk) | ||||
| cachedelta) | cachedelta) | ||||
| else: | else: | ||||
| # The first parent manifest isn't already loaded, so we'll | # The first parent manifest isn't already loaded, so we'll | ||||
| # just encode a fulltext of the manifest and pass that | # just encode a fulltext of the manifest and pass that | ||||
| # through to the revlog layer, and let it handle the delta | # through to the revlog layer, and let it handle the delta | ||||
| # process. | # process. | ||||
| if self._treeondisk: | if self._treeondisk: | ||||
| assert readtree, "readtree must be set for treemanifest writes" | assert readtree, "readtree must be set for treemanifest writes" | ||||
| m1 = readtree(self._tree, p1) | m1 = readtree(self.tree, p1) | ||||
| m2 = readtree(self._tree, p2) | m2 = readtree(self.tree, p2) | ||||
| n = self._addtree(m, transaction, link, m1, m2, readtree) | n = self._addtree(m, transaction, link, m1, m2, readtree) | ||||
| arraytext = None | arraytext = None | ||||
| else: | else: | ||||
| text = m.text() | text = m.text() | ||||
| n = self._revlog.addrevision(text, transaction, link, p1, p2) | n = self._revlog.addrevision(text, transaction, link, p1, p2) | ||||
| arraytext = bytearray(text) | arraytext = bytearray(text) | ||||
| if arraytext is not None: | if arraytext is not None: | ||||
| self.fulltextcache[n] = arraytext | self.fulltextcache[n] = arraytext | ||||
| return n | return n | ||||
| def _addtree(self, m, transaction, link, m1, m2, readtree): | def _addtree(self, m, transaction, link, m1, m2, readtree): | ||||
| # If the manifest is unchanged compared to one parent, | # If the manifest is unchanged compared to one parent, | ||||
| # don't write a new revision | # don't write a new revision | ||||
| if self._tree != '' and (m.unmodifiedsince(m1) or m.unmodifiedsince( | if self.tree != '' and (m.unmodifiedsince(m1) or m.unmodifiedsince( | ||||
| m2)): | m2)): | ||||
| return m.node() | return m.node() | ||||
| def writesubtree(subm, subp1, subp2): | def writesubtree(subm, subp1, subp2): | ||||
| sublog = self.dirlog(subm.dir()) | sublog = self.dirlog(subm.dir()) | ||||
| sublog.add(subm, transaction, link, subp1, subp2, None, None, | sublog.add(subm, transaction, link, subp1, subp2, None, None, | ||||
| readtree=readtree) | readtree=readtree) | ||||
| m.writesubtrees(m1, m2, writesubtree) | m.writesubtrees(m1, m2, writesubtree) | ||||
| text = m.dirtext() | text = m.dirtext() | ||||
| n = None | n = None | ||||
| if self._tree != '': | if self.tree != '': | ||||
| # Double-check whether contents are unchanged to one parent | # Double-check whether contents are unchanged to one parent | ||||
| if text == m1.dirtext(): | if text == m1.dirtext(): | ||||
| n = m1.node() | n = m1.node() | ||||
| elif text == m2.dirtext(): | elif text == m2.dirtext(): | ||||
| n = m2.node() | n = m2.node() | ||||
| if not n: | if not n: | ||||
| n = self._revlog.addrevision(text, transaction, link, m1.node(), | n = self._revlog.addrevision(text, transaction, link, m1.node(), | ||||
| removed paths. | removed paths. | ||||
| Returns the binary node of the created revision. | Returns the binary node of the created revision. | ||||
| """ | """ | ||||
| class imanifeststorage(interfaceutil.Interface): | class imanifeststorage(interfaceutil.Interface): | ||||
| """Storage interface for manifest data.""" | """Storage interface for manifest data.""" | ||||
| tree = interfaceutil.Attribute( | |||||
| """The path to the directory this manifest tracks. | |||||
| The empty bytestring represents the root manifest. | |||||
| """) | |||||
| index = interfaceutil.Attribute( | index = interfaceutil.Attribute( | ||||
| """An ``ifilerevisionssequence`` instance.""") | """An ``ifilerevisionssequence`` instance.""") | ||||
| indexfile = interfaceutil.Attribute( | indexfile = interfaceutil.Attribute( | ||||
| """Path of revlog index file. | """Path of revlog index file. | ||||
| TODO this is revlog specific and should not be exposed. | TODO this is revlog specific and should not be exposed. | ||||
| """) | """) | ||||