Rev 1566: Avoid changing revision of directories too often. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1566
revision-id: jelmer at samba.org-20080808225051-s3se1zu72nvzpqwf
parent: jelmer at samba.org-20080808223438-e4sgylu84rnt5mft
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-09 00:50:51 +0200
message:
  Avoid changing revision of directories too often.
modified:
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  tests/test_fileids.py          test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
=== modified file 'fileids.py'
--- a/fileids.py	2008-08-08 22:34:38 +0000
+++ b/fileids.py	2008-08-08 22:50:51 +0000
@@ -194,18 +194,6 @@
             if delta[x] is not None:
                 map[x] = (str(delta[x]), revid)
 
-        # Mark all parent paths as changed
-        for p in delta:
-            if delta[p] is None:
-                continue
-            parts = p.split("/")
-            for j in range(1, len(parts)+1):
-                parent = "/".join(parts[0:len(parts)-j])
-                assert map.has_key(parent), "Parent item %s of %s doesn't exist in map" % (parent, p)
-                if map[parent][1] == revid:
-                    break
-                map[parent] = map[parent][0], revid
-
 
 class FileIdMapCache(object):
 

=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py	2008-07-15 14:06:23 +0000
+++ b/tests/test_fileids.py	2008-08-08 22:50:51 +0000
@@ -300,7 +300,12 @@
         dc.open_dir("trunk").add_file("trunk/file").modify("data")
         dc.close()
 
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(2, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(2, "trunk", self.mapping))}, self.repos.get_fileid_map(2, "trunk", self.mapping))
+        self.assertEqual({
+            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), 
+                 self.repos.generate_revision_id(1, "trunk", self.mapping)), 
+            "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), 
+                     self.repos.generate_revision_id(2, "trunk", self.mapping))}, 
+            self.repos.get_fileid_map(2, "trunk", self.mapping))
 
     def test_change_updates(self):
         set_branching_scheme(self.repos, TrunkBranchingScheme())
@@ -318,7 +323,12 @@
         dc.open_dir("trunk").open_file("trunk/file").modify("otherdata")
         dc.close()
 
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(3, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
+        self.assertEqual({
+            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), 
+                 self.repos.generate_revision_id(1, "trunk", self.mapping)), 
+            "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), 
+                     self.repos.generate_revision_id(3, "trunk", self.mapping))}, 
+            self.repos.get_fileid_map(3, "trunk", self.mapping))
 
     def test_sibling_unrelated(self):
         set_branching_scheme(self.repos, TrunkBranchingScheme())
@@ -339,7 +349,14 @@
         trunk.open_file("trunk/file").modify('otherdata')
         dc.close()
 
-        self.assertEqual({"": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), "bar": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"bar"), self.repos.generate_revision_id(2, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(3, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
+        self.assertEqual({
+            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), 
+                 self.repos.generate_revision_id(1, "trunk", self.mapping)), 
+            "bar": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"bar"), 
+                    self.repos.generate_revision_id(2, "trunk", self.mapping)), 
+            "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), 
+                     self.repos.generate_revision_id(3, "trunk", self.mapping))}, 
+            self.repos.get_fileid_map(3, "trunk", self.mapping))
 
     def test_copy(self):
         set_branching_scheme(self.repos, TrunkBranchingScheme())
@@ -360,8 +377,12 @@
         dc.close()
 
         self.assertEqual({
-            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), self.repos.generate_revision_id(3, "trunk", self.mapping)), 
-            "bar": (self.mapping.generate_file_id(self.repos.uuid, 3, "trunk", u"bar"), self.repos.generate_revision_id(3, "trunk", self.mapping)), "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), self.repos.generate_revision_id(2, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
+            "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), 
+                 self.repos.generate_revision_id(1, "trunk", self.mapping)), 
+            "bar": (self.mapping.generate_file_id(self.repos.uuid, 3, "trunk", u"bar"), 
+                    self.repos.generate_revision_id(3, "trunk", self.mapping)), 
+            "file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"file"), 
+                     self.repos.generate_revision_id(2, "trunk", self.mapping))}, self.repos.get_fileid_map(3, "trunk", self.mapping))
 
     def test_copy_nested_modified(self):
         set_branching_scheme(self.repos, TrunkBranchingScheme())
@@ -385,7 +406,7 @@
 
         self.assertEqual({
           "": (self.mapping.generate_file_id(self.repos.uuid, 1, "trunk", u""), 
-            self.repos.generate_revision_id(3, "trunk", self.mapping)), 
+            self.repos.generate_revision_id(1, "trunk", self.mapping)), 
           "dir": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"dir"), 
                 self.repos.generate_revision_id(2, "trunk", self.mapping)),
           "dir/file": (self.mapping.generate_file_id(self.repos.uuid, 2, "trunk", u"dir/file"),