Rev 2251: Add fileid_map return value to dpush. 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: 2251
revision-id: jelmer at samba.org-20081208200231-w1ufez92dkfvlhtr
parent: jelmer at samba.org-20081208195616-nq2ieiay16yn8jj9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-12-08 21:02:31 +0100
message:
  Add fileid_map return value to dpush.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  foreign/__init__.py            foreign.py-20080827193306-rxeku2c2obec90c4-1
=== modified file 'commit.py'
--- a/commit.py	2008-12-08 19:13:32 +0000
+++ b/commit.py	2008-12-08 20:02:31 +0000
@@ -857,6 +857,7 @@
     :param stop_revision: If not None, stop at this revision.
     :return: Map of old revids to new revids.
     """
+    fileid_map = {} # FIXME: Fill in fileid_map
     source.lock_write()
     try:
         if stop_revision is None:
@@ -885,7 +886,7 @@
                 target._clear_cached_state()
         finally:
             pb.finished()
-        return revid_map
+        return revid_map, fileid_map
     finally:
         source.unlock()
 

=== modified file 'foreign/__init__.py'
--- a/foreign/__init__.py	2008-12-05 03:47:14 +0000
+++ b/foreign/__init__.py	2008-12-08 20:02:31 +0000
@@ -48,6 +48,7 @@
 
         :param source: Source branch
         :param stop_revision: Revision to pull, defaults to last revision.
+        :return: Revision id map and file id map
         """
         raise NotImplementedError(self.pull)
 
@@ -158,7 +159,7 @@
             target_branch.pull(source_branch)
             no_rebase = True
         else:
-            revid_map = target_branch.dpull(source_branch)
+            revid_map, fileid_map = target_branch.dpull(source_branch)
         # We successfully created the target, remember it
         if source_branch.get_push_location() is None or remember:
             source_branch.set_push_location(target_branch.base)