1
# Copyright (C) 2005, 2008 Canonical Ltd
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.
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.
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
17
"""Black-box tests for bzr missing."""
1
"""Black-box tests for bzr missing.
21
from bzrlib import osutils
23
6
from bzrlib.branch import Branch
24
from bzrlib.tests import TestCaseWithTransport
27
class TestMissing(TestCaseWithTransport):
29
def assertMessages(self, out, must_have=(), must_not_have=()):
30
"""Check if commit messages are in or not in the output"""
32
self.assertContainsRe(out, r'\nmessage:\n %s\n' % m)
33
for m in must_not_have:
34
self.assertNotContainsRe(out, r'\nmessage:\n %s\n' % m)
36
def test_missing_quiet(self):
37
# <https://bugs.launchpad.net/bzr/+bug/284748>
38
# create a source branch
40
# XXX: This still needs a test that missing is quiet when there are
42
a_tree = self.make_branch_and_tree('.')
43
self.build_tree_contents([('a', 'initial\n')])
45
a_tree.commit(message='initial')
47
out, err = self.run_bzr('missing -q .')
48
self.assertEqual('', out)
49
self.assertEqual('', err)
7
from bzrlib.tests import TestCaseInTempDir
10
class TestMissing(TestCaseInTempDir):
51
12
def test_missing(self):
52
13
missing = "You are missing 1 revision(s):"
54
15
# create a source branch
55
a_tree = self.make_branch_and_tree('a')
56
self.build_tree_contents([('a/a', 'initial\n')])
58
a_tree.commit(message='initial')
19
open('a', 'wb').write('initial\n')
21
self.capture('commit -m inital')
60
23
# clone and add a differing revision
61
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
62
self.build_tree_contents([('b/a', 'initial\nmore\n')])
63
b_tree.commit(message='more')
24
self.capture('branch . ../b')
26
open('a', 'ab').write('more\n')
27
self.capture('commit -m more')
65
29
# run missing in a against b
66
# this should not require missing to take out a write lock on a
31
# this should not require missing to take out a write lock on a
67
32
# or b. So we take a write lock on both to test that at the same
68
33
# time. This may let the test pass while the default branch is an
69
34
# os-locking branch, but it will trigger failures with lockdir based
71
a_branch = a_tree.branch
73
b_branch = b_tree.branch
76
out,err = self.run_bzr('missing ../b', retcode=1)
36
branch_a = Branch.open('.')
38
branch_b = Branch.open('../b')
40
out,err = self.run_bzr('missing', '../b', retcode=1)
77
41
lines = out.splitlines()
78
42
# we're missing the extra revision here
79
43
self.assertEqual(missing, lines[0])
83
47
# we do not expect any error output.
84
48
self.assertEqual('', err)
85
49
# unlock the branches for the rest of the test
89
53
# get extra revision from b
90
a_tree.merge_from_branch(b_branch)
91
a_tree.commit(message='merge')
54
self.capture('merge ../b')
55
self.capture('commit -m merge')
93
57
# compare again, but now we have the 'merge' commit extra
94
lines = self.run_bzr('missing ../b', retcode=1)[0].splitlines()
58
lines = self.capture('missing ../b', retcode=1).splitlines()
95
59
self.assertEqual("You have 1 extra revision(s):", lines[0])
96
60
self.assertEqual(8, len(lines))
97
lines2 = self.run_bzr('missing ../b --mine-only', retcode=1)[0]
61
lines2 = self.capture('missing ../b --mine-only', retcode=1)
98
62
lines2 = lines2.splitlines()
99
63
self.assertEqual(lines, lines2)
100
lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
101
self.assertEqualDiff('Other branch is up to date.\n', lines3)
64
lines3 = self.capture('missing ../b --theirs-only', retcode=1)
65
lines3 = lines3.splitlines()
66
self.assertEqual(0, len(lines3))
103
# relative to a, missing the 'merge' commit
68
# relative to a, missing the 'merge' commit
105
lines = self.run_bzr('missing ../a', retcode=1)[0].splitlines()
70
lines = self.capture('missing ../a', retcode=1).splitlines()
106
71
self.assertEqual(missing, lines[0])
107
72
self.assertEqual(8, len(lines))
108
lines2 = self.run_bzr('missing ../a --theirs-only', retcode=1)[0]
73
lines2 = self.capture('missing ../a --theirs-only', retcode=1)
109
74
lines2 = lines2.splitlines()
110
75
self.assertEqual(lines, lines2)
111
lines3 = self.run_bzr('missing ../a --mine-only', retcode=0)[0]
112
self.assertEqualDiff('This branch is up to date.\n', lines3)
113
lines4 = self.run_bzr('missing ../a --short', retcode=1)[0]
76
lines3 = self.capture('missing ../a --mine-only', retcode=1)
77
lines3 = lines3.splitlines()
78
self.assertEqual(0, len(lines3))
79
lines4 = self.capture('missing ../a --short', retcode=1)
114
80
lines4 = lines4.splitlines()
115
81
self.assertEqual(4, len(lines4))
116
lines5 = self.run_bzr('missing ../a --line', retcode=1)[0]
82
lines5 = self.capture('missing ../a --line', retcode=1)
117
83
lines5 = lines5.splitlines()
118
84
self.assertEqual(2, len(lines5))
119
lines6 = self.run_bzr('missing ../a --reverse', retcode=1)[0]
85
lines6 = self.capture('missing ../a --reverse', retcode=1)
120
86
lines6 = lines6.splitlines()
121
87
self.assertEqual(lines6, lines)
122
lines7 = self.run_bzr('missing ../a --show-ids', retcode=1)[0]
88
lines7 = self.capture('missing ../a --show-ids', retcode=1)
123
89
lines7 = lines7.splitlines()
124
90
self.assertEqual(11, len(lines7))
125
lines8 = self.run_bzr('missing ../a --verbose', retcode=1)[0]
91
lines8 = self.capture('missing ../a --verbose', retcode=1)
126
92
lines8 = lines8.splitlines()
127
93
self.assertEqual("modified:", lines8[-2])
128
94
self.assertEqual(" a", lines8[-1])
131
self.assertEqualDiff('Other branch is up to date.\n',
132
self.run_bzr('missing ../b --theirs-only')[0])
134
97
# after a pull we're back on track
135
b_tree.pull(a_branch)
136
self.assertEqualDiff("Branches are up to date.\n",
137
self.run_bzr('missing ../b')[0])
139
self.assertEqualDiff('Branches are up to date.\n',
140
self.run_bzr('missing ../a')[0])
141
# If you supply mine or theirs you only know one side is up to date
142
self.assertEqualDiff('This branch is up to date.\n',
143
self.run_bzr('missing ../a --mine-only')[0])
144
self.assertEqualDiff('Other branch is up to date.\n',
145
self.run_bzr('missing ../a --theirs-only')[0])
147
def test_missing_filtered(self):
148
# create a source branch
149
a_tree = self.make_branch_and_tree('a')
150
self.build_tree_contents([('a/a', 'initial\n')])
152
a_tree.commit(message='r1')
153
# clone and add differing revisions
154
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
156
for i in range(2, 6):
157
a_tree.commit(message='a%d' % i)
158
b_tree.commit(message='b%d' % i)
162
out,err = self.run_bzr('missing ../b --my-revision 3', retcode=1)
163
self.assertMessages(out, ('a3', 'b2', 'b3', 'b4', 'b5'), ('a2', 'a4'))
165
out,err = self.run_bzr('missing ../b --my-revision 3..4', retcode=1)
166
self.assertMessages(out, ('a3', 'a4'), ('a2', 'a5'))
169
out,err = self.run_bzr('missing ../b -r 3', retcode=1)
170
self.assertMessages(out, ('a2', 'a3', 'a4', 'a5', 'b3'), ('b2', 'b4'))
172
out,err = self.run_bzr('missing ../b -r 3..4', retcode=1)
173
self.assertMessages(out, ('b3', 'b4'), ('b2', 'b5'))
176
out,err = self.run_bzr('missing ../b --my-revision 3..4 -r 3..4',
178
self.assertMessages(out, ('a3', 'a4', 'b3', 'b4'),
179
('a2', 'a5', 'b2', 'b5'))
181
def test_missing_check_last_location(self):
182
# check that last location shown as filepath not file URL
184
# create a source branch
185
wt = self.make_branch_and_tree('a')
187
self.build_tree(['a/foo'])
192
location = osutils.getcwd() + '/'
195
b.bzrdir.sprout('../b')
197
# check last location
198
lines, err = self.run_bzr('missing', working_dir='../b')
199
self.assertEquals('Using saved parent location: %s\n'
200
'Branches are up to date.\n' % location,
202
self.assertEquals('', err)
99
self.assertEqual("Branches are up to date.\n",
100
self.capture('missing ../a'))
added
removed
bzrlib/tests/blackbox/test_missing.py
