39
33
def test_view_on_status(self):
40
34
wt = self.make_abc_tree_with_ab_view()
41
35
out, err = self.run_bzr('status')
42
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
43
self.assertEquals('unknown:\n a\n b\n', out)
36
self.assertEqual('Ignoring files outside view. View is a, b\n', err)
37
self.assertEqual('unknown:\n a\n b\n', out)
45
39
def test_view_on_status_selected(self):
46
40
wt = self.make_abc_tree_with_ab_view()
47
41
out, err = self.run_bzr('status a')
48
self.assertEquals('', err)
49
self.assertEquals('unknown:\n a\n', out)
42
self.assertEqual('', err)
43
self.assertEqual('unknown:\n a\n', out)
50
44
out, err = self.run_bzr('status c', retcode=3)
51
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
45
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
52
46
'current view: a, b\n', err)
53
self.assertEquals('', out)
47
self.assertEqual('', out)
55
49
def test_view_on_add(self):
56
50
wt = self.make_abc_tree_with_ab_view()
57
51
out, err = self.run_bzr('add')
58
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
59
self.assertEquals('adding a\nadding b\n', out)
52
self.assertEqual('Ignoring files outside view. View is a, b\n', err)
53
self.assertEqual('adding a\nadding b\n', out)
61
55
def test_view_on_add_selected(self):
62
56
wt = self.make_abc_tree_with_ab_view()
63
57
out, err = self.run_bzr('add a')
64
self.assertEquals('', err)
65
self.assertEquals('adding a\n', out)
58
self.assertEqual('', err)
59
self.assertEqual('adding a\n', out)
66
60
out, err = self.run_bzr('add c', retcode=3)
67
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
61
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
68
62
'current view: a, b\n', err)
69
self.assertEquals('', out)
63
self.assertEqual('', out)
71
65
def test_view_on_diff(self):
72
66
wt = self.make_abc_tree_with_ab_view()
73
67
self.run_bzr('add')
74
68
out, err = self.run_bzr('diff', retcode=1)
75
self.assertEquals('*** Ignoring files outside view. View is a, b\n', err)
69
self.assertEqual('*** Ignoring files outside view. View is a, b\n', err)
77
71
def test_view_on_diff_selected(self):
78
72
wt = self.make_abc_tree_with_ab_view()
79
73
self.run_bzr('add')
80
74
out, err = self.run_bzr('diff a', retcode=1)
81
self.assertEquals('', err)
75
self.assertEqual('', err)
82
76
self.assertStartsWith(out, "=== added file 'a'\n")
83
77
out, err = self.run_bzr('diff c', retcode=3)
84
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
78
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
85
79
'current view: a, b\n', err)
86
self.assertEquals('', out)
80
self.assertEqual('', out)
88
82
def test_view_on_commit(self):
89
83
wt = self.make_abc_tree_with_ab_view()
90
84
self.run_bzr('add')
91
85
out, err = self.run_bzr('commit -m "testing commit"')
92
86
err_lines = err.splitlines()
93
self.assertEquals('Ignoring files outside view. View is a, b', err_lines[0])
87
self.assertEqual('Ignoring files outside view. View is a, b', err_lines[0])
94
88
self.assertStartsWith(err_lines[1], 'Committing to:')
95
self.assertEquals('added a', err_lines[2])
96
self.assertEquals('added b', err_lines[3])
97
self.assertEquals('Committed revision 1.', err_lines[4])
98
self.assertEquals('', out)
89
self.assertEqual('added a', err_lines[2])
90
self.assertEqual('added b', err_lines[3])
91
self.assertEqual('Committed revision 1.', err_lines[4])
92
self.assertEqual('', out)
100
94
def test_view_on_commit_selected(self):
101
95
wt = self.make_abc_tree_with_ab_view()
103
97
out, err = self.run_bzr('commit -m "file in view" a')
104
98
err_lines = err.splitlines()
105
99
self.assertStartsWith(err_lines[0], 'Committing to:')
106
self.assertEquals('added a', err_lines[1])
107
self.assertEquals('Committed revision 1.', err_lines[2])
108
self.assertEquals('', out)
100
self.assertEqual('added a', err_lines[1])
101
self.assertEqual('Committed revision 1.', err_lines[2])
102
self.assertEqual('', out)
109
103
out, err = self.run_bzr('commit -m "file out of view" c', retcode=3)
110
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
104
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
111
105
'current view: a, b\n', err)
112
self.assertEquals('', out)
106
self.assertEqual('', out)
114
108
def test_view_on_remove_selected(self):
115
109
wt = self.make_abc_tree_with_ab_view()
116
110
self.run_bzr('add')
117
111
out, err = self.run_bzr('remove --keep a')
118
self.assertEquals('removed a\n', err)
119
self.assertEquals('', out)
112
self.assertEqual('removed a\n', err)
113
self.assertEqual('', out)
120
114
out, err = self.run_bzr('remove --keep c', retcode=3)
121
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
115
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
122
116
'current view: a, b\n', err)
123
self.assertEquals('', out)
117
self.assertEqual('', out)
125
119
def test_view_on_revert(self):
126
120
wt = self.make_abc_tree_with_ab_view()
127
121
self.run_bzr('add')
128
122
out, err = self.run_bzr('revert')
129
123
err_lines = err.splitlines()
130
self.assertEquals('Ignoring files outside view. View is a, b', err_lines[0])
131
self.assertEquals('- a', err_lines[1])
132
self.assertEquals('- b', err_lines[2])
133
self.assertEquals('', out)
124
self.assertEqual('Ignoring files outside view. View is a, b', err_lines[0])
125
self.assertEqual('- a', err_lines[1])
126
self.assertEqual('- b', err_lines[2])
127
self.assertEqual('', out)
135
129
def test_view_on_revert_selected(self):
136
130
wt = self.make_abc_tree_with_ab_view()
137
131
self.run_bzr('add')
138
132
out, err = self.run_bzr('revert a')
139
self.assertEquals('- a\n', err)
140
self.assertEquals('', out)
133
self.assertEqual('- a\n', err)
134
self.assertEqual('', out)
141
135
out, err = self.run_bzr('revert c', retcode=3)
142
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
136
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
143
137
'current view: a, b\n', err)
144
self.assertEquals('', out)
138
self.assertEqual('', out)
146
140
def test_view_on_ls(self):
147
141
wt = self.make_abc_tree_with_ab_view()
148
142
self.run_bzr('add')
149
143
out, err = self.run_bzr('ls')
150
144
out_lines = out.splitlines()
151
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
152
self.assertEquals('a', out_lines[0])
153
self.assertEquals('b', out_lines[1])
145
self.assertEqual('Ignoring files outside view. View is a, b\n', err)
146
self.assertEqual('a', out_lines[0])
147
self.assertEqual('b', out_lines[1])
156
150
class TestViewTreeOperations(tests.TestCaseWithTransport):
158
152
def make_abc_tree_and_clone_with_ab_view(self):
159
# we need to use a specific format because the default format
160
# doesn't support views yet
161
format = bzrdir.format_registry.make_bzrdir('development6-rich-root')
162
153
# Build the first tree
163
wt1 = self.make_branch_and_tree('tree_1', format=format)
154
wt1 = self.make_branch_and_tree('tree_1')
164
155
self.build_tree(['tree_1/a', 'tree_1/b', 'tree_1/c'])
165
156
wt1.add(['a', 'b', 'c'])
166
157
wt1.commit("adding a b c")