bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.40.11
by Parth Malwankar
added basic test |
1 |
# Copyright (C) 2010 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
import os |
|
18 |
import re |
|
19 |
||
|
0.40.46
by Parth Malwankar
--levels=0 now implicitly prints revnos. added test for --levels=0. |
20 |
from bzrlib import tests, osutils |
|
0.40.11
by Parth Malwankar
added basic test |
21 |
|
22 |
class TestGrep(tests.TestCaseWithTransport): |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
23 |
def _str_contains(self, base, pattern, flags=re.MULTILINE|re.DOTALL): |
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
24 |
res = re.findall(pattern, base, flags) |
25 |
return res != [] |
|
|
0.40.11
by Parth Malwankar
added basic test |
26 |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
27 |
def _mk_file(self, path, line_prefix, total_lines, versioned): |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
28 |
text='' |
29 |
for i in range(total_lines): |
|
30 |
text += line_prefix + str(i+1) + "\n" |
|
31 |
||
|
0.40.12
by Parth Malwankar
added test for versioned file |
32 |
open(path, 'w').write(text) |
33 |
if versioned: |
|
34 |
self.run_bzr(['add', path]) |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
35 |
self.run_bzr(['ci', '-m', '"' + path + '"']) |
|
0.40.12
by Parth Malwankar
added test for versioned file |
36 |
|
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
37 |
def _update_file(self, path, text): |
38 |
"""append text to file 'path' and check it in""" |
|
39 |
open(path, 'a').write(text) |
|
40 |
self.run_bzr(['ci', '-m', '"' + path + '"']) |
|
41 |
||
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
42 |
def _mk_unknown_file(self, path, line_prefix='line', total_lines=10): |
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
43 |
self._mk_file(path, line_prefix, total_lines, versioned=False) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
44 |
|
45 |
def _mk_versioned_file(self, path, line_prefix='line', total_lines=10): |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
46 |
self._mk_file(path, line_prefix, total_lines, versioned=True) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
47 |
|
48 |
def _mk_dir(self, path, versioned): |
|
49 |
os.mkdir(path) |
|
50 |
if versioned: |
|
51 |
self.run_bzr(['add', path]) |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
52 |
self.run_bzr(['ci', '-m', '"' + path + '"']) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
53 |
|
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
54 |
def _mk_unknown_dir(self, path): |
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
55 |
self._mk_dir(path, versioned=False) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
56 |
|
57 |
def _mk_versioned_dir(self, path): |
|
58 |
self._mk_dir(path, versioned=True) |
|
59 |
||
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
60 |
def test_basic_unknown_file(self): |
|
0.40.16
by Parth Malwankar
tree.get_file_lines is now used to get lines of text |
61 |
"""search for pattern in specfic file. should issue warning.""" |
|
0.40.11
by Parth Malwankar
added basic test |
62 |
wd = 'foobar0' |
63 |
self.make_branch_and_tree(wd) |
|
64 |
os.chdir(wd) |
|
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
65 |
self._mk_versioned_file('filex.txt') # force rev to revno:1 and not revno:0 |
66 |
self._mk_unknown_file('file0.txt') |
|
|
0.40.11
by Parth Malwankar
added basic test |
67 |
out, err = self.run_bzr(['grep', 'line1', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
68 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
69 |
self.assertTrue(self._str_contains(err, "warning: skipped.*file0.txt.*\.")) |
|
|
0.40.11
by Parth Malwankar
added basic test |
70 |
|
|
0.40.45
by Parth Malwankar
fixed case where only revno:0 is present. added test. |
71 |
def test_revno0(self): |
72 |
"""search for pattern in when only revno0 is present""" |
|
73 |
wd = 'foobar0' |
|
74 |
self.make_branch_and_tree(wd) # only revno 0 in branch |
|
75 |
os.chdir(wd) |
|
76 |
out, err = self.run_bzr(['grep', 'line1'], retcode=3) |
|
77 |
self.assertTrue(self._str_contains(err, "ERROR: No revisions found")) |
|
78 |
||
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
79 |
def test_basic_versioned_file(self): |
|
0.40.12
by Parth Malwankar
added test for versioned file |
80 |
"""search for pattern in specfic file""" |
81 |
wd = 'foobar0' |
|
82 |
self.make_branch_and_tree(wd) |
|
83 |
os.chdir(wd) |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
84 |
self._mk_versioned_file('file0.txt') |
|
0.40.12
by Parth Malwankar
added test for versioned file |
85 |
out, err = self.run_bzr(['grep', 'line1', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
86 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
87 |
self.assertFalse(self._str_contains(err, "warning: skipped.*file0.txt.*\.")) |
|
|
0.40.12
by Parth Malwankar
added test for versioned file |
88 |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
89 |
def test_multiple_files(self): |
90 |
"""search for pattern in multiple files""" |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
91 |
wd = 'foobar0' |
92 |
self.make_branch_and_tree(wd) |
|
93 |
os.chdir(wd) |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
94 |
self._mk_versioned_file('file0.txt', total_lines=2) |
95 |
self._mk_versioned_file('file1.txt', total_lines=2) |
|
96 |
self._mk_versioned_file('file2.txt', total_lines=2) |
|
97 |
out, err = self.run_bzr(['grep', 'line[1-2]']) |
|
98 |
||
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
99 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
100 |
self.assertTrue(self._str_contains(out, "file0.txt:line2")) |
|
101 |
self.assertTrue(self._str_contains(out, "file1.txt:line1")) |
|
102 |
self.assertTrue(self._str_contains(out, "file1.txt:line2")) |
|
103 |
self.assertTrue(self._str_contains(out, "file2.txt:line1")) |
|
104 |
self.assertTrue(self._str_contains(out, "file2.txt:line2")) |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
105 |
|
|
0.40.27
by Parth Malwankar
added test for null option |
106 |
def test_null_option(self): |
107 |
"""--null option should use NUL instead of newline""" |
|
108 |
wd = 'foobar0' |
|
109 |
self.make_branch_and_tree(wd) |
|
110 |
os.chdir(wd) |
|
111 |
self._mk_versioned_file('file0.txt', total_lines=3) |
|
112 |
||
113 |
out, err = self.run_bzr(['grep', '--null', 'line[1-3]']) |
|
114 |
self.assertTrue(out == "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") |
|
115 |
||
116 |
out, err = self.run_bzr(['grep', '-Z', 'line[1-3]']) |
|
117 |
self.assertTrue(out == "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") |
|
118 |
||
|
0.41.6
by Parth Malwankar
renamed --recurse/--no-recurse => --recursive/--no-recursive |
119 |
def test_versioned_file_in_dir_no_recursive(self): |
120 |
"""should not recurse with --no-recursive""" |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
121 |
wd = 'foobar0' |
122 |
self.make_branch_and_tree(wd) |
|
123 |
os.chdir(wd) |
|
124 |
self._mk_versioned_dir('dir0') |
|
125 |
self._mk_versioned_file('dir0/file0.txt') |
|
|
0.41.6
by Parth Malwankar
renamed --recurse/--no-recurse => --recursive/--no-recursive |
126 |
out, err = self.run_bzr(['grep', '--no-recursive', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
127 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
128 |
|
129 |
def test_versioned_file_in_dir_recurse(self): |
|
|
0.41.4
by Parth Malwankar
--recurse is default. |
130 |
"""should recurse by default""" |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
131 |
wd = 'foobar0' |
132 |
self.make_branch_and_tree(wd) |
|
133 |
os.chdir(wd) |
|
134 |
self._mk_versioned_dir('dir0') |
|
135 |
self._mk_versioned_file('dir0/file0.txt') |
|
|
0.41.4
by Parth Malwankar
--recurse is default. |
136 |
out, err = self.run_bzr(['grep', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
137 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1")) |
|
0.40.23
by Parth Malwankar
added test case for search while inside dir. |
138 |
|
139 |
def test_versioned_file_within_dir(self): |
|
140 |
"""search for pattern while in nested dir""" |
|
141 |
wd = 'foobar0' |
|
142 |
self.make_branch_and_tree(wd) |
|
143 |
os.chdir(wd) |
|
144 |
self._mk_versioned_dir('dir0') |
|
145 |
self._mk_versioned_file('dir0/file0.txt') |
|
146 |
os.chdir('dir0') |
|
147 |
out, err = self.run_bzr(['grep', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
148 |
self.assertTrue(self._str_contains(out, "^file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
149 |
|
|
0.40.41
by Parth Malwankar
added test for dir arg provided by user |
150 |
def test_versioned_files_from_outside_dir(self): |
151 |
"""grep for pattern with dirs passed as argument""" |
|
152 |
wd = 'foobar0' |
|
153 |
self.make_branch_and_tree(wd) |
|
154 |
os.chdir(wd) |
|
155 |
||
156 |
self._mk_versioned_dir('dir0') |
|
157 |
self._mk_versioned_file('dir0/file0.txt') |
|
158 |
||
159 |
self._mk_versioned_dir('dir1') |
|
160 |
self._mk_versioned_file('dir1/file1.txt') |
|
161 |
||
162 |
out, err = self.run_bzr(['grep', 'line1', 'dir0', 'dir1']) |
|
|
0.40.44
by Parth Malwankar
improved display of path when dir is given as argument |
163 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1")) |
164 |
self.assertTrue(self._str_contains(out, "^dir1/file1.txt:line1")) |
|
165 |
||
|
0.40.45
by Parth Malwankar
fixed case where only revno:0 is present. added test. |
166 |
def test_versioned_files_from_outside_dir(self): |
167 |
"""grep for pattern with dirs passed as argument""" |
|
168 |
wd = 'foobar0' |
|
169 |
self.make_branch_and_tree(wd) |
|
170 |
os.chdir(wd) |
|
171 |
||
172 |
self._mk_versioned_dir('dir0') |
|
173 |
self._mk_versioned_file('dir0/file0.txt') |
|
174 |
||
175 |
self._mk_versioned_dir('dir1') |
|
176 |
self._mk_versioned_file('dir1/file1.txt') |
|
177 |
||
178 |
out, err = self.run_bzr(['grep', 'line1', 'dir0', 'dir1']) |
|
179 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1")) |
|
180 |
self.assertTrue(self._str_contains(out, "^dir1/file1.txt:line1")) |
|
|
0.40.44
by Parth Malwankar
improved display of path when dir is given as argument |
181 |
|
182 |
def test_versioned_files_from_outside_two_dirs(self): |
|
183 |
"""grep for pattern with two levels of nested dir""" |
|
184 |
wd = 'foobar0' |
|
185 |
self.make_branch_and_tree(wd) |
|
186 |
os.chdir(wd) |
|
187 |
||
188 |
self._mk_versioned_dir('dir0') |
|
189 |
self._mk_versioned_file('dir0/file0.txt') |
|
190 |
||
191 |
self._mk_versioned_dir('dir1') |
|
192 |
self._mk_versioned_file('dir1/file1.txt') |
|
193 |
||
194 |
self._mk_versioned_dir('dir0/dir00') |
|
195 |
self._mk_versioned_file('dir0/dir00/file0.txt') |
|
196 |
||
197 |
out, err = self.run_bzr(['grep', 'line1', 'dir0/dir00']) |
|
198 |
self.assertTrue(self._str_contains(out, "^dir0/dir00/file0.txt:line1")) |
|
199 |
||
|
0.41.4
by Parth Malwankar
--recurse is default. |
200 |
out, err = self.run_bzr(['grep', 'line1']) |
|
0.40.44
by Parth Malwankar
improved display of path when dir is given as argument |
201 |
self.assertTrue(self._str_contains(out, "^dir0/dir00/file0.txt:line1")) |
|
0.40.41
by Parth Malwankar
added test for dir arg provided by user |
202 |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
203 |
def test_versioned_file_within_dir_two_levels(self): |
204 |
"""search for pattern while in nested dir (two levels)""" |
|
205 |
wd = 'foobar0' |
|
206 |
self.make_branch_and_tree(wd) |
|
207 |
os.chdir(wd) |
|
208 |
self._mk_versioned_dir('dir0') |
|
209 |
self._mk_versioned_dir('dir0/dir1') |
|
210 |
self._mk_versioned_file('dir0/dir1/file0.txt') |
|
211 |
os.chdir('dir0') |
|
|
0.41.4
by Parth Malwankar
--recurse is default. |
212 |
|
213 |
out, err = self.run_bzr(['grep', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
214 |
self.assertTrue(self._str_contains(out, "^dir1/file0.txt:line1")) |
|
0.41.4
by Parth Malwankar
--recurse is default. |
215 |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
216 |
out, err = self.run_bzr(['grep', '--from-root', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
217 |
self.assertTrue(self._str_contains(out, "^dir0/dir1/file0.txt:line1")) |
|
0.41.4
by Parth Malwankar
--recurse is default. |
218 |
|
|
0.41.6
by Parth Malwankar
renamed --recurse/--no-recurse => --recursive/--no-recursive |
219 |
out, err = self.run_bzr(['grep', '--no-recursive', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
220 |
self.assertFalse(self._str_contains(out, "file0.txt")) |
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
221 |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
222 |
def test_ignore_case_no_match(self): |
223 |
"""match fails without --ignore-case""" |
|
224 |
wd = 'foobar0' |
|
225 |
self.make_branch_and_tree(wd) |
|
226 |
os.chdir(wd) |
|
227 |
self._mk_versioned_file('file0.txt') |
|
228 |
out, err = self.run_bzr(['grep', 'LinE1', 'file0.txt']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
229 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
230 |
|
231 |
def test_ignore_case_match(self): |
|
232 |
"""match fails without --ignore-case""" |
|
233 |
wd = 'foobar0' |
|
234 |
self.make_branch_and_tree(wd) |
|
235 |
os.chdir(wd) |
|
236 |
self._mk_versioned_file('file0.txt') |
|
237 |
out, err = self.run_bzr(['grep', '-i', 'LinE1', 'file0.txt']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
238 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
|
0.40.24
by Parth Malwankar
added support for --line-number. |
239 |
out, err = self.run_bzr(['grep', '--ignore-case', 'LinE1', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
240 |
self.assertTrue(self._str_contains(out, "^file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
241 |
|
|
0.40.15
by Parth Malwankar
some fixes and test updates |
242 |
def test_from_root_fail(self): |
|
0.40.14
by Parth Malwankar
added test for --from-root |
243 |
"""match should fail without --from-root""" |
244 |
wd = 'foobar0' |
|
245 |
self.make_branch_and_tree(wd) |
|
246 |
os.chdir(wd) |
|
247 |
self._mk_versioned_file('file0.txt') |
|
248 |
self._mk_versioned_dir('dir0') |
|
249 |
os.chdir('dir0') |
|
250 |
out, err = self.run_bzr(['grep', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
251 |
self.assertFalse(self._str_contains(out, ".*file0.txt:line1")) |
|
0.40.14
by Parth Malwankar
added test for --from-root |
252 |
|
|
0.40.15
by Parth Malwankar
some fixes and test updates |
253 |
def test_from_root_pass(self): |
|
0.40.14
by Parth Malwankar
added test for --from-root |
254 |
"""match pass with --from-root""" |
255 |
wd = 'foobar0' |
|
256 |
self.make_branch_and_tree(wd) |
|
257 |
os.chdir(wd) |
|
258 |
self._mk_versioned_file('file0.txt') |
|
259 |
self._mk_versioned_dir('dir0') |
|
260 |
os.chdir('dir0') |
|
261 |
out, err = self.run_bzr(['grep', '--from-root', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
262 |
self.assertTrue(self._str_contains(out, ".*file0.txt:line1")) |
|
0.40.24
by Parth Malwankar
added support for --line-number. |
263 |
|
264 |
def test_with_line_number(self): |
|
265 |
"""search for pattern with --line-number""" |
|
266 |
wd = 'foobar0' |
|
267 |
self.make_branch_and_tree(wd) |
|
268 |
os.chdir(wd) |
|
269 |
self._mk_versioned_file('file0.txt') |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
270 |
|
|
0.40.24
by Parth Malwankar
added support for --line-number. |
271 |
out, err = self.run_bzr(['grep', '--line-number', 'line3', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
272 |
self.assertTrue(self._str_contains(out, "file0.txt:3:line3")) |
273 |
||
|
0.40.24
by Parth Malwankar
added support for --line-number. |
274 |
out, err = self.run_bzr(['grep', '-n', 'line1', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
275 |
self.assertTrue(self._str_contains(out, "file0.txt:1:line1")) |
|
0.40.14
by Parth Malwankar
added test for --from-root |
276 |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
277 |
def test_revno_basic_history_grep_file(self): |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
278 |
"""search for pattern in specific revision number in a file""" |
279 |
wd = 'foobar0' |
|
280 |
fname = 'file0.txt' |
|
281 |
self.make_branch_and_tree(wd) |
|
282 |
os.chdir(wd) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
283 |
self._mk_versioned_file(fname, total_lines=0) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
284 |
self._update_file(fname, text="v2 text\n") |
285 |
self._update_file(fname, text="v3 text\n") |
|
286 |
self._update_file(fname, text="v4 text\n") |
|
287 |
||
288 |
# rev 2 should not have text 'v3'
|
|
289 |
out, err = self.run_bzr(['grep', '-r', '2', 'v3', fname]) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
290 |
self.assertFalse(self._str_contains(out, "file0.txt")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
291 |
|
292 |
# rev 3 should not have text 'v3'
|
|
293 |
out, err = self.run_bzr(['grep', '-r', '3', 'v3', fname]) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
294 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3.*")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
295 |
|
296 |
# rev 3 should not have text 'v3' with line number
|
|
297 |
out, err = self.run_bzr(['grep', '-r', '3', '-n', 'v3', fname]) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
298 |
self.assertTrue(self._str_contains(out, "file0.txt~3:2:v3.*")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
299 |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
300 |
def test_revno_basic_history_grep_full(self): |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
301 |
"""search for pattern in specific revision number in a file""" |
302 |
wd = 'foobar0' |
|
303 |
fname = 'file0.txt' |
|
304 |
self.make_branch_and_tree(wd) |
|
305 |
os.chdir(wd) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
306 |
self._mk_versioned_file(fname, total_lines=0) # rev1 |
307 |
self._mk_versioned_file('file1.txt') # rev2 |
|
308 |
self._update_file(fname, text="v3 text\n") # rev3 |
|
309 |
self._update_file(fname, text="v4 text\n") # rev4 |
|
310 |
self._update_file(fname, text="v5 text\n") # rev5 |
|
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
311 |
|
312 |
# rev 2 should not have text 'v3'
|
|
313 |
out, err = self.run_bzr(['grep', '-r', '2', 'v3']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
314 |
self.assertFalse(self._str_contains(out, "file0.txt")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
315 |
|
316 |
# rev 3 should not have text 'v3'
|
|
317 |
out, err = self.run_bzr(['grep', '-r', '3', 'v3']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
318 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
319 |
|
320 |
# rev 3 should not have text 'v3' with line number
|
|
321 |
out, err = self.run_bzr(['grep', '-r', '3', '-n', 'v3']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
322 |
self.assertTrue(self._str_contains(out, "file0.txt~3:1:v3")) |
323 |
||
324 |
def test_revno_versioned_file_in_dir(self): |
|
325 |
"""we create a file 'foobar0/dir0/file0.txt' and grep specific version of content""" |
|
326 |
wd = 'foobar0' |
|
327 |
self.make_branch_and_tree(wd) |
|
328 |
os.chdir(wd) |
|
329 |
self._mk_versioned_dir('dir0') # rev1 |
|
330 |
self._mk_versioned_file('dir0/file0.txt') # rev2 |
|
331 |
self._update_file('dir0/file0.txt', "v3 text\n") # rev3 |
|
332 |
self._update_file('dir0/file0.txt', "v4 text\n") # rev4 |
|
333 |
self._update_file('dir0/file0.txt', "v5 text\n") # rev5 |
|
334 |
||
335 |
# v4 should not be present in revno 3
|
|
|
0.41.4
by Parth Malwankar
--recurse is default. |
336 |
out, err = self.run_bzr(['grep', '-r', 'last:3', 'v4']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
337 |
self.assertFalse(self._str_contains(out, "^dir0/file0.txt")) |
338 |
||
339 |
# v4 should be present in revno 4
|
|
|
0.41.4
by Parth Malwankar
--recurse is default. |
340 |
out, err = self.run_bzr(['grep', '-r', 'last:2', 'v4']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
341 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v4")) |
342 |
||
|
0.40.38
by Parth Malwankar
added --levels options. added tests for range search. |
343 |
def test_revno_range_basic_history_grep(self): |
344 |
"""search for pattern in revision range for file""" |
|
345 |
wd = 'foobar0' |
|
346 |
fname = 'file0.txt' |
|
347 |
self.make_branch_and_tree(wd) |
|
348 |
os.chdir(wd) |
|
349 |
self._mk_versioned_file(fname, total_lines=0) # rev1 |
|
350 |
self._mk_versioned_file('file1.txt') # rev2 |
|
351 |
self._update_file(fname, text="v3 text\n") # rev3 |
|
352 |
self._update_file(fname, text="v4 text\n") # rev4 |
|
353 |
self._update_file(fname, text="v5 text\n") # rev5 |
|
354 |
self._update_file(fname, text="v6 text\n") # rev6 |
|
355 |
||
356 |
out, err = self.run_bzr(['grep', '-r', '1..', 'v3']) |
|
357 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3")) |
|
358 |
self.assertTrue(self._str_contains(out, "file0.txt~4:v3")) |
|
359 |
self.assertTrue(self._str_contains(out, "file0.txt~5:v3")) |
|
360 |
||
361 |
out, err = self.run_bzr(['grep', '-r', '1..5', 'v3']) |
|
362 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3")) |
|
363 |
self.assertTrue(self._str_contains(out, "file0.txt~4:v3")) |
|
364 |
self.assertTrue(self._str_contains(out, "file0.txt~5:v3")) |
|
365 |
self.assertFalse(self._str_contains(out, "file0.txt~6:v3")) |
|
366 |
||
367 |
def test_revno_range_versioned_file_in_dir(self): |
|
368 |
"""we create a file 'foobar0/dir0/file0.txt' and grep rev-range for pattern""" |
|
369 |
wd = 'foobar0' |
|
370 |
self.make_branch_and_tree(wd) |
|
371 |
os.chdir(wd) |
|
372 |
self._mk_versioned_dir('dir0') # rev1 |
|
373 |
self._mk_versioned_file('dir0/file0.txt') # rev2 |
|
374 |
self._update_file('dir0/file0.txt', "v3 text\n") # rev3 |
|
375 |
self._update_file('dir0/file0.txt', "v4 text\n") # rev4 |
|
376 |
self._update_file('dir0/file0.txt', "v5 text\n") # rev5 |
|
377 |
self._update_file('dir0/file0.txt', "v6 text\n") # rev6 |
|
378 |
||
|
0.41.4
by Parth Malwankar
--recurse is default. |
379 |
out, err = self.run_bzr(['grep', '-r', '2..5', 'v3']) |
|
0.40.38
by Parth Malwankar
added --levels options. added tests for range search. |
380 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~3:v3")) |
381 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v3")) |
|
382 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~5:v3")) |
|
383 |
self.assertFalse(self._str_contains(out, "^dir0/file0.txt~6:v3")) |
|
384 |
||
385 |
def test_revno_range_versioned_file_from_outside_dir(self): |
|
386 |
"""grep rev-range for pattern from outside dir""" |
|
387 |
wd = 'foobar0' |
|
388 |
self.make_branch_and_tree(wd) |
|
389 |
os.chdir(wd) |
|
390 |
self._mk_versioned_dir('dir0') # rev1 |
|
391 |
self._mk_versioned_file('dir0/file0.txt') # rev2 |
|
392 |
self._update_file('dir0/file0.txt', "v3 text\n") # rev3 |
|
393 |
self._update_file('dir0/file0.txt', "v4 text\n") # rev4 |
|
394 |
self._update_file('dir0/file0.txt', "v5 text\n") # rev5 |
|
395 |
self._update_file('dir0/file0.txt', "v6 text\n") # rev6 |
|
396 |
||
397 |
out, err = self.run_bzr(['grep', '-r', '2..5', 'v3', 'dir0']) |
|
|
0.40.44
by Parth Malwankar
improved display of path when dir is given as argument |
398 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~3:v3")) |
399 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v3")) |
|
400 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~5:v3")) |
|
401 |
self.assertFalse(self._str_contains(out, "^dir0/file0.txt~6:v3")) |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
402 |
|
|
0.40.46
by Parth Malwankar
--levels=0 now implicitly prints revnos. added test for --levels=0. |
403 |
def test_levels(self): |
404 |
"""levels=0 should show findings from merged revision""" |
|
405 |
wd0 = 'foobar0' |
|
406 |
wd1 = 'foobar1' |
|
407 |
||
408 |
self.make_branch_and_tree(wd0) |
|
409 |
os.chdir(wd0) |
|
410 |
self._mk_versioned_file('file0.txt') |
|
411 |
os.chdir('..') |
|
412 |
||
413 |
out, err = self.run_bzr(['branch', wd0, wd1]) |
|
414 |
os.chdir(wd1) |
|
415 |
self._mk_versioned_file('file1.txt') |
|
416 |
os.chdir(osutils.pathjoin('..', wd0)) |
|
417 |
||
418 |
out, err = self.run_bzr(['merge', osutils.pathjoin('..', wd1)]) |
|
419 |
out, err = self.run_bzr(['ci', '-m', 'merged']) |
|
420 |
||
421 |
out, err = self.run_bzr(['grep', 'line1']) |
|
422 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
|
423 |
self.assertTrue(self._str_contains(out, "file1.txt:line1")) |
|
424 |
||
425 |
out, err = self.run_bzr(['grep', '--levels=0', 'line1']) |
|
426 |
self.assertTrue(self._str_contains(out, "file0.txt~2:line1")) |
|
427 |
self.assertTrue(self._str_contains(out, "file1.txt~2:line1")) |
|
428 |
self.assertTrue(self._str_contains(out, "file0.txt~1.1.1:line1")) |
|
429 |
self.assertTrue(self._str_contains(out, "file1.txt~1.1.1:line1")) |
|
430 |
||
431 |
out, err = self.run_bzr(['grep', '-n', '--levels=0', 'line1']) |
|
432 |
self.assertTrue(self._str_contains(out, "file0.txt~2:1:line1")) |
|
433 |
self.assertTrue(self._str_contains(out, "file1.txt~2:1:line1")) |
|
434 |
self.assertTrue(self._str_contains(out, "file0.txt~1.1.1:1:line1")) |
|
435 |
self.assertTrue(self._str_contains(out, "file1.txt~1.1.1:1:line1")) |
|
436 |
||
|
0.40.47
by Parth Malwankar
fixes bug #531336. binary files are now skipped. |
437 |
def test_binary_file_grep(self): |
438 |
"""grep for pattern in binary file""" |
|
439 |
wd = 'foobar0' |
|
440 |
self.make_branch_and_tree(wd) |
|
441 |
os.chdir(wd) |
|
442 |
self._mk_versioned_file('file0.txt') |
|
443 |
self._update_file('file0.txt', "\x00lineNN\x00\n") |
|
444 |
out, err = self.run_bzr(['grep', 'lineNN', 'file0.txt']) |
|
445 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
|
446 |
self.assertTrue(self._str_contains(err, "Binary file.*file0.txt.*skipped")) |
|
447 |
||
448 |