← 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

  • Committer: mbp at sourcefrog
  • Date: 2005-03-24 00:44:18 UTC
  • Revision ID: mbp@sourcefrog.net-20050324004418-b4a050f656c07f5f
show space usage for various stores in the info command

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
 
    )
26
 
from bzrlib.bzrdir import (
27
 
    BzrDirFormat,
28
 
    )
29
 
from bzrlib.foreign import (
30
 
    ForeignBranch,
31
 
    ForeignRepository,
32
 
    )
33
 
from bzrlib.repository import (
34
 
    Repository,
35
 
    )
36
 
from bzrlib.tests.blackbox import (
37
 
    ExternalBase,
38
 
    )
39
 
from bzrlib.tests.test_foreign import (
40
 
    DummyForeignVcsDirFormat,
41
 
    )
42
 
 
43
 
 
44
 
class TestDpush(ExternalBase):
45
 
 
46
 
    def setUp(self):
47
 
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
48
 
        self.addCleanup(self.unregister_format)
49
 
        super(TestDpush, self).setUp()
50
 
 
51
 
    def unregister_format(self):
52
 
        try:
53
 
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
54
 
        except ValueError:
55
 
            pass
56
 
 
57
 
    def make_dummy_builder(self, relpath):
58
 
        builder = self.make_branch_builder(relpath, 
59
 
                format=DummyForeignVcsDirFormat())
60
 
        builder.build_snapshot('revid', None, 
61
 
            [('add', ('', 'TREE_ROOT', 'directory', None)),
62
 
             ('add', ('foo', 'fooid', 'file', 'bar'))])
63
 
        return builder
64
 
 
65
 
    def test_dpush_native(self):
66
 
        target_tree = self.make_branch_and_tree("dp")
67
 
        source_tree = self.make_branch_and_tree("dc")
68
 
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
69
 
        self.assertEquals("", output)
70
 
        self.assertContainsRe(error, 'not a foreign branch, use regular push')
71
 
 
72
 
    def test_dpush(self):
73
 
        branch = self.make_dummy_builder('d').get_branch()
74
 
 
75
 
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
76
 
        self.build_tree(("dc/foo", "blaaaa"))
77
 
        dc.open_workingtree().commit('msg')
78
 
 
79
 
        self.check_output("", "dpush -d dc d")
80
 
        self.check_output("", "status dc")
81
 
 
82
 
    def test_dpush_new(self):
83
 
        branch = self.make_dummy_builder('d').get_branch()
84
 
 
85
 
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
86
 
        self.build_tree_contents([("dc/foofile", "blaaaa")])
87
 
        dc_tree = dc.open_workingtree()
88
 
        dc_tree.add("foofile")
89
 
        dc_tree.commit("msg")
90
 
 
91
 
        self.check_output("", "dpush -d dc d")
92
 
        self.check_output("2\n", "revno dc")
93
 
        self.check_output("", "status dc")
94
 
 
95
 
    def test_dpush_wt_diff(self):
96
 
        branch = self.make_dummy_builder('d').get_branch()
97
 
 
98
 
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
99
 
        self.build_tree_contents([("dc/foofile", "blaaaa")])
100
 
        dc_tree = dc.open_workingtree()
101
 
        dc_tree.add("foofile")
102
 
        newrevid = dc_tree.commit('msg')
103
 
 
104
 
        self.build_tree_contents([("dc/foofile", "blaaaal")])
105
 
        self.check_output("", "dpush -d dc d")
106
 
        self.assertFileEqual("blaaaal", "dc/foofile")
107
 
        self.check_output('modified:\n  foofile\n', "status dc")
108
 
 
109
 
    def test_diverged(self):
110
 
        builder = self.make_dummy_builder('d')
111
 
 
112
 
        branch = builder.get_branch()
113
 
 
114
 
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
115
 
        dc_tree = dc.open_workingtree()
116
 
 
117
 
        self.build_tree_contents([("dc/foo", "bar")])
118
 
        dc_tree.commit('msg1')
119
 
 
120
 
        builder.build_snapshot('revid2', None,
121
 
          [('modify', ('fooid', 'blie'))])
122
 
 
123
 
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
124
 
        self.assertEquals(output, "")
125
 
        self.assertContainsRe(error, "have diverged")