← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-22 17:11:20 UTC
  • mfrom: (4398.8.10 1.16-commit-fulltext)
  • Revision ID: pqm@pqm.ubuntu.com-20090622171120-fuxez9ylfqpxynqn
(jam) Add VF._add_text and reduce memory overhead during commit (see
        bug #109114)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
    workingtree
32
32
    )
33
33
from bzrlib.repofmt import knitrepo
34
 
from bzrlib.tests import (
35
 
    blackbox,
36
 
    http_server,
37
 
    scenarios,
38
 
    test_foreign,
39
 
    test_server,
40
 
    )
 
34
from bzrlib.tests import http_server
41
35
from bzrlib.transport import memory
42
36
 
43
37
 
44
 
load_tests = scenarios.load_tests_apply_scenarios
45
 
 
46
 
 
47
38
class TestPush(tests.TestCaseWithTransport):
48
39
 
49
40
    def test_push_error_on_vfs_http(self):
104
95
        transport.delete('branch_b/c')
105
96
        out, err = self.run_bzr('push', working_dir='branch_a')
106
97
        path = branch_a.get_push_location()
 
98
        self.assertEquals(out,
 
99
                          'Using saved push location: %s\n'
 
100
                          % urlutils.local_path_from_url(path))
107
101
        self.assertEqual(err,
108
 
                         'Using saved push location: %s\n'
109
102
                         'All changes applied successfully.\n'
110
 
                         'Pushed up to revision 2.\n'
111
 
                         % urlutils.local_path_from_url(path))
 
103
                         'Pushed up to revision 2.\n')
112
104
        self.assertEqual(path,
113
105
                         branch_b.bzrdir.root_transport.base)
114
106
        # test explicit --remember
125
117
        b2 = branch.Branch.open('pushed-location')
126
118
        self.assertEndsWith(b2.base, 'pushed-location/')
127
119
 
128
 
    def test_push_no_tree(self):
129
 
        # bzr push --no-tree of a branch with working trees
130
 
        b = self.make_branch_and_tree('push-from')
131
 
        self.build_tree(['push-from/file'])
132
 
        b.add('file')
133
 
        b.commit('commit 1')
134
 
        out, err = self.run_bzr('push --no-tree -d push-from push-to')
135
 
        self.assertEqual('', out)
136
 
        self.assertEqual('Created new branch.\n', err)
137
 
        self.assertPathDoesNotExist('push-to/file')
138
 
 
139
120
    def test_push_new_branch_revision_count(self):
140
121
        # bzr push of a branch with revisions to a new location
141
122
        # should print the number of revisions equal to the length of the
148
129
        self.assertEqual('', out)
149
130
        self.assertEqual('Created new branch.\n', err)
150
131
 
151
 
    def test_push_quiet(self):
152
 
        # test that using -q makes output quiet
153
 
        t = self.make_branch_and_tree('tree')
154
 
        self.build_tree(['tree/file'])
155
 
        t.add('file')
156
 
        t.commit('commit 1')
157
 
        self.run_bzr('push -d tree pushed-to')
158
 
        path = t.branch.get_push_location()
159
 
        out, err = self.run_bzr('push', working_dir="tree")
160
 
        self.assertEqual('Using saved push location: %s\nNo new revisions to push.\n' % urlutils.local_path_from_url(path), err)
161
 
        out, err = self.run_bzr('push -q', working_dir="tree")
162
 
        self.assertEqual('', out)
163
 
        self.assertEqual('', err)
164
 
 
165
132
    def test_push_only_pushes_history(self):
166
133
        # Knit branches should only push the history for the current revision.
167
134
        format = bzrdir.BzrDirMetaFormat1()
212
179
        t.commit(allow_pointless=True,
213
180
                message='first commit')
214
181
        self.run_bzr('push -d from to-one')
215
 
        self.assertPathExists('to-one')
 
182
        self.failUnlessExists('to-one')
