Rev 1084: Merge 0.4. in file:///data/jelmer/bzr-svn/cext/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1084
revision-id: jelmer at samba.org-20080605164900-ft3mf232ug3xx22w
parent: jelmer at samba.org-20080605152431-ity0q1eh0mycedse
parent: jelmer at samba.org-20080605164448-bcu17il5q8ouqvx3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Thu 2008-06-05 18:49:00 +0200
message:
  Merge 0.4.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  tests/test_upgrade.py          test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
    ------------------------------------------------------------
    revno: 950.3.151
    revision-id: jelmer at samba.org-20080605164448-bcu17il5q8ouqvx3
    parent: jelmer at samba.org-20080605163801-dcr0x67dne6o3bp4
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-06-05 18:44:48 +0200
    message:
      Avoid removed clone_text call.
    modified:
      tests/test_upgrade.py          test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
    ------------------------------------------------------------
    revno: 950.3.150
    revision-id: jelmer at samba.org-20080605163801-dcr0x67dne6o3bp4
    parent: jelmer at samba.org-20080605102104-tg14dxos8tyh8v8b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Thu 2008-06-05 18:38:01 +0200
    message:
      Cope with new argument to update_revisions.
    modified:
      branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-06-05 10:23:08 +0000
+++ b/branch.py	2008-06-05 16:49:00 +0000
@@ -335,7 +335,8 @@
             revno = self.revision_id_to_revno(revision_id)
         destination.set_last_revision_info(revno, revision_id)
 
-    def update_revisions(self, other, stop_revision=None, overwrite=False):
+    def update_revisions(self, other, stop_revision=None, overwrite=False, 
+                         graph=None):
         """See Branch.update_revisions()."""
         if overwrite:
             raise NotImplementedError("overwrite not supported for Subversion branches")
@@ -344,9 +345,11 @@
         if (self.last_revision() == stop_revision or
             self.last_revision() == other.last_revision()):
             return
+        if graph is None:
+            graph = self.repository.get_graph()
         if not other.repository.get_graph().is_ancestor(self.last_revision(), 
                                                         stop_revision):
-            if self.repository.get_graph().is_ancestor(stop_revision, 
+            if graph.is_ancestor(stop_revision, 
                                                        self.last_revision()):
                 return
             raise DivergedBranches(self, other)

=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py	2008-06-05 03:39:17 +0000
+++ b/tests/test_upgrade.py	2008-06-05 16:44:48 +0000
@@ -174,8 +174,9 @@
 
         mapping = oldrepos.get_mapping()
         vf = newrepos.weave_store.get_weave_or_empty(tree.inventory.path2id("a"), newrepos.get_transaction())
-        vf.clone_text("customrev%s-upgrade" % mapping.upgrade_suffix,
-                "svn-v1:1@%s-" % oldrepos.uuid, ["svn-v1:1@%s-" % oldrepos.uuid])
+        vf.add_lines("customrev%s-upgrade" % mapping.upgrade_suffix,
+                ["svn-v1:1@%s-" % oldrepos.uuid],
+                vf.get_lines("svn-v1:1@%s-" % oldrepos.uuid))
 
         newrepos.commit_write_group()
         newrepos.unlock()