Rev 1438: Fix formatting, docstring. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Sun Jul 6 14:26:25 BST 2008


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

------------------------------------------------------------
revno: 1438
revision-id: jelmer at samba.org-20080706132614-s9my31jc66l4q2z4
parent: jelmer at samba.org-20080706123754-i70rhy95w2tlnkiv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-07-06 15:26:14 +0200
message:
  Fix formatting, docstring.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'commit.py'
--- a/commit.py	2008-07-06 01:07:42 +0000
+++ b/commit.py	2008-07-06 13:26:14 +0000
@@ -703,6 +703,14 @@
 
 
 def dpush(target, source, stop_revision=None):
+    """Push derivatives of the revisions missing from target from source into 
+    target.
+
+    :param target: Branch to push into
+    :param source: Branch to retrieve revisions from
+    :param stop_revision: If not None, stop at this revision.
+    :return: Map of old revids to new revids.
+    """
     source.lock_write()
     try:
         if stop_revision is None:
@@ -722,8 +730,10 @@
             for revid in todo:
                 pb.update("pushing revisions", todo.index(revid), 
                           len(todo))
-                revid_map[revid] = push(target, source, revid, push_metadata=False)
-                source.repository.fetch(target.repository, revision_id=revid_map[revid])
+                revid_map[revid] = push(target, source, revid, 
+                                        push_metadata=False)
+                source.repository.fetch(target.repository, 
+                                        revision_id=revid_map[revid])
                 target._clear_cached_state()
         finally:
             pb.finished()




More information about the bazaar-commits mailing list