216
183
        self.run_bzr('push -d %s %s'
217
184
            % tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
218
 
        self.assertPathExists('to-two')
219
 
 
220
 
    def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
221
 
        # See https://bugs.launchpad.net/bzr/+bug/465517
222
 
        target_repo = self.make_repository('target')
223
 
        source = self.make_branch_builder('source')
224
 
        source.start_series()
225
 
        source.build_snapshot('A', None, [
226
 
            ('add', ('', 'root-id', 'directory', None))])
227
 
        source.build_snapshot('B', ['A'], [])
228
 
        source.build_snapshot('C', ['A'], [])
229
 
        source.finish_series()
230
 
        self.run_bzr('push target -d source')
231
 
        self.addCleanup(target_repo.lock_read().unlock)
232
 
        # We should have pushed 'C', but not 'B', since it isn't in the
233
 
        # ancestry
234
 
        self.assertEqual([('A',), ('C',)], sorted(target_repo.revisions.keys()))
 
185
        self.failUnlessExists('to-two')
235
186
 
236
187
    def test_push_smart_non_stacked_streaming_acceptance(self):
237
188
        self.setup_smart_server_with_call_log()
260
211
        # being too low. If rpc_count increases, more network roundtrips have
261
212
        # become necessary for this use case. Please do not adjust this number
262
213
        # upwards without agreement from bzr's network support maintainers.
263
 
        self.assertLength(13, self.hpss_calls)
 
214
        self.assertLength(14, self.hpss_calls)
264
215
        remote = branch.Branch.open('public')
265
216
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
266
217
 
267
 
    def test_push_smart_tags_streaming_acceptance(self):
268
 
        self.setup_smart_server_with_call_log()
269
 
        t = self.make_branch_and_tree('from')
270
 
        rev_id = t.commit(allow_pointless=True, message='first commit')
271
 
        t.branch.tags.set_tag('new-tag', rev_id)
272
 
        self.reset_smart_call_log()
273
 
        self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
274
 
        # This figure represent the amount of work to perform this use case. It
275
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
276
 
        # being too low. If rpc_count increases, more network roundtrips have
277
 
        # become necessary for this use case. Please do not adjust this number
278
 
        # upwards without agreement from bzr's network support maintainers.
279
 
        self.assertLength(11, self.hpss_calls)
280
 
 
281
 
    def test_push_smart_incremental_acceptance(self):
282
 
        self.setup_smart_server_with_call_log()
283
 
        t = self.make_branch_and_tree('from')
284
 
        rev_id1 = t.commit(allow_pointless=True, message='first commit')
285
 
        rev_id2 = t.commit(allow_pointless=True, message='second commit')
286
 
        self.run_bzr(
287
 
            ['push', self.get_url('to-one'), '-r1'], working_dir='from')
288
 
        self.reset_smart_call_log()
289
 
        self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
290
 
        # This figure represent the amount of work to perform this use case. It
291
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
292
 
        # being too low. If rpc_count increases, more network roundtrips have
293
 
        # become necessary for this use case. Please do not adjust this number
294
 
        # upwards without agreement from bzr's network support maintainers.
295
 
        self.assertLength(11, self.hpss_calls)
296
 
 
297
218
    def test_push_smart_with_default_stacking_url_path_segment(self):
298
219
        # If the default stacked-on location is a path element then branches
299
220
        # we push there over the smart server are stacked and their
337
258
                     working_dir='tree')
338
259
        new_tree = workingtree.WorkingTree.open('new/tree')
339
260
        self.assertEqual(tree.last_revision(), new_tree.last_revision())
340
 
        self.assertPathExists('new/tree/a')
 
261
        self.failUnlessExists('new/tree/a')
341
262
 
342
263
    def test_push_use_existing(self):
343
264
        """'bzr push --use-existing-dir' can push into an existing dir.
358
279
        new_tree = workingtree.WorkingTree.open('target')
359
280
        self.assertEqual(tree.last_revision(), new_tree.last_revision())
360
281
        # The push should have created target/a
361
 
        self.assertPathExists('target/a')
362
 
 
363
 
    def test_push_use_existing_into_empty_bzrdir(self):
364
 
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir
365
 
        fails.
366
 
        """
367
 
        tree = self.create_simple_tree()
368
 
        self.build_tree(['target/', 'target/.bzr/'])
369
 
        self.run_bzr_error(
370
 
            ['Target directory ../target already contains a .bzr directory, '
371
 
             'but it is not valid.'],
372
 
            'push ../target --use-existing-dir', working_dir='tree')
 
282
        self.failUnlessExists('target/a')
373
283
 
374
284
    def test_push_onto_repo(self):
375
285
        """We should be able to 'bzr push' into an existing bzrdir."""
578
488
class RedirectingMemoryTransport(memory.MemoryTransport):
579
489
 
580
490
    def mkdir(self, relpath, mode=None):
 
