← 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: Vincent Ladeuil
  • Date: 2017-01-17 15:27:00 UTC
  • mfrom: (6619.2.1 1622039-diff-binaries)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117152700-d0l1z87gbbrlwdix
Merge bugfix for #1622039

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) 2006-2012, 2016 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
65
65
 
66
66
        # If there is no parent location set, :parent isn't mentioned.
67
67
        out = self.run_bzr('push', working_dir='a', retcode=3)
68
 
        self.assertEquals(out,
 
68
        self.assertEqual(out,
69
69
                ('','bzr: ERROR: No push location known or specified.\n'))
70
70
 
71
71
        # If there is a parent location set, the error suggests :parent.
72
72
        tree_a.branch.set_parent(tree_b.branch.base)
73
73
        out = self.run_bzr('push', working_dir='a', retcode=3)
74
 
        self.assertEquals(out,
 
74
        self.assertEqual(out,
75
75
            ('','bzr: ERROR: No push location known or specified. '
76
76
                'To push to the parent branch '
77
77
                '(at %s), use \'bzr push :parent\'.\n' %
100
100
 
101
101
        # test push for failure without push location set
102
102
        out = self.run_bzr('push', working_dir='branch_a', retcode=3)
103
 
        self.assertEquals(out,
 
103
        self.assertEqual(out,
104
104
                ('','bzr: ERROR: No push location known or specified.\n'))
105
105
 
106
106
        # test not remembered if cannot actually push
107
107
        self.run_bzr('push path/which/doesnt/exist',
108
108
                     working_dir='branch_a', retcode=3)
109
109
        out = self.run_bzr('push', working_dir='branch_a', retcode=3)
110
 
        self.assertEquals(
 
110
        self.assertEqual(
111
111
                ('', 'bzr: ERROR: No push location known or specified.\n'),
112
112
                out)
113
113
 
114
114
        # test implicit --remember when no push location set, push fails
115
115
        out = self.run_bzr('push ../branch_b',
116
116
                           working_dir='branch_a', retcode=3)
117
 
        self.assertEquals(out,
 
117
        self.assertEqual(out,
118
118
                ('','bzr: ERROR: These branches have diverged.  '
119
119
                 'See "bzr help diverged-branches" for more information.\n'))
120
 
        self.assertEquals(osutils.abspath(branch_a.get_push_location()),
 
120
        # Refresh the branch as 'push' modified it
 
121
        branch_a = branch_a.bzrdir.open_branch()
 
122
        self.assertEqual(osutils.abspath(branch_a.get_push_location()),
121
123
                          osutils.abspath(branch_b.bzrdir.root_transport.base))
122
124
 
123
125
        # test implicit --remember after resolving previous failure
124
126
        uncommit.uncommit(branch=branch_b, tree=tree_b)
125
127
        transport.delete('branch_b/c')
126
128
        out, err = self.run_bzr('push', working_dir='branch_a')
 
129
        # Refresh the branch as 'push' modified it
 
130
        branch_a = branch_a.bzrdir.open_branch()
127
131
        path = branch_a.get_push_location()
128
132
        self.assertEqual(err,
129
133
                         'Using saved push location: %s\n'
134
138
                         branch_b.bzrdir.root_transport.base)
135
139
        # test explicit --remember
136
140
        self.run_bzr('push ../branch_c --remember', working_dir='branch_a')
137
 
        self.assertEquals(branch_a.get_push_location(),
 
141
        # Refresh the branch as 'push' modified it
 
142
        branch_a = branch_a.bzrdir.open_branch()
 
143
        self.assertEqual(branch_a.get_push_location(),
138
144
                          branch_c.bzrdir.root_transport.base)
139
145
 
140
146
    def test_push_without_tree(self):
176
182
        t.add('file')
177
183
        t.commit('commit 1')
178
184
        self.run_bzr('push -d tree pushed-to')
179
 
        path = t.branch.get_push_location()
 
185
        # Refresh the branch as 'push' modified it and get the push location
 
186
        push_loc = t.branch.bzrdir.open_branch().get_push_location()
180
187
        out, err = self.run_bzr('push', working_dir="tree")
181
188
        self.assertEqual('Using saved push location: %s\n'
182
189
                         'No new revisions or tags to push.\n' %
183
 
                         urlutils.local_path_from_url(path), err)
 
190
                         urlutils.local_path_from_url(push_loc), err)
184
191
        out, err = self.run_bzr('push -q', working_dir="tree")
185
192
        self.assertEqual('', out)
186
193
        self.assertEqual('', err)
285
292
        # being too low. If rpc_count increases, more network roundtrips have
286
293
        # become necessary for this use case. Please do not adjust this number
287
294
        # upwards without agreement from bzr's network support maintainers.
288
 
        self.assertLength(14, self.hpss_calls)
 
295
        self.assertLength(15, self.hpss_calls)
289
296
        self.assertLength(1, self.hpss_connections)
290
297
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
291
298
        remote = branch.Branch.open('public')
445
452
        self.assertTrue(repo_to.has_revision('from-1'))
446
453
        self.assertFalse(repo_to.has_revision('from-2'))
447
454
        self.assertEqual(tree_to.branch.last_revision_info()[1], 'from-1')
 
455
        self.assertFalse(
 
456
            tree_to.changes_from(tree_to.basis_tree()).has_changed())
448
457
 
449
458
        self.run_bzr_error(
450
459
            ['bzr: ERROR: bzr push --revision '
506
515
        trunk_public = self.make_branch('public_trunk', format='1.9')
507
516
        trunk_public.pull(trunk_tree.branch)
508
517
        trunk_public_url = self.get_readonly_url('public_trunk')
509
 
        trunk_tree.branch.set_public_branch(trunk_public_url)
 
518
        br = trunk_tree.branch
 
519
        br.set_public_branch(trunk_public_url)
510
520
        # now we do a stacked push, which should determine the public location
511
521
        # for us.
512
522
        out, err = self.run_bzr(['push', '--stacked',
605
615
        self.assertEqual('', out)
606
616
        self.assertEqual('Created new branch.\n', err)
607
617
 
 
618
    def test_overwrite_tags(self):
 
619
        """--overwrite-tags only overwrites tags, not revisions."""
 
620
        from_tree = self.make_branch_and_tree('from')
 
621
        from_tree.branch.tags.set_tag("mytag", "somerevid")
 
622
        to_tree = self.make_branch_and_tree('to')
 
623
        to_tree.branch.tags.set_tag("mytag", "anotherrevid")
 
624
        revid1 = to_tree.commit('my commit')
 
625
        out = self.run_bzr(['push', '-d', 'from', 'to'])
 
626
        self.assertEqual(out,
 
627
            ('Conflicting tags:\n    mytag\n', 'No new revisions to push.\n'))
 
628
        out = self.run_bzr(['push', '-d', 'from', '--overwrite-tags', 'to'])
 
629
        self.assertEqual(out, ('', '1 tag updated.\n'))
 
630
        self.assertEqual(to_tree.branch.tags.lookup_tag('mytag'),
 
631
                          'somerevid')
 
632
        self.assertEqual(to_tree.branch.last_revision(), revid1)
 
633
 
608
634
 
609
635
class RedirectingMemoryTransport(memory.MemoryTransport):
610
636
 
657
683
class TestPushRedirect(tests.TestCaseWithTransport):
658
684
 
659
685
    def setUp(self):
660
 
        tests.TestCaseWithTransport.setUp(self)
 
686
        super(TestPushRedirect, self).setUp()
661
687
        self.memory_server = RedirectingMemoryServer()
662
688
        self.start_server(self.memory_server)
663
689
        # Make the branch and tree that we'll be pushing.
703
729
        self.tree.commit('modify file', rev_id='modified')
704
730
 
705
731
    def set_config_push_strict(self, value):
706
 
        # set config var (any of bazaar.conf, locations.conf, branch.conf
707
 
        # should do)
708
 
        conf = self.tree.branch.get_config_stack()
709
 
        conf.set('push_strict', value)
 
732
        br = branch.Branch.open('local')
 
733
        br.get_config_stack().set('push_strict', value)
710
734
 
711
735
    _default_command = ['push', '../to']
712
736
    _default_wd = 'local'
868
892
        target_branch = self.make_dummy_builder('dp').get_branch()
869
893
        source_tree = self.make_branch_and_tree("dc")
870
894
        output, error = self.run_bzr("push -d dc dp", retcode=3)
871
 
        self.assertEquals("", output)
872
 
        self.assertEquals(error, "bzr: ERROR: It is not possible to losslessly"
 
895
        self.assertEqual("", output)
 
896
        self.assertEqual(error, "bzr: ERROR: It is not possible to losslessly"
873
897
            " push to dummy. You may want to use dpush instead.\n")
874
898
 
875
899
 
895
919
            2>All changes applied successfully.
896
920
            2>Pushed up to revision 1.
897
921
            """)
 
922
 
 
923
    def test_push_with_revspec(self):
 
924
        self.run_script("""
 
925
            $ bzr init-repo .
 
926
            Shared repository with trees (format: 2a)
 
927
            Location:
 
928
              shared repository: .
 
929
            $ bzr init trunk
 
930
            Created a repository tree (format: 2a)
 
931
            Using shared repository...
 
932
            $ cd trunk
 
933
            $ bzr commit -m 'first rev' --unchanged
 
934
            2>Committing to:...trunk/
 
935
            2>Committed revision 1.
 
936
            $ echo foo > file
 
937
            $ bzr add
 
938
            adding file
 
939
            $ bzr commit -m 'we need some foo'
 
940
            2>Committing to:...trunk/
 
941
            2>added file
 
942
            2>Committed revision 2.
 
943
            $ bzr push -r 1 ../other
 
944
            2>Created new branch.
 
945
            $ bzr st ../other # checking that file is not created (#484516)
 
946
            """)