Rev 1132: Fix more tests, only bzrlib.plugins.svn.tests.test_workingtree.TestWorkingTree.test_update_after_commit fails now. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1132
revision-id: jelmer at samba.org-20080825033044-wg6de65b1dkfrels
parent: jelmer at samba.org-20080825025712-6er2xgmcz23vizws
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Mon 2008-08-25 05:30:44 +0200
message:
  Fix more tests, only bzrlib.plugins.svn.tests.test_workingtree.TestWorkingTree.test_update_after_commit fails now.
modified:
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-25 02:57:12 +0000
+++ b/workingtree.py	2008-08-25 03:30:44 +0000
@@ -404,17 +404,14 @@
 
             entries = wc.entries_read(True)
             for name, entry in entries.items():
-                if name == "" and path != "":
+                if name == "":
                     continue
 
                 wc.process_committed(self.abspath(path).rstrip("/"), 
-                              False, rev, 
+                              False, entry.revision, 
                               svn_revprops[properties.PROP_REVISION_DATE], 
                               svn_revprops[properties.PROP_REVISION_AUTHOR])
 
-                if name == "":
-                    continue
-
                 child_path = os.path.join(path, name)
 
                 if newrevtree.inventory[newrevtree.inventory.path2id(child_path)].kind == 'directory':
@@ -425,13 +422,15 @@
                         subwc.close()
 
         # Set proper version for all files in the wc
-        import pdb; pdb.set_trace()
         wc = self._get_wc(write_lock=True)
         try:
+            wc.process_committed(self.abspath("").rstrip("/"), 
+                          False, entry.revision, 
+                          svn_revprops[properties.PROP_REVISION_DATE], 
+                          svn_revprops[properties.PROP_REVISION_AUTHOR])
             update_settings(wc, "")
         finally:
             wc.close()
-        self.base_revid = revid
 
     def smart_add(self, file_list, recurse=True, action=None, save=True):
         assert isinstance(recurse, bool)
@@ -610,6 +609,10 @@
     def get_parent_ids(self):
         return [self.base_revid] + self.pending_merges()
 
+    def set_parent_ids(self, revision_ids, allow_lefmost_as_ghost=False):
+        self.base_revid = revision_ids[0]
+        self.set_pending_merges(revision_ids[1:])
+
     def pending_merges(self):
         merged = self._get_bzr_merges(self._get_base_branch_props()).splitlines()
         wc = self._get_wc()