Rev 2322: Add some more paranoia unicode checks. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2322
revision-id: jelmer at samba.org-20090117031216-ll7fx2osdz3iuwmo
parent: jelmer at samba.org-20090117024257-hspprbbejc4ux2al
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Sat 2009-01-17 04:12:16 +0100
message:
  Add some more paranoia unicode checks.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py	2009-01-17 02:42:57 +0000
+++ b/fetch.py	2009-01-17 03:12:16 +0000
@@ -337,7 +337,7 @@
 
     def _close(self):
         if (not self.editor.old_inventory.has_id(self.new_id) or 
-            (self._metadata_changed and self.path != "") or 
+            (self._metadata_changed and self.path != u"") or 
             self.new_ie != self.editor.old_inventory[self.new_id] or
             self.old_path != self.path or 
             self.editor._get_text_revid(self.path) is not None):
@@ -350,7 +350,7 @@
                 [(self.new_id, revid) for revid in text_parents], [])
             self.editor._inv_delta.append((self.old_path, self.path, self.new_id, self.new_ie))
 
-        if self.path == "":
+        if self.path == u"":
             self.editor._finish_commit()
 
     def _add_directory(self, path, copyfrom_path=None, copyfrom_revnum=-1):
@@ -571,11 +571,11 @@
 
         if self.old_inventory.root is not None and \
                 file_id == self.old_inventory.root.file_id:
-            old_path = ""
+            old_path = u""
         else:
             old_path = None
 
-        return DirectoryRevisionBuildEditor(self, old_path, "", old_file_id, 
+        return DirectoryRevisionBuildEditor(self, old_path, u"", old_file_id, 
             file_id, None, file_parents)
 
     def _get_id_map(self):
@@ -718,7 +718,7 @@
         self.delta.unchanged = None
 
     def _open_root(self, base_revnum):
-        return DirectoryTreeDeltaBuildEditor(self, "")
+        return DirectoryTreeDeltaBuildEditor(self, u"")
 
     def _was_renamed(self, path):
         fileid = self._get_new_id(path)