Merge lp:~jameinel/bzr/2.3-push-copy-repo-465517 into lp:bzr/2.3

[John A Meinel]

Fix bug #465517, 'bzr push' to a repo w/ no branch should only push the branch ancestry, not all revs in the repo.

This fixes a long-standing bug. If you interrupt a push to a new branch on Launchpad, it can leave a Repository with no Branch. If you then start the push over again, you end up pushing the whole local repository, instead of just the tip revision. (Most noticeable in my repo that mixes plugins with bzr source.)

It doesn't solve the remaining bug, that the final branch isn't stacked like it should be. But I'm not subscribed as "In Progress" to that bug :).

I'm targeting 2.3 because it was easy enough. I thought about backporting, but at 2.3 we switched from having the code in "bzrdir.py" to "controldir.py", and that was a sufficient threshold that I didn't bother going further back.

[Jelmer Vernooij (jelmer)]

W00t.

"But I'm not subscribed as "In Progress" to that bug :)" doesn't parse. Do you mean you're working on that bit as well?

[John A Meinel (jameinel)]

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

On 3/21/2011 4:29 PM, Jelmer Vernooij wrote:
> W00t.
>
> "But I'm not subscribed as "In Progress" to that bug :)" doesn't parse. Do you mean you're working on that bit as well?

I'm clearing out my "todo" queue, that bug isn't in my todo queue.

John
=:->

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

iEYEARECAAYFAk2HdKYACgkQJdeBCYSNAAMalQCbBJ9F5/Hsi3hB8XkAzaLLAiJK
zSMAoKJ4o8vLdbe5vGasA1yyoqDbvXap
=Ep5U
-----END PGP SIGNATURE-----

[Martin Pool (mbp)]

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'bzrlib/controldir.py'
--- bzrlib/controldir.py	2011-01-26 19:34:58 +0000
+++ bzrlib/controldir.py	2011-03-21 14:47:24 +0000
@@ -503,6 +503,10 @@
         if br_to is None:
             # We have a repository but no branch, copy the revisions, and then
             # create a branch.
+            if revision_id is None:
+                # No revision supplied by the user, default to the branch
+                # revision
+                revision_id = source.last_revision()
             repository_to.fetch(source.repository, revision_id=revision_id)
             br_to = source.clone(self, revision_id=revision_id)
             if source.get_push_location() is None or remember:

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py	2011-01-10 22:20:12 +0000
+++ bzrlib/tests/blackbox/test_push.py	2011-03-21 14:47:24 +0000
@@ -204,6 +204,22 @@
             % tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
         self.failUnlessExists('to-two')
 
+    def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
+        # See https://bugs.launchpad.net/bzr/+bug/465517
+        target_repo = self.make_repository('target')
+        source = self.make_branch_builder('source')
+        source.start_series()
+        source.build_snapshot('A', None, [
+            ('add', ('', 'root-id', 'directory', None))])
+        source.build_snapshot('B', ['A'], [])
+        source.build_snapshot('C', ['A'], [])
+        source.finish_series()
+        self.run_bzr('push target -d source')
+        self.addCleanup(target_repo.lock_read().unlock)
+        # We should have pushed 'C', but not 'B', since it isn't in the
+        # ancestry
+        self.assertEqual([('A',), ('C',)], sorted(target_repo.revisions.keys()))
+
     def test_push_smart_non_stacked_streaming_acceptance(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('from')

=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- bzrlib/tests/per_branch/test_push.py	2011-03-17 06:45:35 +0000
+++ bzrlib/tests/per_branch/test_push.py	2011-03-21 14:47:24 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010 Canonical Ltd
+# Copyright (C) 2007-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -187,6 +187,41 @@
         self.assertEqual(tree.branch.last_revision(),
                          to_branch.last_revision())
 
+    def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
+        # See https://bugs.launchpad.net/bzr/+bug/465517
+        t = self.get_transport('target')
+        t.ensure_base()
+        bzrdir = self.bzrdir_format.initialize_on_transport(t)
+        try:
+            bzrdir.open_branch()
+        except errors.NotBranchError:
+            pass
+        else:
+            raise tests.TestNotApplicable('older formats can\'t have a repo'
+                                          ' without a branch')
+        try:
+            source = self.make_branch_builder('source',
+                                              format=self.bzrdir_format)
+        except errors.UninitializableFormat:
+            raise tests.TestNotApplicable('cannot initialize this format')
+        source.start_series()
+        source.build_snapshot('A', None, [
+            ('add', ('', 'root-id', 'directory', None))])
+        source.build_snapshot('B', ['A'], [])
+        source.build_snapshot('C', ['A'], [])
+        source.finish_series()
+        b = source.get_branch()
+        # Note: We can't read lock the source branch. Some formats take a write
+        # lock to 'set_push_location', which breaks
+        self.addCleanup(b.lock_write().unlock)
+        repo = bzrdir.create_repository()
+        # This means 'push the source branch into this dir'
+        bzrdir.push_branch(b)
+        self.addCleanup(repo.lock_read().unlock)
+        # We should have pushed 'C', but not 'B', since it isn't in the
+        # ancestry
+        self.assertEqual([('A',), ('C',)], sorted(repo.revisions.keys()))
+
     def test_push_overwrite_of_non_tip_with_stop_revision(self):
         """Combining the stop_revision and overwrite options works.
 

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2011-03-18 01:46:22 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-03-21 14:47:24 +0000
@@ -32,6 +32,11 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+* ``bzr push`` into a repository (that doesn't have a branch), will no
+  longer copy all revisions in the repository. Only the ones in the
+  ancestry of the source branch, like it does in all other cases.
+  (John Arbash Meinel, #465517)
+
 * Fix "Unable to obtain lock" error when pushing to a bound branch if tags
   had changed.  Bazaar was attempting to open and lock the master branch
   twice in this case.  (Andrew Bennetts, #733350)