Merge lp:~jelmer/brz-git/efficient-commit into lp:brz-git

[Jelmer Vernooij]

Avoid expensive conversion APIs in commit.

Avoid expensive conversion APIs in commit.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

=== modified file 'commit.py'
--- commit.py	2018-03-24 10:17:52 +0000
+++ commit.py	2018-03-27 01:47:03 +0000
@@ -156,23 +156,10 @@
                 basis_revid = self.parents[0]
             basis_tree = self.repository.revision_tree(basis_revid)
         # Fill in entries that were not changed
-        for path, entry in basis_tree.iter_entries_by_dir():
-            if type(path) is not unicode:
-                raise TypeError(path)
-            if entry.kind == 'directory':
+        for entry in basis_tree._iter_tree_contents(include_trees=False):
+            if entry.path in self._blobs:
                 continue
-            encoded_path = path.encode('utf-8')
-            if encoded_path not in self._blobs:
-                if entry.kind == "symlink":
-                    blob = Blob()
-                    blob.data = basis_tree.get_symlink_target(path, entry.file_id).encode('utf-8')
-                    self._blobs[encoded_path] = (entry_mode(entry), blob.id)
-                elif entry.kind == "file":
-                    blob = Blob()
-                    blob.data = basis_tree.get_file_text(path, entry.file_id)
-                    self._blobs[encoded_path] = (entry_mode(entry), blob.id)
-                else:
-                    raise NotImplementedError
+            self._blobs[entry.path] = (entry.mode, entry.sha)
         if not self._lossy:
             try:
                 fileid_map = dict(basis_tree._fileid_map.file_ids)

=== modified file 'tree.py'
--- tree.py	2018-03-26 00:32:23 +0000
+++ tree.py	2018-03-27 01:47:03 +0000
@@ -506,6 +506,12 @@
                 raise errors.PathsNotVersionedError(unversioned)
         return filter(self.is_versioned, paths)
 
+    def _iter_tree_contents(self, include_trees=False):
+        if self.tree is None:
+            return iter([])
+        return self.store.iter_tree_contents(
+                self.tree, include_trees=include_trees)
+
 
 def tree_delta_from_git_changes(changes, mapping,
         (old_fileid_map, new_fileid_map), specific_files=None,