Merge lp:~mbp/bzr/403523-status-crash into lp:~bzr/bzr/trunk-old

[Martin Pool]

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/403523-status-crash into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>

No test cases?

I believe we have a per_inventory test suite, so you could test it at
that level.

Otherwise:

 review needs_fixing
 merge approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkp60x8ACgkQJdeBCYSNAAP0CACbBlSzUz04l/7piQcvTtWpc1Q0
V64An2icYIPmiAVlvdOGVxR8GJoXUztl
=60uL
-----END PGP SIGNATURE-----

review: Needs Fixing

[Vincent Ladeuil (vila)]

I was about to ask for tests then I saw https://bugs.edge.launchpad.net/bzr/+bug/403523/comments/1

From there I conclude you got that patch covered by some failing test[s].

review: Approve

[Martin Pool (mbp)]

It's true this is covered by a blackbox test in 2a, but I'll look at doing a per-inventory one. If it's hard I'll probably skip it though.

[Robert Collins (lifeless)]

> It's true this is covered by a blackbox test in 2a, but I'll look at doing a
> per-inventory one. If it's hard I'll probably skip it though.

test_inv has a comprehensive set of parameterised tests I added for apply_delta; should be trivial to add another case there - gimme a shout if its not obvious.

=== modified file 'NEWS'
--- NEWS	2009-08-11 02:58:23 +0000
+++ NEWS	2009-08-11 10:35:50 +0000
@@ -123,6 +123,9 @@
   running send and similar commands on 2a formats.
   (Martin Pool, #408201)
   
+* Fix crash in some invocations of ``bzr status`` in format 2a.
+  (Martin Pool, #403523)
+
 * Fixed export to existing directory: if directory is empty then export 
   will succeed, otherwise it fails with error.
   (Alexander Belchenko, #406174)

=== modified file 'bzrlib/inventory.py'
--- bzrlib/inventory.py	2009-08-05 02:30:59 +0000
+++ bzrlib/inventory.py	2009-08-11 10:35:50 +0000
@@ -743,6 +743,9 @@
         """
         return self.has_id(file_id)
 
+    def has_filename(self, filename):
+        return bool(self.path2id(filename))
+
     def id2path(self, file_id):
         """Return as a string the path to file_id.
 
@@ -1363,9 +1366,6 @@
             yield ie
             file_id = ie.parent_id
 
-    def has_filename(self, filename):
-        return bool(self.path2id(filename))
-
     def has_id(self, file_id):
         return (file_id in self._byid)
 

=== modified file 'bzrlib/status.py'
--- bzrlib/status.py	2009-03-23 14:59:43 +0000
+++ bzrlib/status.py	2009-08-11 10:35:50 +0000
@@ -156,11 +156,11 @@
                 to_file.write("%s %s\n" % (prefix, nonexistent))
             if (new_is_working_tree and show_pending):
                 show_pending_merges(new, to_file, short, verbose=verbose)
+            if nonexistents:
+                raise errors.PathsDoNotExist(nonexistents)
         finally:
             old.unlock()
             new.unlock()
-            if nonexistents:
-              raise errors.PathsDoNotExist(nonexistents)
     finally:
         wt.unlock()