1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests that an enabled view is reported and impacts expected commands."""
import os
from bzrlib import (
bzrdir,
osutils,
tests,
)
class TestViewFileOperations(tests.TestCaseWithTransport):
def make_abc_tree_with_ab_view(self):
wt = self.make_branch_and_tree('.')
self.build_tree(['a', 'b', 'c'])
wt.views.set_view('my', ['a', 'b'])
return wt
def test_view_on_status(self):
wt = self.make_abc_tree_with_ab_view()
out, err = self.run_bzr('status')
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
self.assertEquals('unknown:\n a\n b\n', out)
def test_view_on_status_selected(self):
wt = self.make_abc_tree_with_ab_view()
out, err = self.run_bzr('status a')
self.assertEquals('', err)
self.assertEquals('unknown:\n a\n', out)
out, err = self.run_bzr('status c', retcode=3)
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
'current view: a, b\n', err)
self.assertEquals('', out)
def test_view_on_add(self):
wt = self.make_abc_tree_with_ab_view()
out, err = self.run_bzr('add')
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
self.assertEquals('adding a\nadding b\n', out)
def test_view_on_add_selected(self):
wt = self.make_abc_tree_with_ab_view()
out, err = self.run_bzr('add a')
self.assertEquals('', err)
self.assertEquals('adding a\n', out)
out, err = self.run_bzr('add c', retcode=3)
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
'current view: a, b\n', err)
self.assertEquals('', out)
def test_view_on_diff(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('diff', retcode=1)
self.assertEquals('*** Ignoring files outside view. View is a, b\n', err)
def test_view_on_diff_selected(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('diff a', retcode=1)
self.assertEquals('', err)
self.assertStartsWith(out, "=== added file 'a'\n")
out, err = self.run_bzr('diff c', retcode=3)
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
'current view: a, b\n', err)
self.assertEquals('', out)
def test_view_on_commit(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('commit -m "testing commit"')
err_lines = err.splitlines()
self.assertEquals('Ignoring files outside view. View is a, b', err_lines[0])
self.assertStartsWith(err_lines[1], 'Committing to:')
self.assertEquals('added a', err_lines[2])
self.assertEquals('added b', err_lines[3])
self.assertEquals('Committed revision 1.', err_lines[4])
self.assertEquals('', out)
def test_view_on_commit_selected(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('commit -m "file in view" a')
err_lines = err.splitlines()
self.assertStartsWith(err_lines[0], 'Committing to:')
self.assertEquals('added a', err_lines[1])
self.assertEquals('Committed revision 1.', err_lines[2])
self.assertEquals('', out)
out, err = self.run_bzr('commit -m "file out of view" c', retcode=3)
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
'current view: a, b\n', err)
self.assertEquals('', out)
def test_view_on_remove_selected(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('remove --keep a')
self.assertEquals('removed a\n', err)
self.assertEquals('', out)
out, err = self.run_bzr('remove --keep c', retcode=3)
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
'current view: a, b\n', err)
self.assertEquals('', out)
def test_view_on_revert(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('revert')
err_lines = err.splitlines()
self.assertEquals('Ignoring files outside view. View is a, b', err_lines[0])
self.assertEquals('- a', err_lines[1])
self.assertEquals('- b', err_lines[2])
self.assertEquals('', out)
def test_view_on_revert_selected(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('revert a')
self.assertEquals('- a\n', err)
self.assertEquals('', out)
out, err = self.run_bzr('revert c', retcode=3)
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
'current view: a, b\n', err)
self.assertEquals('', out)
def test_view_on_ls(self):
wt = self.make_abc_tree_with_ab_view()
self.run_bzr('add')
out, err = self.run_bzr('ls')
out_lines = out.splitlines()
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
self.assertEquals('a', out_lines[0])
self.assertEquals('b', out_lines[1])
class TestViewTreeOperations(tests.TestCaseWithTransport):
def make_abc_tree_and_clone_with_ab_view(self):
# Build the first tree
wt1 = self.make_branch_and_tree('tree_1')
self.build_tree(['tree_1/a', 'tree_1/b', 'tree_1/c'])
wt1.add(['a', 'b', 'c'])
wt1.commit("adding a b c")
# Build the second tree and give it a view
wt2 = wt1.bzrdir.sprout('tree_2').open_workingtree()
wt2.views.set_view('my', ['a', 'b'])
# Commit a change to the first tree
self.build_tree_contents([
('tree_1/a', 'changed a\n'),
('tree_1/c', 'changed c\n'),
])
wt1.commit("changing a c")
return wt1, wt2
def test_view_on_pull(self):
tree_1, tree_2 = self.make_abc_tree_and_clone_with_ab_view()
out, err = self.run_bzr('pull -d tree_2 tree_1')
self.assertEqualDiff(
"Operating on whole tree but only reporting on 'my' view.\n"
" M a\n"
"All changes applied successfully.\n", err)
self.assertEqualDiff("Now on revision 2.\n", out)
def test_view_on_update(self):
tree_1, tree_2 = self.make_abc_tree_and_clone_with_ab_view()
self.run_bzr("bind ../tree_1", working_dir='tree_2')
out, err = self.run_bzr('update', working_dir='tree_2')
self.assertEqualDiff(
"""Operating on whole tree but only reporting on 'my' view.
M a
All changes applied successfully.
Updated to revision 2 of branch %s
""" % osutils.pathjoin(self.test_dir, 'tree_1'),
err)
self.assertEqual("", out)
def test_view_on_merge(self):
tree_1, tree_2 = self.make_abc_tree_and_clone_with_ab_view()
out, err = self.run_bzr('merge -d tree_2 tree_1')
self.assertEqualDiff(
"Operating on whole tree but only reporting on 'my' view.\n"
" M a\n"
"All changes applied successfully.\n", err)
self.assertEqual("", out)
|