← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
 
1
# Copyright (C) 2005, 2007, 2008, 2009 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
"""Black-box tests for bzr dpush."""
 
19
 
 
20
 
 
21
import os
 
22
 
 
23
from bzrlib.branch import (
 
24
    Branch,
 
25
    InterBranch,
 
26
    )
 
27
from bzrlib.bzrdir import (
 
28
    BzrDirFormat,
 
29
    )
 
30
from bzrlib.foreign import (
 
31
    ForeignBranch,
 
32
    ForeignRepository,
 
33
    )
 
34
from bzrlib.repository import (
 
35
    Repository,
 
36
    )
 
37
from bzrlib.tests.blackbox import (
 
38
    ExternalBase,
 
39
    )
 
40
from bzrlib.tests.test_foreign import (
 
41
    DummyForeignVcsDirFormat,
 
42
    InterToDummyVcsBranch,
 
43
    )
 
44
 
 
45
 
 
46
class TestDpush(ExternalBase):
 
47
 
 
48
    def setUp(self):
 
49
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
50
        InterBranch.register_optimiser(InterToDummyVcsBranch)
 
51
        self.addCleanup(self.unregister_format)
 
52
        super(TestDpush, self).setUp()
 
53
 
 
54
    def unregister_format(self):
 
55
        try:
 
56
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
57
        except ValueError:
 
58
            pass
 
59
        InterBranch.unregister_optimiser(InterToDummyVcsBranch)
 
60
 
 
61
    def make_dummy_builder(self, relpath):
 
62
        builder = self.make_branch_builder(relpath, 
 
63
                format=DummyForeignVcsDirFormat())
 
64
        builder.build_snapshot('revid', None, 
 
65
            [('add', ('', 'TREE_ROOT', 'directory', None)),
 
66
             ('add', ('foo', 'fooid', 'file', 'bar'))])
 
67
        return builder
 
68
 
 
69
    def test_dpush_native(self):
 
70
        target_tree = self.make_branch_and_tree("dp")
 
71
        source_tree = self.make_branch_and_tree("dc")
 
72
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
 
73
        self.assertEquals("", output)
 
74
        self.assertContainsRe(error, 'not a foreign branch, use regular push')
 
75
 
 
76
    def test_dpush(self):
 
77
        branch = self.make_dummy_builder('d').get_branch()
 
78
 
 
79
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
 
80
        self.build_tree(("dc/foo", "blaaaa"))
 
81
        dc.open_workingtree().commit('msg')
 
82
 
 
83
        self.check_output("", "dpush -d dc d")
 
84
        self.check_output("", "status dc")
 
85
 
 
86
    def test_dpush_new(self):
 
87
        branch = self.make_dummy_builder('d').get_branch()
 
88
 
 
89
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
 
90
        self.build_tree_contents([("dc/foofile", "blaaaa")])
 
91
        dc_tree = dc.open_workingtree()
 
92
        dc_tree.add("foofile")
 
93
        dc_tree.commit("msg")
 
94
 
 
95
        self.check_output("", "dpush -d dc d")
 
96
        self.check_output("2\n", "revno dc")
 
97
        self.check_output("", "status dc")
 
98
 
 
99
    def test_dpush_wt_diff(self):
 
100
        branch = self.make_dummy_builder('d').get_branch()
 
101
 
 
102
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
 
103
        self.build_tree_contents([("dc/foofile", "blaaaa")])
 
104
        dc_tree = dc.open_workingtree()
 
105
        dc_tree.add("foofile")
 
106
        newrevid = dc_tree.commit('msg')
 
107
 
 
108
        self.build_tree_contents([("dc/foofile", "blaaaal")])
 
109
        self.check_output("", "dpush -d dc d")
 
110
        self.assertFileEqual("blaaaal", "dc/foofile")
 
111
        self.check_output('modified:\n  foofile\n', "status dc")
 
112
 
 
113
    def test_diverged(self):
 
114
        builder = self.make_dummy_builder('d')
 
115
 
 
116
        branch = builder.get_branch()
 
117
 
 
118
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
 
119
        dc_tree = dc.open_workingtree()
 
120
 
 
121
        self.build_tree_contents([("dc/foo", "bar")])
 
122
        dc_tree.commit('msg1')
 
123
 
 
124
        builder.build_snapshot('revid2', None,
 
125
          [('modify', ('fooid', 'blie'))])
 
126
 
 
127
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
 
128
        self.assertEquals(output, "")
 
129
        self.assertContainsRe(error, "have diverged")