Merge lp:~spiv/bzr-loom/bzr-2.4-compat into lp:bzr-loom

[Andrew Bennetts]

This branch depends on <https://code.launchpad.net/~spiv/bzr/branch-revs-to-fetch/+merge/51710>.

This fixes all the test failures in bzr-loom when run with lp:bzr.

Some points of interest, and maybe concern:

 * it now does a single fetch, rather than one fetch per thread. Yay!
 * for simplicity I haven't tried to maintain backwards compatibility with bzr 2.3. Should I?
 * I also implemented pushing/pulling etc of tags for looms. The model is simple: there's a global tags dict for the whole loom, independent of threads. That is, tag semantics are basically unaffected by 'bzr loomify'. This is part of this patch because it was the easiest path to getting tests passing; previously looms sort-of had tags, and the new tests in lp:bzr were partly failing because of that.

[Robert Collins (lifeless)]

+1

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/1/2011 9:39 AM, Andrew Bennetts wrote:
> Andrew Bennetts has proposed merging lp:~spiv/bzr-loom/bzr-2.4-compat into lp:bzr-loom.
>
> Requested reviews:
> Loom Developers (bzr-loom-devs)
> Related bugs:
> #721328 revno 5648 on bzr.dev broke loom tests
> https://bugs.launchpad.net/bugs/721328
>
> For more details, see:
> https://code.launchpad.net/~spiv/bzr-loom/bzr-2.4-compat/+merge/51714
>
> This branch depends on <https://code.launchpad.net/~spiv/bzr/branch-revs-to-fetch/+merge/51710>.
>
> This fixes all the test failures in bzr-loom when run with lp:bzr.
>
> Some points of interest, and maybe concern:
>
> * it now does a single fetch, rather than one fetch per thread. Yay!
> * for simplicity I haven't tried to maintain backwards compatibility with bzr 2.3. Should I?
> * I also implemented pushing/pulling etc of tags for looms. The model is simple: there's a global tags dict for the whole loom, independent of threads. That is, tag semantics are basically unaffected by 'bzr loomify'. This is part of this patch because it was the easiest path to getting tests passing; previously looms sort-of had tags, and the new tests in lp:bzr were partly failing because of that.

Just repeating Robert:
 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1tREUACgkQJdeBCYSNAANbygCgvlH1+VXgJRgLBUaFeq2aPe0M
zKIAnimF3IEjCPUjJ94TlRZ3O7H2vGzf
=s1qA
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'branch.py'
--- branch.py	2011-02-23 13:27:27 +0000
+++ branch.py	2011-03-01 08:38:29 +0000
@@ -30,6 +30,8 @@
 from bzrlib import bzrdir
 from bzrlib.decorators import needs_read_lock, needs_write_lock
 import bzrlib.errors
+import bzrlib.fetch
+import bzrlib.graph
 import bzrlib.osutils
 from bzrlib import remote, symbol_versioning
 import bzrlib.trace
@@ -409,6 +411,18 @@
 
     nick = property(_loom_get_nick, _rename_thread)
 
+    def heads_to_fetch(self):
+        """See Branch.heads_to_fetch."""
+        # The base implementation returns ([tip], tags)
+        must_fetch, should_fetch = super(LoomSupport, self).heads_to_fetch()
+        # Add each thread's content to must_fetch
+        must_fetch.update(
+            thread_rev for thread_name, thread_rev, thread_parents in
+            self.get_loom_state().get_threads())
+        must_fetch.discard(EMPTY_REVISION)
+        must_fetch.discard(bzrlib.revision.NULL_REVISION)
+        return must_fetch, should_fetch
+
     @needs_read_lock
     def push(self, target, overwrite=False, stop_revision=None,
         _override_hook_source_branch=None):
@@ -591,7 +605,6 @@
         return result
 
     def finish_result(self, result):
-        result.tag_conflicts = None
         result.new_revno, result.new_revid = self.target.last_revision_info()
 
     def do_hooks(self, result, run_hooks):
@@ -618,8 +631,9 @@
             new_rev = self.source.last_revision()
         if new_rev == EMPTY_REVISION:
             new_rev = bzrlib.revision.NULL_REVISION
