Rev 2316: Remove apply_changes to get_idmap_delta. 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: 2316
revision-id: jelmer at samba.org-20090116223758-q8s83nefqij0y8b0
parent: jelmer at samba.org-20090116222209-aechpsghe1m96mg2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Fri 2009-01-16 23:37:58 +0100
message:
  Remove apply_changes to get_idmap_delta.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
=== modified file 'fetch.py'
--- a/fetch.py	2009-01-16 22:22:09 +0000
+++ b/fetch.py	2009-01-16 22:37:58 +0000
@@ -581,7 +581,7 @@
         if self._id_map is not None:
             return self._id_map
 
-        self._id_map = self.source.fileid_map.apply_changes(self.revmeta, 
+        self._id_map = self.source.fileid_map.get_idmap_delta(self.revmeta, 
             self.mapping)[0]
 
         return self._id_map

=== modified file 'fileids.py'
--- a/fileids.py	2009-01-16 22:22:09 +0000
+++ b/fileids.py	2009-01-16 22:37:58 +0000
@@ -126,14 +126,13 @@
             assert path in map
             map[path] = (map[path][0], revid)
 
-    def apply_changes(self, revmeta, mapping, find_children=None):
+    def get_idmap_delta(self, revmeta, mapping, find_children=None):
         """Change file id map to incorporate specified changes.
 
         :param revmeta: RevisionMetadata object for revision with changes
         :param renames: List of renames (known file ids for particular paths)
         :param mapping: Mapping
         """
-        renames = revmeta.get_fileid_map(mapping)
         changes = get_local_changes(revmeta.get_paths(mapping), revmeta.branch_path, mapping,
                     self.repos.get_layout(),
                     self.repos.generate_revision_id, find_children)
@@ -149,7 +148,7 @@
             return mapping.generate_file_id(revmeta.get_foreign_revid(), x)
          
         idmap = self.apply_changes_fn(new_file_id, changes, get_children)
-        idmap.update(renames)
+        idmap.update(revmeta.get_fileid_map(mapping))
         return (idmap, changes)
 
     def get_map(self, foreign_revid, mapping):
@@ -179,7 +178,7 @@
                 if revmeta.is_hidden(mapping):
                     continue
                 revid = revmeta.get_revision_id(mapping)
-                (idmap, changes) = self.apply_changes(revmeta, 
+                (idmap, changes) = self.get_idmap_delta(revmeta, 
                         mapping, self.repos.find_children)
                 self.update_map(map, revid, idmap, changes)
                 self._use_text_revids(mapping, revmeta, map)
@@ -299,7 +298,7 @@
                 pb.update('generating file id map', i, len(todo))
                 revid = revmeta.get_revision_id(mapping)
 
-                (idmap, changes) = self.actual.apply_changes(
+                (idmap, changes) = self.actual.get_idmap_delta(
                         revmeta, mapping, self.repos.find_children)
 
                 self.actual.update_map(map, revid, idmap, changes)