Rev 1169: Cope with kind changes better. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1169
revision-id: jelmer at samba.org-20080515025816-x82erjirjxsalxxo
parent: jelmer at samba.org-20080515022613-iya73fmxk9m0y0vs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-05-15 04:58:16 +0200
message:
  Cope with kind changes better.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'NEWS'
--- a/NEWS	2008-05-15 01:23:34 +0000
+++ b/NEWS	2008-05-15 02:58:16 +0000
@@ -13,6 +13,8 @@
 
    * Fix modifying branching scheme from the command-line. (#230529)
 
+   * Cope with kind changes better. (#191576)
+
 bzr-svn 0.4.10  2008-05-12
 
   CHANGES

=== modified file 'fetch.py'
--- a/fetch.py	2008-05-12 03:59:03 +0000
+++ b/fetch.py	2008-05-15 02:58:16 +0000
@@ -354,27 +354,30 @@
 
         self._store_file(self.file_id, lines, self.file_parents)
 
+        assert self.is_symlink in (True, False)
+
         if self.file_id in self.inventory:
-            ie = self.inventory[self.file_id]
-        elif self.is_symlink:
+            del self.inventory[self.file_id]
+
+        if self.is_symlink:
             ie = self.inventory.add_path(path, 'symlink', self.file_id)
-        else:
-            ie = self.inventory.add_path(path, 'file', self.file_id)
-        ie.revision = self.revid
-
-        if self.is_symlink:
-            ie.kind = 'symlink'
             ie.symlink_target = lines[0][len("link "):]
             ie.text_sha1 = None
             ie.text_size = None
-            ie.text_id = None
+            ie.executable = False
+            ie.revision = self.revid
         else:
+            ie = self.inventory.add_path(path, 'file', self.file_id)
+            ie.revision = self.revid
             ie.kind = 'file'
+            ie.symlink_target = None
             ie.text_sha1 = osutils.sha_strings(lines)
             ie.text_size = sum(map(len, lines))
+            assert ie.text_size is not None
             if self.is_executable is not None:
                 ie.executable = self.is_executable
 
+
         self.file_stream = None
 
     def close_edit(self):