Merge lp:~jelmer/brz/inter-memorygittree into lp:brz

[Jelmer Vernooij]

Make InterIndexGitTree suitable for use with MemoryGitTree.

Make InterIndexGitTree suitable for use with MemoryGitTree.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

=== modified file 'breezy/plugins/git/memorytree.py'
--- breezy/plugins/git/memorytree.py	2018-03-26 22:28:24 +0000
+++ breezy/plugins/git/memorytree.py	2018-05-21 21:08:24 +0000
@@ -23,7 +23,11 @@
 import posixpath
 import stat
 
+from dulwich.index import (
+    index_entry_from_stat,
+    )
 from dulwich.objects import (
+    Blob,
     Tree,
     )
 
@@ -171,6 +175,18 @@
             (mem_stat.st_mode, 0, 0, 0, 0, 0, mem_stat.st_size, 0, 0, 0))
         return stat_val
 
+    def _live_entry(self, path):
+        stat_val = self._lstat(path)
+        if stat.S_ISDIR(stat_val.st_mode):
+            return None
+        elif stat.S_ISLNK(stat_val.st_mode):
+            blob = Blob.from_string(self._file_transport.readlink(path))
+        elif stat.S_ISREG(stat_val.st_mode):
+            blob = Blob.from_string(self._file_transport.get_bytes(path))
+        else:
+            raise AssertionError('unknown type %d' % stat_val.st_mode)
+        return index_entry_from_stat(stat_val, blob.id, 0)
+
     def get_file_with_stat(self, path, file_id=None):
         return (self.get_file(path, file_id), self._lstat(path))
 

=== modified file 'breezy/plugins/git/tests/test_workingtree.py'
--- breezy/plugins/git/tests/test_workingtree.py	2018-05-13 22:54:28 +0000
+++ breezy/plugins/git/tests/test_workingtree.py	2018-05-21 21:08:24 +0000
@@ -29,9 +29,11 @@
     )
 
 from .... import conflicts as _mod_conflicts
+from ..tree import (
+    changes_between_git_tree_and_working_copy,
+    )
 from ..workingtree import (
     FLAG_STAGEMASK,
-    changes_between_git_tree_and_working_copy,
     )
 from ....tests import TestCaseWithTransport
 

