Rev 1698: Merge dpush improvements. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1698
revision-id: jelmer at samba.org-20080829162010-lzvvxp462cy0fvro
parent: jelmer at samba.org-20080829161947-adnbkn40dysujuif
parent: jelmer at samba.org-20080829161758-b43sblgbhz056cgs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 18:20:10 +0200
message:
  Merge dpush improvements.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  foreign/__init__.py            foreign.py-20080827193306-rxeku2c2obec90c4-1
    ------------------------------------------------------------
    revno: 0.5.10
    revision-id: jelmer at samba.org-20080829161758-b43sblgbhz056cgs
    parent: jelmer at samba.org-20080829155157-l5fyndavfxy93zan
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2008-08-29 18:17:58 +0200
    message:
      Implement dpush using dpull function on Branch.
    modified:
      __init__.py                    foreign.py-20080827193306-rxeku2c2obec90c4-1
=== modified file 'branch.py'
--- a/branch.py	2008-08-29 15:18:10 +0000
+++ b/branch.py	2008-08-29 16:20:10 +0000
@@ -338,9 +338,9 @@
         # on large branches.
         return self.generate_revision_id(self.get_revnum())
 
-    def dpush(self, target, stop_revision=None):
+    def dpull(self, source, stop_revision=None):
         from bzrlib.plugins.svn.commit import dpush
-        return dpush(target, self, stop_revision)
+        return dpush(source, self, stop_revision)
 
     def pull(self, source, overwrite=False, stop_revision=None, 
              _hook_master=None, run_hooks=True, _push_merged=None):

=== modified file 'foreign/__init__.py'
--- a/foreign/__init__.py	2008-08-29 16:00:52 +0000
+++ b/foreign/__init__.py	2008-08-29 16:20:10 +0000
@@ -132,7 +132,7 @@
         bzrdir = BzrDir.open(location)
         target_branch = bzrdir.open_branch()
         target_branch.lock_write()
-        revid_map = source_branch.dpush(target_branch)
+        revid_map = source_branch.dpull(target_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)