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

------------------------------------------------------------
revno: 2150
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.5
timestamp: Thu 2008-12-04 01:57:40 +0100
message:
  Remove use of create_by_apply_delta, it's no longer necessary.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py  2008-12-04 00:02:26 +0000
+++ b/fetch.py  2008-12-04 00:57:40 +0000
@@ -498,15 +498,12 @@
                                   self._inv_delta, rev.revision_id,
                                   [r for r in rev.parent_ids if 
self.target.has_revision(r)])
         else:
-            if getattr(self.old_inventory, "create_by_apply_delta", None) is 
not None:
-                self.inventory = 
self.old_inventory.create_by_apply_delta(self._inv_delta, rev.revision_id)
-            else:
-                self.inventory = self.old_inventory
-                self.inventory.apply_delta(self._inv_delta)
-                self.inventory.revision_id = rev.revision_id
+            self.inventory = self.old_inventory
+            self.inventory.apply_delta(self._inv_delta)
+            self.inventory.revision_id = rev.revision_id
 
-                rev.inventory_sha1 = 
self.target.add_inventory(rev.revision_id, 
-                        self.inventory, rev.parent_ids)
+            rev.inventory_sha1 = self.target.add_inventory(rev.revision_id, 
+                    self.inventory, rev.parent_ids)
         self.target.add_revision(self.revid, rev)
 
         # Only fetch signature if it's cheap


-- 
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits

Reply via email to