=== modified file 'breezy/plugins/git/tree.py'
--- breezy/plugins/git/tree.py	2018-05-15 01:20:00 +0000
+++ breezy/plugins/git/tree.py	2018-05-21 21:08:24 +0000
@@ -24,6 +24,9 @@
 import os
 
 from dulwich.index import (
+    blob_from_path_and_stat,
+    cleanup_mode,
+    commit_tree,
     index_entry_from_stat,
     )
 from dulwich.object_store import (
@@ -1184,7 +1187,8 @@
             else:
                 todo = [(p, i) for (p, i) in self._recurse_index_entries() if p.startswith(from_path+'/')]
                 for child_path, child_value in todo:
-                    (child_to_index, child_to_index_path) = self._lookup_index(posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
+                    (child_to_index, child_to_index_path) = self._lookup_index(
+                            posixpath.join(to_path, posixpath.relpath(child_path, from_path)))
                     child_to_index[child_to_index_path] = child_value
                     # TODO(jelmer): Mark individual index as dirty
                     self._index_dirty = True
@@ -1252,3 +1256,86 @@
                 return 'directory'
         else:
             return kind
+
+    def _live_entry(self, relpath):
+        raise NotImplementedError(self._live_entry)
+
+
+class InterIndexGitTree(InterGitTrees):
+    """InterTree that works between a Git revision tree and an index."""
+
+    def __init__(self, source, target):
+        super(InterIndexGitTree, self).__init__(source, target)
+        self._index = target.index
+
+    @classmethod
+    def is_compatible(cls, source, target):
+        return (isinstance(source, GitRevisionTree) and
+                isinstance(target, MutableGitIndexTree))
+
+    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
+            require_versioned=False, extra_trees=None,
+            want_unversioned=False):
+        trees = [self.source]
+        if extra_trees is not None:
+            trees.extend(extra_trees)
+        if specific_files is not None:
+            specific_files = self.target.find_related_paths_across_trees(
+                    specific_files, trees,
+                    require_versioned=require_versioned)
+        # TODO(jelmer): Restrict to specific_files, for performance reasons.
+        with self.lock_read():
+            return changes_between_git_tree_and_working_copy(
+                self.source.store, self.source.tree,
+                self.target, want_unchanged=want_unchanged,
+                want_unversioned=want_unversioned)
+
+
+_mod_tree.InterTree.register_optimiser(InterIndexGitTree)
+
+
+def changes_between_git_tree_and_working_copy(store, from_tree_sha, target,
+        want_unchanged=False, want_unversioned=False):
+    """Determine the changes between a git tree and a working tree with index.
+
+    """
+    extras = set()
+    blobs = {}
+    # Report dirified directories to commit_tree first, so that they can be
+    # replaced with non-empty directories if they have contents.
+    dirified = []
+    for path, index_entry in target._recurse_index_entries():
+        try:
+            live_entry = target._live_entry(path)
+        except EnvironmentError as e:
+            if e.errno == errno.ENOENT:
+                # Entry was removed; keep it listed, but mark it as gone.
+                blobs[path] = (ZERO_SHA, 0)
+            elif e.errno == errno.EISDIR:
+                # Entry was turned into a directory
+                dirified.append((path, Tree().id, stat.S_IFDIR))
+                store.add_object(Tree())
+            else:
+                raise
+        else:
+            blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
+    if want_unversioned:
+        for e in target.extras():
+            st = target._lstat(e)
+            try:
+                np, accessible = osutils.normalized_filename(e)
+            except UnicodeDecodeError:
+                raise errors.BadFilenameEncoding(
+                    e, osutils._fs_enc)
+            if stat.S_ISDIR(st.st_mode):
+                blob = Tree()
+            else:
+                blob = blob_from_path_and_stat(target.abspath(e).encode(osutils._fs_enc), st)
+            store.add_object(blob)
+            np = np.encode('utf-8')
+            blobs[np] = (blob.id, cleanup_mode(st.st_mode))
+            extras.add(np)
+    to_tree_sha = commit_tree(store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
+    return store.tree_changes(
+        from_tree_sha, to_tree_sha, include_trees=True,
+        want_unchanged=want_unchanged, change_type_same=True), extras

=== modified file 'breezy/plugins/git/workingtree.py'
--- breezy/plugins/git/workingtree.py	2018-05-13 22:54:28 +0000
+++ breezy/plugins/git/workingtree.py	2018-05-21 21:08:24 +0000
@@ -31,12 +31,9 @@
     SHA1Writer,
     build_index_from_tree,
     changes_from_tree,
-    cleanup_mode,
-    commit_tree,
     index_entry_from_path,
     index_entry_from_stat,
     iter_fresh_entries,
-    blob_from_path_and_stat,
     FLAG_STAGEMASK,
     read_submodule_head,
     validate_path,
@@ -734,6 +731,9 @@
     def _lstat(self, path):
         return os.lstat(self.abspath(path))
 
+    def _live_entry(self, path):
+        return index_entry_from_path(self.abspath(path.decode('utf-8')).encode(osutils._fs_enc))
+
     def is_executable(self, path, file_id=None):
         with self.lock_read():
             if getattr(self, "_supports_executable", osutils.supports_executable)():
@@ -1339,87 +1339,3 @@
         for hook in MutableTree.hooks['post_build_tree']:
             hook(wt)
         return wt
-
-
-class InterIndexGitTree(InterGitTrees):
-    """InterTree that works between a Git revision tree and an index."""
-
-    def __init__(self, source, target):
-        super(InterIndexGitTree, self).__init__(source, target)
-        self._index = target.index
-
-    @classmethod
-    def is_compatible(cls, source, target):
-        from .repository import GitRevisionTree
-        return (isinstance(source, GitRevisionTree) and
-                isinstance(target, GitWorkingTree))
-
-    def _iter_git_changes(self, want_unchanged=False, specific_files=None,
-            require_versioned=False, extra_trees=None,
-            want_unversioned=False):
-        trees = [self.source]
-        if extra_trees is not None:
-            trees.extend(extra_trees)
-        if specific_files is not None:
-            specific_files = self.target.find_related_paths_across_trees(
-                    specific_files, trees,
-                    require_versioned=require_versioned)
-        # TODO(jelmer): Restrict to specific_files, for performance reasons.
-        with self.lock_read():
-            return changes_between_git_tree_and_working_copy(
-                self.source.store, self.source.tree,
-                self.target, want_unchanged=want_unchanged,
-                want_unversioned=want_unversioned)
-
-
-tree.InterTree.register_optimiser(InterIndexGitTree)
-
-
-def changes_between_git_tree_and_working_copy(store, from_tree_sha, target,
-        want_unchanged=False, want_unversioned=False):
-    """Determine the changes between a git tree and a working tree with index.
-
-    """
-    extras = set()
-    blobs = {}
-    # Report dirified directories to commit_tree first, so that they can be
-    # replaced with non-empty directories if they have contents.
-    dirified = []
-    target_root_path = target.abspath('.').encode(sys.getfilesystemencoding())
-    for path, index_entry in target._recurse_index_entries():
-        try:
-            live_entry = index_entry_from_path(
-                    target.abspath(path.decode('utf-8')).encode(osutils._fs_enc))
-        except EnvironmentError as e:
-            if e.errno == errno.ENOENT:
-                # Entry was removed; keep it listed, but mark it as gone.
-                blobs[path] = (ZERO_SHA, 0)
-            elif e.errno == errno.EISDIR:
-                # Entry was turned into a directory
-                dirified.append((path, Tree().id, stat.S_IFDIR))
-                store.add_object(Tree())
-            else:
-                raise
-        else:
-            blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
-    if want_unversioned:
-        for e in target.extras():
-            ap = target.abspath(e)
-            st = os.lstat(ap)
-            try:
-                np, accessible = osutils.normalized_filename(e)
-            except UnicodeDecodeError:
-                raise errors.BadFilenameEncoding(
-                    e, osutils._fs_enc)
-            if stat.S_ISDIR(st.st_mode):
-                blob = Tree()
-            else:
-                blob = blob_from_path_and_stat(ap.encode('utf-8'), st)
-            store.add_object(blob)
-            np = np.encode('utf-8')
-            blobs[np] = (blob.id, cleanup_mode(st.st_mode))
-            extras.add(np)
-    to_tree_sha = commit_tree(store, dirified + [(p, s, m) for (p, (s, m)) in blobs.items()])
-    return store.tree_changes(
-        from_tree_sha, to_tree_sha, include_trees=True,
-        want_unchanged=want_unchanged, change_type_same=True), extras