Merge lp:~gz/bzr/484516-push-revspec-tree into lp:bzr

[Martin Packman]

Create working tree at specified revision when doing a local push

[Martin Packman (gz)]

sent to pqm by email

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py	2012-04-16 11:08:11 +0000
+++ bzrlib/tests/blackbox/test_push.py	2012-07-28 14:54:21 +0000
@@ -452,6 +452,8 @@
         self.assertTrue(repo_to.has_revision('from-1'))
         self.assertFalse(repo_to.has_revision('from-2'))
         self.assertEqual(tree_to.branch.last_revision_info()[1], 'from-1')
+        self.assertFalse(
+            tree_to.changes_from(tree_to.basis_tree()).has_changed())
 
         self.run_bzr_error(
             ['bzr: ERROR: bzr push --revision '
@@ -917,3 +919,28 @@
             2>All changes applied successfully.
             2>Pushed up to revision 1.
             """)
+
+    def test_push_with_revspec(self):
+        self.run_script("""
+            $ bzr init-repo .
+            Shared repository with trees (format: 2a)
+            Location:
+              shared repository: .
+            $ bzr init trunk
+            Created a repository tree (format: 2a)
+            Using shared repository...
+            $ cd trunk
+            $ bzr commit -m 'first rev' --unchanged
+            2>Committing to:...trunk/
+            2>Committed revision 1.
+            $ echo foo > file
+            $ bzr add
+            adding file
+            $ bzr commit -m 'we need some foo'
+            2>Committing to:...trunk/
+            2>added file
+            2>Committed revision 2.
+            $ bzr push -r 1 ../other
+            2>Created new branch.
+            $ bzr st ../other # checking that file is not created (#484516)
+            """)

=== modified file 'bzrlib/workingtree.py'
--- bzrlib/workingtree.py	2012-07-18 20:06:21 +0000
+++ bzrlib/workingtree.py	2012-07-28 14:54:21 +0000
@@ -535,7 +535,12 @@
         else:
             # TODO now merge from tree.last_revision to revision (to preserve
             # user local changes)
-            merge.transform_tree(tree, self)
+            try:
+                other_tree = self.revision_tree(revision_id)
+            except errors.NoSuchRevision:
+                other_tree = self.branch.repository.revision_tree(revision_id)
+
+            merge.transform_tree(tree, other_tree)
             if revision_id == _mod_revision.NULL_REVISION:
                 new_parents = []
             else:

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-07-25 10:11:07 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-07-28 14:54:21 +0000
@@ -39,6 +39,9 @@
 * When a missing referenced chk root error is encountered, bzr now suggests
   running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
 
+* When pushing a specific revision, create the new working tree at
+  that revision. (#484516, Neil Martinsen-Burrell)
+
 Documentation
 *************
 
@@ -113,7 +116,6 @@
 * Option values set on locked branches should be saved only when the branch
   is finally unlocked. (Vincent Ladeuil, #948339)
 
-
 Documentation
 *************