491
        from bzrlib.trace import mutter
581
492
        if self._cwd == '/source/':
582
493
            raise errors.RedirectRequested(self.abspath(relpath),
583
494
                                           self.abspath('../target'),
590
501
            return super(RedirectingMemoryTransport, self).mkdir(
591
502
                relpath, mode)
592
503
 
593
 
    def get(self, relpath):
594
 
        if self.clone(relpath)._cwd == '/infinite-loop/':
595
 
            raise errors.RedirectRequested(self.abspath(relpath),
596
 
                                           self.abspath('../infinite-loop'),
597
 
                                           is_permanent=True)
598
 
        else:
599
 
            return super(RedirectingMemoryTransport, self).get(relpath)
600
 
 
601
504
    def _redirected_to(self, source, target):
602
505
        # We do accept redirections
603
506
        return transport.get_transport(target)
605
508
 
606
509
class RedirectingMemoryServer(memory.MemoryServer):
607
510
 
608
 
    def start_server(self):
 
511
    def setUp(self):
609
512
        self._dirs = {'/': None}
610
513
        self._files = {}
611
514
        self._locks = {}
619
522
        result._locks = self._locks
620
523
        return result
621
524
 
622
 
    def stop_server(self):
 
525
    def tearDown(self):
623
526
        transport.unregister_transport(self._scheme, self._memory_factory)
624
527
 
625
528
 
628
531
    def setUp(self):
629
532
        tests.TestCaseWithTransport.setUp(self)
630
533
        self.memory_server = RedirectingMemoryServer()
631
 
        self.start_server(self.memory_server)
 
534
        self.memory_server.setUp()
 
535
        self.addCleanup(self.memory_server.tearDown)
 
536
 
632
537
        # Make the branch and tree that we'll be pushing.
633
538
        t = self.make_branch_and_tree('tree')
634
539
        self.build_tree(['tree/file'])
661
566
        self.assertEqual('', out)
662
567
 
663
568
 
664
 
class TestPushStrictMixin(object):
 
569
class TestPushStrict(tests.TestCaseWithTransport):
665
570
 
666
571
    def make_local_branch_and_tree(self):
667
 
        self.tree = self.make_branch_and_tree('local')
 
572
        tree = self.make_branch_and_tree('local')
668
573
        self.build_tree_contents([('local/file', 'initial')])
669
 
        self.tree.add('file')
670
 
        self.tree.commit('adding file', rev_id='added')
 
574
        tree.add('file')
 
575
        tree.commit('adding file', rev_id='from-1')
 
576
        return tree
 
577
 
 
578
    def make_local_branch_and_tree_with_changes(self):
 
579
        tree = self.make_local_branch_and_tree()
 
580
        # Make some changes
671
581
        self.build_tree_contents([('local/file', 'modified')])
672
 
        self.tree.commit('modify file', rev_id='modified')
 
582
        return tree
673
583
 
674
 
    def set_config_push_strict(self, value):
 
584
    def set_config_push_strict(self, tree, value):
675
585
        # set config var (any of bazaar.conf, locations.conf, branch.conf
676
586
        # should do)
677
 
        conf = self.tree.branch.get_config()
 
587
        conf = tree.branch.get_config()
678
588
        conf.set_user_option('push_strict', value)
679
589
 
680
 
    _default_command = ['push', '../to']
681
 
    _default_wd = 'local'
682
 
    _default_errors = ['Working tree ".*/local/" has uncommitted '
683
 
                       'changes \(See bzr status\)\.',]
684
 
    _default_additional_error = 'Use --no-strict to force the push.\n'
685
 
    _default_additional_warning = 'Uncommitted changes will not be pushed.'
686
 
 
687
 
 
688
 
    def assertPushFails(self, args):
689
 
        out, err = self.run_bzr_error(self._default_errors,
690
 
                                      self._default_command + args,
691
 
                                      working_dir=self._default_wd, retcode=3)
692
 
        self.assertContainsRe(err, self._default_additional_error)
693
 
 
694
 
    def assertPushSucceeds(self, args, with_warning=False, revid_to_push=None):
695
 
        if with_warning:
696
 
            error_regexes = self._default_errors
697
 
        else:
698
 
            error_regexes = []
699
 
        out, err = self.run_bzr(self._default_command + args,
700
 
                                working_dir=self._default_wd,
701
 
                                error_regexes=error_regexes)
702
 
        if with_warning:
703
 
            self.assertContainsRe(err, self._default_additional_warning)
704
 
        else:
705
 
            self.assertNotContainsRe(err, self._default_additional_warning)
706
 
        branch_from = branch.Branch.open(self._default_wd)
707
 
        if revid_to_push is None:
708
 
            revid_to_push = branch_from.last_revision()
709
 
        branch_to = branch.Branch.open('to')
710
 
        repo_to = branch_to.repository
711
 
        self.assertTrue(repo_to.has_revision(revid_to_push))
712
 
        self.assertEqual(revid_to_push, branch_to.last_revision())
713
 
 
714
 
 
715
 
 
716
 
class TestPushStrictWithoutChanges(tests.TestCaseWithTransport,
717
 
                                   TestPushStrictMixin):
718
 
 
719
 
    def setUp(self):
720
 
        super(TestPushStrictWithoutChanges, self).setUp()
721
 
        self.make_local_branch_and_tree()
722
 
 
723
 
    def test_push_default(self):
724
 
        self.assertPushSucceeds([])
725
 
 
726
 
    def test_push_strict(self):
727
 
        self.assertPushSucceeds(['--strict'])
728
 
 
729
 
    def test_push_no_strict(self):
730
 
        self.assertPushSucceeds(['--no-strict'])
731
 
 
732
 
    def test_push_config_var_strict(self):
733
 
        self.set_config_push_strict('true')
734
 
        self.assertPushSucceeds([])
735
 
 
736
 
    def test_push_config_var_no_strict(self):
737
 
        self.set_config_push_strict('false')
738
 
        self.assertPushSucceeds([])
739
 
 
740
 
 
741
 
strict_push_change_scenarios = [
742
 
    ('uncommitted',
743
 
        dict(_changes_type= '_uncommitted_changes')),
744
 
    ('pending-merges',
745
 
        dict(_changes_type= '_pending_merges')),
746
 
    ('out-of-sync-trees',
747
 
        dict(_changes_type= '_out_of_sync_trees')),
748
 
    ]
749
 
 
750
 
 
751
 
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
752
 
                                TestPushStrictMixin):