+        fetch_spec = self.build_fetch_spec(stop_revision)
         self.target.repository.fetch(self.source.repository,
-            revision_id=new_rev)
+            fetch_spec=fetch_spec)
         if not overwrite:
             new_rev_ancestry = self.source.repository.get_ancestry(
                 new_rev)
@@ -631,10 +645,20 @@
                 raise bzrlib.errors.DivergedBranches(
                     self.target, self.source)
         self.target.generate_revision_history(new_rev)
+        result.tag_conflicts = self.source.tags.merge_to(self.target.tags)
         # get the final result object details
         self.do_hooks(result, run_hooks)
         return result
 
+    def build_fetch_spec(self, stop_revision):
+        factory = bzrlib.fetch.FetchSpecFactory()
+        factory.source_branch = self.source
+        factory.source_repo = self.source.repository
+        factory.source_branch_stop_revision_id = stop_revision
+        factory.target_repo = self.target.repository
+        factory.target_repo_kind = bzrlib.fetch.TargetRepoKinds.PREEXISTING
+        return factory.make_fetch_spec()
+
     def transfer(self, overwrite, stop_revision, run_hooks=True,
         possible_transports=None, _override_hook_target=None, local=False):
         """Implementation of push and pull"""
@@ -672,17 +696,10 @@
                     source_state.get_basis_revision_id())
                 # stopping at from our repository.
                 revisions = [rev for name,rev in threads]
-                # for each thread from top to bottom, retrieve its referenced
-                # content. XXX FIXME: a revision_ids parameter to fetch would be
-                # nice here.
-                # the order is reversed because the common case is for the top
-                # thread to include all content.
-                for rev_id in reversed(revisions):
-                    if rev_id not in (EMPTY_REVISION,
-                        bzrlib.revision.NULL_REVISION):
-                        # fetch the loom content for this revision
-                        self.target.repository.fetch(self.source.repository,
-                            revision_id=rev_id)
+                # fetch content for all threads and tags.
+                fetch_spec = self.build_fetch_spec(stop_revision)
+                self.target.repository.fetch(self.source.repository,
+                    fetch_spec=fetch_spec)
                 # set our work threads to match (this is where we lose data if
                 # there are local mods)
                 my_state.set_threads(
@@ -699,6 +716,8 @@
                 if new_rev == EMPTY_REVISION:
                     new_rev = bzrlib.revision.NULL_REVISION
                 self.target.generate_revision_history(new_rev)
+                # merge tags
+                result.tag_conflicts = self.source.tags.merge_to(self.target.tags)
                 self.do_hooks(result, run_hooks)
                 return result
             finally:
@@ -799,7 +818,7 @@
             transport, 'lock', bzrlib.lockdir.LockDir)
         if found_repository is None:
             found_repository = a_bzrdir.find_repository()
-        return self._branch_class(_format=self,
+        return self._branch_class()(_format=self,
                           _control_files=control_files,
                           a_bzrdir=a_bzrdir,
                           _repository=found_repository,
@@ -836,7 +855,9 @@
     This format is new in the loom plugin.
     """
 
-    _branch_class = LoomBranch
+    def _branch_class(self):
+        return LoomBranch
+
     _parent_classs = bzrlib.branch.BzrBranchFormat5
 
     def get_format_string(self):
@@ -863,7 +884,9 @@
     This format is new in the loom plugin.
     """
 
-    _branch_class = LoomBranch6
+    def _branch_class(self):
+        return LoomBranch6
+
     _parent_classs = bzrlib.branch.BzrBranchFormat6
 
     def get_format_string(self):
@@ -890,7 +913,9 @@
     This format is new in the loom plugin.
     """
 
-    _branch_class = LoomBranch7
+    def _branch_class(self):
+        return LoomBranch7
+
     _parent_classs = bzrlib.branch.BzrBranchFormat7
 
     def get_format_string(self):
@@ -1018,6 +1043,8 @@
                 self.target.set_parent(parent)
         if threads:
             self.target._set_nick(threads[-1][0])
+        if self.source._push_should_merge_tags():
+            self.source.tags.merge_to(self.target.tags)
 
     @needs_write_lock
     def pull(self, overwrite=False, stop_revision=None,