Rev 4599: (robertc) Fix selective status against historic revisions. (Martin in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4599 [merge]
revision-id: pqm at pqm.ubuntu.com-20090812025914-5k1krw3iyfjvow5u
parent: pqm at pqm.ubuntu.com-20090812001314-0143bmhgop1zt9e3
parent: mbp at sourcefrog.net-20090806051055-gjivtptv94mbgpa0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-08-12 03:59:14 +0100
message:
  (robertc) Fix selective status against historic revisions. (Martin
  	Pool)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
=== modified file 'NEWS'
--- a/NEWS	2009-08-11 05:26:57 +0000
+++ b/NEWS	2009-08-12 02:59:14 +0000
@@ -129,6 +129,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'
--- a/bzrlib/inventory.py	2009-08-05 02:30:59 +0000
+++ b/bzrlib/inventory.py	2009-08-06 05:09:41 +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'
--- a/bzrlib/status.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/status.py	2009-08-06 05:07:12 +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()