Merge lp:~tzeentch-gm/bzr/666897-get-file-by-path-attr-error into lp:bzr/2.2

[Michael Gliwinski]

Use Tree.path2id rather than the same method on _inventory member

Just a small tweak to ``Tree.get_file_by_path`` to use path2id method instead of accessing _inventory directly. This prevents occasional AttributeError when _inventory is None (e.g. on WorkingTree 4+).

See bug #666897 and discusson on ML: https://lists.ubuntu.com/archives/bazaar/2010q4/070748.html

[Martin Pool (mbp)]

It would be nice to have a test if you're seeing this error, but I think this is fairly clearly an improvement in its own right.

review: Approve

[Michael Gliwinski (tzeentch-gm)]

I know, I was thinking about it, but the thing is I can't substantiate the exact circumstances that cause that problem to pop up. The method is already used in tests in ``bzrlib.tests.blackbox.test_versioning.SubdirCommit`` but it does not fail.

Roughly has something to do with Tree subclass used (WorkingTree 4+ in this case) and possibly with that tree having uncomitted changes. If you have any ideas let me know and I can try things out.

[Martin Packman (gz)]

sent to pqm by email

[Martin Packman (gz)]

Whoops, I can't commit to 2.2 sorry.

[Andrew Bennetts (spiv)]

I'll be happy to send this to the 2.2 branch. First though I think we need you to execute the Canonical's Contributor Agreement: <http://www.canonical.com/contributors>.

[John A Meinel (jameinel)]

What is the status of the contributor agreement? Did Michael sign it? Did he refuse to sign it?

[Vincent Ladeuil (vila)]

@Michael, is there a problem with the contributor agreement ?

[Vincent Ladeuil (vila)]

Marking as WIP waiting for Michael feedback there :-/

[John A Meinel (jameinel)]

Still waiting on feedback? Should we just reject this? I didn't look at it directly, so I can probably just reproduce it from the description.

Unmerged revisions

5106. By Michael Gliwinski on 2010-10-26

Updated NEWS.

5105. By Michael Gliwinski on 2010-10-26

Changed ``Tree.get_file_by_path`` to use path2id method instead of accessing _inventory directly.

Fixes occasional problem with WorkingTree 4+ which re-implements path2id which doesn't use _inventory.

=== modified file 'NEWS'
--- NEWS	2010-10-18 08:06:05 +0000
+++ NEWS	2010-10-26 18:34:47 +0000
@@ -38,6 +38,9 @@
   installed.
   (Martin [gz], Gary van der Merwe, #632465)
 
+* Fix occasional AttributeError from Tree.get_file_by_path
+  (Michael Gliwinski, #666897)
+
 Improvements
 ************
 

=== modified file 'bzrlib/tree.py'
--- bzrlib/tree.py	2010-05-25 17:27:52 +0000
+++ bzrlib/tree.py	2010-10-26 18:34:47 +0000
@@ -324,7 +324,7 @@
         raise NotImplementedError(self.get_file_size)
 
     def get_file_by_path(self, path):
-        return self.get_file(self._inventory.path2id(path), path)
+        return self.get_file(self.path2id(path), path)
 
     def iter_files_bytes(self, desired_files):
         """Iterate through file contents.