Merge lp:~gagern/trac-bzr/bug194277 into lp:trac-bzr

[Martin von Gagern]

[Martin von Gagern (gagern)]

Quite a lot of code gone in the process. Makes me wonder whether there was really that much unused code in trac-bzr, or whether I missed something. So I'd really like to see at least one Appove vote here if possible. In my opinion http://bazaar.launchpad.net/~trac-bzr-team/trac-bzr/trunk/revision/68 is the commit that renders get_change obsolete and _history_cache along with it.

[lp:~gagern/trac-bzr/bug194277]

81. By Martin von Gagern on 2009-12-07

Merge from trunk

=== modified file 'tracbzr/backend.py'
--- tracbzr/backend.py	2009-11-27 18:21:10 +0000
+++ tracbzr/backend.py	2009-12-07 17:21:10 +0000
@@ -567,19 +567,22 @@
         new_branch, new_revid = self._parse_rev(new_rev)
         old_tree = old_branch.repository.revision_tree(old_revid)
         new_tree = new_branch.repository.revision_tree(new_revid)
-        delta = new_tree.changes_from(old_tree)
+        prefix = self.branch_path(new_branch)
+        subdir = new_path[len(prefix)+1:]
+        delta = new_tree.changes_from(old_tree, specific_files=[subdir])
         for path, file_id, kind in delta.added:
+            path = osutils.pathjoin(prefix, path)
             entry = new_tree.inventory[file_id]
             node = NODE_MAP[kind](self, new_branch, new_tree, entry, path)
-            cur_path = new_tree.id2path(file_id)
-            node._history_cache[(new_revid, old_revid, file_id)] = \
-                cur_path, new_rev, versioncontrol.Changeset.ADD
             yield None, node, node.kind, versioncontrol.Changeset.ADD
         for path, file_id, kind in delta.removed:
+            path = osutils.pathjoin(prefix, path)
             entry = old_tree.inventory[file_id]
             node = NODE_MAP[kind](self, old_branch, old_tree, entry, path)
             yield node, None, node.kind, versioncontrol.Changeset.DELETE
         for oldpath, newpath, file_id, kind, textmod, metamod in delta.renamed:
+            oldpath = osutils.pathjoin(prefix, oldpath)
+            newpath = osutils.pathjoin(prefix, newpath)
             oldnode = NODE_MAP[kind](self, old_branch, old_tree,
                                      old_tree.inventory[file_id], oldpath)
             newnode = NODE_MAP[kind](self, new_branch, new_tree,
@@ -591,7 +594,8 @@
             yield oldnode, newnode, oldnode.kind, versioncontrol.Changeset.MOVE
         for path, file_id, kind, textmod, metamod in delta.modified:
             # Bzr won't report a changed path as a rename but trac wants that.
-            oldpath = old_tree.id2path(file_id)
+            path = osutils.pathjoin(prefix, path)
+            oldpath = osutils.pathjoin(prefix, old_tree.id2path(file_id))
             oldnode = NODE_MAP[kind](self, old_branch, old_tree,
                                      old_tree.inventory[file_id], oldpath)
             newnode = NODE_MAP[kind](self, new_branch, new_tree,
@@ -604,9 +608,6 @@
                 action = versioncontrol.Changeset.MOVE
             else:
                 action = versioncontrol.Changeset.EDIT
-            cur_path = new_tree.id2path(file_id)
-            newnode._history_cache[(new_revid, old_revid, file_id)] = \
-                cur_path, new_rev, action
             yield oldnode, newnode, oldnode.kind, action
 
     def dotted_revno(self, branch, revid):
@@ -681,7 +682,6 @@
 
 class BzrVersionedNode(BzrNode):
 
-    _history_cache = {}
     _diff_map = {
         'modified': versioncontrol.Changeset.EDIT,
         'unchanged': versioncontrol.Changeset.EDIT,
@@ -832,37 +832,6 @@
                 current_revid = previous_revid
                 current_tree = previous_tree
 
-
-    def get_change(self, revision, previous_revision, file_id):
-        key = (revision, previous_revision, file_id)
-        if key not in self._history_cache or False:
-            self._history_cache[key] = self.calculate_history(revision, 
-                previous_revision, file_id)
-        return self._history_cache[key]
-
-    def calculate_history(self, revision, previous_revision, file_id):
-        cache = self.bzr_repo.get_branch_cache(self.branch)
-        tree = cache.revision_tree(revision)
-        current_entry = tree.inventory[file_id]
-        current_path = tree.id2path(file_id)
-        if previous_revision not in (None, NULL_REVISION):
-            previous_tree = cache.revision_tree(previous_revision)
-            previous_entry = previous_tree.inventory[file_id]
-        else:
-            previous_entry = None
-        # We should only get revisions in the ancestry for which
-        # we exist, so this should succeed..
-        return self.compare_entries(current_path, current_entry, 
-                                    previous_entry)
-
-    def compare_entries(self, current_path, current_entry, previous_entry):
-        diff = current_entry.describe_change(previous_entry, current_entry)
-        rev = self.bzr_repo.string_rev(self.branch, current_entry.revision)
-        try:
-            return current_path, rev, self._diff_map[diff]
-        except KeyError:
-            raise Exception('unknown describe_change %r' % (diff,))
-
     def get_content_revision(self):
         """For non-directory nodes, the content was last changed here."""
         return self.entry.revision