/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2007-09-06 01:09:06 UTC
  • mto: (2592.3.129 repository)
  • mto: This revision was merged to the branch mainline in revision 2879.
  • Revision ID: robertc@robertcollins.net-20070906010906-2so4bg4lr3y8wlqd
Move content summary generation outside of record_entry_contents.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2198
2198
                ' record_entry_contents, as of bzr 0.10.',
2199
2199
                 DeprecationWarning, stacklevel=2)
2200
2200
            self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
2201
 
                                       '', tree)
 
2201
                '', tree, tree.path_content_summary(''))
2202
2202
        else:
2203
2203
            # In this revision format, root entries have no knit or weave When
2204
2204
            # serializing out to disk and back in root.revision is always
2205
2205
            # _new_revision_id
2206
2206
            ie.revision = self._new_revision_id
2207
2207
 
2208
 
    def record_entry_contents(self, ie, parent_invs, path, tree):
 
2208
    def record_entry_contents(self, ie, parent_invs, path, tree,
 
2209
        content_summary):
2209
2210
        """Record the content of ie from tree into the commit if needed.
2210
2211
 
2211
2212
        Side effect: sets ie.revision when unchanged
2215
2216
            commit.
2216
2217
        :param path: The path the entry is at in the tree.
2217
2218
        :param tree: The tree which contains this entry and should be used to 
2218
 
        obtain content.
 
2219
            obtain content.
 
2220
        :param content_summary: Summary data from the tree about the paths
 
2221
            content - stat, length, exec, sha/link target.
2219
2222
        """
2220
2223
        if self.new_inventory.root is None:
2221
2224
            self._check_root(ie, parent_invs, tree)
2222
 
        content_summary = tree.path_content_summary(path)
2223
2225
        kind = content_summary[0]
2224
2226
        # XXX: repository specific check for nested tree support goes here - if
2225
2227
        # the repo doesn't want nested trees we skip it ?