33
36
def test_view_on_status(self):
34
37
wt = self.make_abc_tree_with_ab_view()
35
38
out, err = self.run_bzr('status')
36
self.assertEqual('Ignoring files outside view. View is a, b\n', err)
37
self.assertEqual('unknown:\n a\n b\n', out)
39
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
40
self.assertEquals('unknown:\n a\n b\n', out)
39
42
def test_view_on_status_selected(self):
40
43
wt = self.make_abc_tree_with_ab_view()
41
44
out, err = self.run_bzr('status a')
42
self.assertEqual('', err)
43
self.assertEqual('unknown:\n a\n', out)
45
self.assertEquals('', err)
46
self.assertEquals('unknown:\n a\n', out)
44
47
out, err = self.run_bzr('status c', retcode=3)
45
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
48
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
46
49
'current view: a, b\n', err)
47
self.assertEqual('', out)
50
self.assertEquals('', out)
49
52
def test_view_on_add(self):
50
53
wt = self.make_abc_tree_with_ab_view()
51
54
out, err = self.run_bzr('add')
52
self.assertEqual('Ignoring files outside view. View is a, b\n', err)
53
self.assertEqual('adding a\nadding b\n', out)
55
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
56
self.assertEquals('adding a\nadding b\n', out)
55
58
def test_view_on_add_selected(self):
56
59
wt = self.make_abc_tree_with_ab_view()
57
60
out, err = self.run_bzr('add a')
58
self.assertEqual('', err)
59
self.assertEqual('adding a\n', out)
61
self.assertEquals('', err)
62
self.assertEquals('adding a\n', out)
60
63
out, err = self.run_bzr('add c', retcode=3)
61
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
64
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
62
65
'current view: a, b\n', err)
63
self.assertEqual('', out)
66
self.assertEquals('', out)
65
68
def test_view_on_diff(self):
66
69
wt = self.make_abc_tree_with_ab_view()
67
70
self.run_bzr('add')
68
71
out, err = self.run_bzr('diff', retcode=1)
69
self.assertEqual('*** Ignoring files outside view. View is a, b\n', err)
72
self.assertEquals('*** Ignoring files outside view. View is a, b\n', err)
71
74
def test_view_on_diff_selected(self):
72
75
wt = self.make_abc_tree_with_ab_view()
73
76
self.run_bzr('add')
74
77
out, err = self.run_bzr('diff a', retcode=1)
75
self.assertEqual('', err)
78
self.assertEquals('', err)
76
79
self.assertStartsWith(out, "=== added file 'a'\n")
77
80
out, err = self.run_bzr('diff c', retcode=3)
78
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
81
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
79
82
'current view: a, b\n', err)
80
self.assertEqual('', out)
83
self.assertEquals('', out)
82
85
def test_view_on_commit(self):
83
86
wt = self.make_abc_tree_with_ab_view()
84
87
self.run_bzr('add')
85
88
out, err = self.run_bzr('commit -m "testing commit"')
86
89
err_lines = err.splitlines()
87
self.assertEqual('Ignoring files outside view. View is a, b', err_lines[0])
90
self.assertEquals('Ignoring files outside view. View is a, b', err_lines[0])
88
91
self.assertStartsWith(err_lines[1], 'Committing to:')
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)
92
self.assertEquals('added a', err_lines[2])
93
self.assertEquals('added b', err_lines[3])
94
self.assertEquals('Committed revision 1.', err_lines[4])
95
self.assertEquals('', out)
94
97
def test_view_on_commit_selected(self):
95
98
wt = self.make_abc_tree_with_ab_view()
97
100
out, err = self.run_bzr('commit -m "file in view" a')
98
101
err_lines = err.splitlines()
99
102
self.assertStartsWith(err_lines[0], 'Committing to:')
100
self.assertEqual('added a', err_lines[1])
101
self.assertEqual('Committed revision 1.', err_lines[2])
102
self.assertEqual('', out)
103
self.assertEquals('added a', err_lines[1])
104
self.assertEquals('Committed revision 1.', err_lines[2])
105
self.assertEquals('', out)
103
106
out, err = self.run_bzr('commit -m "file out of view" c', retcode=3)
104
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
107
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
105
108
'current view: a, b\n', err)
106
self.assertEqual('', out)
109
self.assertEquals('', out)
108
111
def test_view_on_remove_selected(self):
109
112
wt = self.make_abc_tree_with_ab_view()
110
113
self.run_bzr('add')
111
114
out, err = self.run_bzr('remove --keep a')
112
self.assertEqual('removed a\n', err)
113
self.assertEqual('', out)
115
self.assertEquals('removed a\n', err)
116
self.assertEquals('', out)
114
117
out, err = self.run_bzr('remove --keep c', retcode=3)
115
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
118
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
116
119
'current view: a, b\n', err)
117
self.assertEqual('', out)
120
self.assertEquals('', out)
119
122
def test_view_on_revert(self):
120
123
wt = self.make_abc_tree_with_ab_view()
121
124
self.run_bzr('add')
122
125
out, err = self.run_bzr('revert')
123
126
err_lines = err.splitlines()
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)
127
self.assertEquals('Ignoring files outside view. View is a, b', err_lines[0])
128
self.assertEquals('- a', err_lines[1])
129
self.assertEquals('- b', err_lines[2])
130
self.assertEquals('', out)
129
132
def test_view_on_revert_selected(self):
130
133
wt = self.make_abc_tree_with_ab_view()
131
134
self.run_bzr('add')
132
135
out, err = self.run_bzr('revert a')
133
self.assertEqual('- a\n', err)
134
self.assertEqual('', out)
136
self.assertEquals('- a\n', err)
137
self.assertEquals('', out)
135
138
out, err = self.run_bzr('revert c', retcode=3)
136
self.assertEqual('bzr: ERROR: Specified file "c" is outside the '
139
self.assertEquals('bzr: ERROR: Specified file "c" is outside the '
137
140
'current view: a, b\n', err)
138
self.assertEqual('', out)
141
self.assertEquals('', out)
140
143
def test_view_on_ls(self):
141
144
wt = self.make_abc_tree_with_ab_view()
142
145
self.run_bzr('add')
143
146
out, err = self.run_bzr('ls')
144
147
out_lines = out.splitlines()
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])
148
self.assertEquals('Ignoring files outside view. View is a, b\n', err)
149
self.assertEquals('a', out_lines[0])
150
self.assertEquals('b', out_lines[1])
150
153
class TestViewTreeOperations(tests.TestCaseWithTransport):