Rev 323: Remove unused local map obtain code. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Wed Jan 3 00:30:30 GMT 2007


------------------------------------------------------------
revno: 323
revision-id: jelmer at samba.org-20061228170228-qdhgqj1akrc7b45s
parent: jelmer at samba.org-20061228170154-n70amzdyj9ejqx16
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Thu 2006-12-28 18:02:28 +0100
message:
  Remove unused local map obtain code.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py	2006-12-28 16:52:51 +0000
+++ b/fetch.py	2006-12-28 17:02:28 +0000
@@ -42,7 +42,7 @@
     return s.hexdigest()
 
 class RevisionBuildEditor(svn.delta.Editor):
-    def __init__(self, source, target, branch_path, revnum, prev_inventory, revid, svn_revprops, id_map, parent_branch, parent_id_map):
+    def __init__(self, source, target, branch_path, revnum, prev_inventory, revid, svn_revprops, id_map, parent_branch):
         self.branch_path = branch_path
         self.old_inventory = prev_inventory
         self.inventory = copy(prev_inventory)
@@ -50,7 +50,6 @@
         self.revnum = revnum
         self.id_map = id_map
         self.parent_branch = parent_branch
-        self.parent_id_map = parent_id_map
         self.source = source
         self.target = target
         self.transact = target.get_transaction()
@@ -327,15 +326,12 @@
                 parent_branch = None
 
             if parent_revid is None:
-                parent_id_map = {"": (ROOT_ID, None)}
                 id_map = self.source.get_fileid_map(revnum, branch)
                 parent_inv = Inventory(ROOT_ID)
             elif prev_revid != parent_revid:
-                parent_id_map = self.source.get_fileid_map(parent_revnum, parent_branch)
                 id_map = self.source.get_fileid_map(revnum, branch)
                 parent_inv = self.target.get_inventory(parent_revid)
             else:
-                parent_id_map = copy(id_map)
                 self.source.transform_fileid_map(self.source.uuid, 
                                         revnum, branch, 
                                         changes, id_map)
@@ -345,7 +341,7 @@
             editor = RevisionBuildEditor(self.source, self.target, branch, 
                                          revnum, parent_inv, revid, 
                                      self.source._log.get_revision_info(revnum),
-                                     id_map, parent_branch, parent_id_map)
+                                     id_map, parent_branch)
 
             pool = Pool()
             edit, edit_baton = svn.delta.make_editor(editor, pool)




More information about the bazaar-commits mailing list