Rev 2943: Handle empty inventories in Inventory.copy(). in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2943
revision-id: pqm at pqm.ubuntu.com-20071025211612-mmsxejad9v1cu5c3
parent: pqm at pqm.ubuntu.com-20071025100509-veed3zxqsmgwdug1
parent: jelmer at samba.org-20071024203850-3f9x8rq4iupamufm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-10-25 22:16:12 +0100
message:
  Handle empty inventories in Inventory.copy().
modified:
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
    ------------------------------------------------------------
    revno: 2938.2.1
    merged: jelmer at samba.org-20071024203850-3f9x8rq4iupamufm
    parent: pqm at pqm.ubuntu.com-20071024181951-qqo4r5mqrhr032pf
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: integration
    timestamp: Wed 2007-10-24 22:38:50 +0200
    message:
      Handle empty inventories in Inventory.copy().
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2007-10-24 15:29:18 +0000
+++ b/bzrlib/inventory.py	2007-10-24 20:38:50 +0000
@@ -948,6 +948,8 @@
     def copy(self):
         # TODO: jam 20051218 Should copy also copy the revision_id?
         entries = self.iter_entries()
+        if self.root is None:
+            return Inventory(root_id=None)
         other = Inventory(entries.next()[1].file_id)
         # copy recursively so we know directories will be added before
         # their children.  There are more efficient ways than this...

=== modified file 'bzrlib/tests/inventory_implementations/basics.py'
--- a/bzrlib/tests/inventory_implementations/basics.py	2007-10-24 15:29:18 +0000
+++ b/bzrlib/tests/inventory_implementations/basics.py	2007-10-24 20:38:50 +0000
@@ -75,6 +75,12 @@
         self.assertEqual('some-tree-root', inv2.root.file_id)
         self.assertEqual('hello', inv2['hello-id'].name)
 
+    def test_copy_empty(self):
+        """Make sure an empty inventory can be copied."""
+        inv = self.make_inventory(root_id=None)
+        inv2 = inv.copy()
+        self.assertIs(None, inv2.root)
+
     def test_is_root(self):
         """Ensure our root-checking code is accurate."""
         inv = self.make_inventory('TREE_ROOT')