753
 
 
754
 
    scenarios = strict_push_change_scenarios 
755
 
    _changes_type = None # Set by load_tests
756
 
 
757
 
    def setUp(self):
758
 
        super(TestPushStrictWithChanges, self).setUp()
759
 
        # Apply the changes defined in load_tests: one of _uncommitted_changes,
760
 
        # _pending_merges or _out_of_sync_trees
761
 
        getattr(self, self._changes_type)()
762
 
 
763
 
    def _uncommitted_changes(self):
764
 
        self.make_local_branch_and_tree()
765
 
        # Make a change without committing it
766
 
        self.build_tree_contents([('local/file', 'in progress')])
767
 
 
768
 
    def _pending_merges(self):
769
 
        self.make_local_branch_and_tree()
770
 
        # Create 'other' branch containing a new file
771
 
        other_bzrdir = self.tree.bzrdir.sprout('other')
772
 
        other_tree = other_bzrdir.open_workingtree()
773
 
        self.build_tree_contents([('other/other-file', 'other')])
774
 
        other_tree.add('other-file')
775
 
        other_tree.commit('other commit', rev_id='other')
776
 
        # Merge and revert, leaving a pending merge
777
 
        self.tree.merge_from_branch(other_tree.branch)
778
 
        self.tree.revert(filenames=['other-file'], backups=False)
779
 
 
780
 
    def _out_of_sync_trees(self):
781
 
        self.make_local_branch_and_tree()
782
 
        self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
783
 
        # Make a change and commit it
784
 
        self.build_tree_contents([('local/file', 'modified in local')])
785
 
        self.tree.commit('modify file', rev_id='modified-in-local')
786
 
        # Exercise commands from the checkout directory
787
 
        self._default_wd = 'checkout'
788
 
        self._default_errors = ["Working tree is out of date, please run"
789
 
                                " 'bzr update'\.",]
790
 
 
791
 
    def test_push_default(self):
792
 
        self.assertPushSucceeds([], with_warning=True)
793
 
 
794
 
    def test_push_with_revision(self):
795
 
        self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
796
 
 
797
 
    def test_push_no_strict(self):
798
 
        self.assertPushSucceeds(['--no-strict'])
 
