Rev 462: More fixes to externals fetching. in file:///data/jelmer/bzr-svn/nestedtrees/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/nestedtrees/

------------------------------------------------------------
revno: 462
revision-id: jelmer at samba.org-20080708034613-i6h7blv6o0snrvn5
parent: jelmer at samba.org-20080708034538-zy8hll1xc48unpgw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Tue 2008-07-08 05:46:13 +0200
message:
  More fixes to externals fetching.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-07-08 01:21:53 +0000
+++ b/fetch.py	2008-07-08 03:46:13 +0000
@@ -103,7 +103,6 @@
         self.dir_baserev = {}
         self._revinfo = None
         self._premature_deletes = set()
-        self.externals = {}
         self.old_inventory = prev_inventory
         self.inventory = prev_inventory.copy()
         self._start_revision()
@@ -220,7 +219,8 @@
             # Add externals. This happens after all children have been added
             # as they can be grandchildren.
             for (name, (rev, url)) in self.externals.items():
-                inventory_add_external(self.inventory, id, name, self.revid, rev, url)
+                inventory_add_external(self.editor.inventory, self.new_id, name, 
+                                       self.editor.revid, rev, url)
             # FIXME: Externals could've disappeared or only changed. Need 
             # to keep track of them.
 
@@ -287,7 +287,7 @@
             self.editor.revmeta.fileprops[name] = value
 
         if name == properties.PROP_EXTERNALS:
-            if value is not None:
+            if value is None:
                 value = ""
             self.externals = parse_externals_description(
                 urlutils.join(self.editor.source.base, self.editor.inventory.id2path(self.new_id)),