Rev 4243: tree tweaks from brisbane-core in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4243
revision-id: pqm at pqm.ubuntu.com-20090403025336-d79qe56jy4bkhpx9
parent: pqm at pqm.ubuntu.com-20090403020602-mzxupgrpl0tuao0i
parent: ian.clatworthy at canonical.com-20090403014031-s0284zsz59w60vh4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-04-03 03:53:36 +0100
message:
  tree tweaks from brisbane-core
modified:
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 4241.2.1
    revision-id: ian.clatworthy at canonical.com-20090403014031-s0284zsz59w60vh4
    parent: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
    parent: ian.clatworthy at canonical.com-20090403012432-2fehqrbdt27dycjk
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Fri 2009-04-03 11:40:31 +1000
    message:
      tree tweaks from brisbane-core
    modified:
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 4241.1.1
    revision-id: ian.clatworthy at canonical.com-20090403012432-2fehqrbdt27dycjk
    parent: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: bzr.bris-tree-tweaks
    timestamp: Fri 2009-04-03 11:24:32 +1000
    message:
      tree code cleanups from brisbane-core
    modified:
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py	2009-03-24 01:53:42 +0000
+++ b/bzrlib/tree.py	2009-04-03 01:24:32 +0000
@@ -905,7 +905,6 @@
             output. An unversioned file is defined as one with (False, False)
             for the versioned pair.
         """
-        result = []
         lookup_trees = [self.source]
         if extra_trees:
              lookup_trees.extend(extra_trees)
@@ -977,6 +976,10 @@
                 if (self.source.get_symlink_target(file_id) !=
                     self.target.get_symlink_target(file_id)):
                     changed_content = True
+                # XXX: Yes, the indentation below is wrong. But fixing it broke
+                # test_merge.TestMergerEntriesLCAOnDisk.
+                # test_nested_tree_subtree_renamed_and_modified. We'll wait for
+                # the fix from bzr.dev -- vila 2009026
                 elif from_kind == 'tree-reference':
                     if (self.source.get_reference_revision(file_id, from_path)
                         != self.target.get_reference_revision(file_id, to_path)):

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2009-03-31 14:13:27 +0000
+++ b/bzrlib/workingtree_4.py	2009-04-03 01:24:32 +0000
@@ -1466,6 +1466,10 @@
                            _control_files=control_files)
 
     def __get_matchingbzrdir(self):
+        return self._get_matchingbzrdir()
+
+    def _get_matchingbzrdir(self):
+        """Overrideable method to get a bzrdir for testing."""
         # please test against something that will let us do tree references
         return bzrdir.format_registry.make_bzrdir(
             'dirstate-with-subtree')