590
    def assertPushFails(self, location, *args):
 
591
        self.run_bzr_error(['Working tree ".*/local/"'
 
592
                            ' has uncommitted changes.$',],
 
593
                           ['push', '../' + location] + list(args),
 
594
                           working_dir='local', retcode=3)
 
595
 
 
596
    def assertPushSucceeds(self, location, *args):
 
597
        self.run_bzr(['push', '../' + location] + list(args),
 
598
                     working_dir='local')
 
599
        tree_to = workingtree.WorkingTree.open(location)
 
600
        repo_to = tree_to.branch.repository
 
601
        self.assertTrue(repo_to.has_revision('from-1'))
 
602
        self.assertEqual(tree_to.branch.last_revision_info()[1], 'from-1')
 
603
 
 
604
    def test_push_default(self):
 
605
        tree = self.make_local_branch_and_tree_with_changes()
 
606
        self.assertPushSucceeds('to')
 
607
 
 
608
    def test_push_no_strict_with_changes(self):
 
609
        tree = self.make_local_branch_and_tree_with_changes()
 
610
        self.assertPushSucceeds('to', '--no-strict')
799
611
 
800
612
    def test_push_strict_with_changes(self):
801
 
        self.assertPushFails(['--strict'])
 
613
        tree = self.make_local_branch_and_tree_with_changes()
 
614
        self.assertPushFails('to', '--strict')
 
615
 
 
616
    def test_push_strict_without_changes(self):
 
617
        tree = self.make_local_branch_and_tree()
 
618
        self.assertPushSucceeds('to', '--strict')
802
619
 
803
620
    def test_push_respect_config_var_strict(self):
804
 
        self.set_config_push_strict('true')
805
 
        self.assertPushFails([])
 
621
        tree = self.make_local_branch_and_tree_with_changes()
 
622
        self.set_config_push_strict(tree, 'true')
 
623
        self.assertPushFails('to')
806
624
 
807
625
    def test_push_bogus_config_var_ignored(self):
808
 
        self.set_config_push_strict("I don't want you to be strict")
809
 
        self.assertPushSucceeds([], with_warning=True)
 
626
        tree = self.make_local_branch_and_tree_with_changes()
 
627
        self.set_config_push_strict(tree, "I don't want you to be strict")
 
628
        self.assertPushSucceeds('to')
810
629
 
811
630
    def test_push_no_strict_command_line_override_config(self):
812
 
        self.set_config_push_strict('yES')
813
 
        self.assertPushFails([])
814
 
        self.assertPushSucceeds(['--no-strict'])
 
631
        tree = self.make_local_branch_and_tree_with_changes()
 
632
        self.set_config_push_strict(tree, 'yES')
 
633
        self.assertPushFails('to')
 
634
        self.assertPushSucceeds('to', '--no-strict')
815
635
 
816
636
    def test_push_strict_command_line_override_config(self):
817
 
        self.set_config_push_strict('oFF')
818
 
        self.assertPushFails(['--strict'])
819
 
        self.assertPushSucceeds([])
820
 
 
821
 
 
822
 
class TestPushForeign(tests.TestCaseWithTransport):
823
 
 
824
 
    def setUp(self):
825
 
        super(TestPushForeign, self).setUp()
826
 
        test_foreign.register_dummy_foreign_for_test(self)
827
 
 
828
 
    def make_dummy_builder(self, relpath):
829
 
        builder = self.make_branch_builder(
830
 
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
831
 
        builder.build_snapshot('revid', None,
832
 
            [('add', ('', 'TREE_ROOT', 'directory', None)),
833
 
             ('add', ('foo', 'fooid', 'file', 'bar'))])
834
 
        return builder
835
 
 
836
 
    def test_no_roundtripping(self):
837
 
        target_branch = self.make_dummy_builder('dp').get_branch()
838
 
        source_tree = self.make_branch_and_tree("dc")
839
 
        output, error = self.run_bzr("push -d dc dp", retcode=3)
840
 
        self.assertEquals("", output)
841
 
        self.assertEquals(error, "bzr: ERROR: It is not possible to losslessly"
842
 
            " push to dummy. You may want to use dpush instead.\n")
 
637
        tree = self.make_local_branch_and_tree_with_changes()
 
638
        self.set_config_push_strict(tree, 'oFF')
 
639
        self.assertPushFails('to', '--strict')
 
640
        self.assertPushSucceeds('to')