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 |
# Copyright (C) 2010 Parth Malwankar <parth.malwankar@gmail.com>
|
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
import os |
|
19 |
import re |
|
20 |
||
21 |
from bzrlib import tests |
|
22 |
||
23 |
class TestGrep(tests.TestCaseWithTransport): |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
24 |
def _str_contains(self, base, pattern, flags=re.MULTILINE|re.DOTALL): |
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
25 |
res = re.findall(pattern, base, flags) |
26 |
return res != [] |
|
|
0.40.11
by Parth Malwankar
added basic test |
27 |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
28 |
def _mk_file(self, path, line_prefix, total_lines, versioned): |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
29 |
text='' |
30 |
for i in range(total_lines): |
|
31 |
text += line_prefix + str(i+1) + "\n" |
|
32 |
||
|
0.40.12
by Parth Malwankar
added test for versioned file |
33 |
open(path, 'w').write(text) |
34 |
if versioned: |
|
35 |
self.run_bzr(['add', path]) |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
36 |
self.run_bzr(['ci', '-m', '"' + path + '"']) |
|
0.40.12
by Parth Malwankar
added test for versioned file |
37 |
|
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
38 |
def _update_file(self, path, text): |
39 |
"""append text to file 'path' and check it in""" |
|
40 |
open(path, 'a').write(text) |
|
41 |
self.run_bzr(['ci', '-m', '"' + path + '"']) |
|
42 |
||
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
43 |
def _mk_unknown_file(self, path, line_prefix='line', total_lines=10): |
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
44 |
self._mk_file(path, line_prefix, total_lines, versioned=False) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
45 |
|
46 |
def _mk_versioned_file(self, path, line_prefix='line', total_lines=10): |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
47 |
self._mk_file(path, line_prefix, total_lines, versioned=True) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
48 |
|
49 |
def _mk_dir(self, path, versioned): |
|
50 |
os.mkdir(path) |
|
51 |
if versioned: |
|
52 |
self.run_bzr(['add', path]) |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
53 |
self.run_bzr(['ci', '-m', '"' + path + '"']) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
54 |
|
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
55 |
def _mk_unknown_dir(self, path): |
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
56 |
self._mk_dir(path, versioned=False) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
57 |
|
58 |
def _mk_versioned_dir(self, path): |
|
59 |
self._mk_dir(path, versioned=True) |
|
60 |
||
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
61 |
def test_basic_unknown_file(self): |
|
0.40.16
by Parth Malwankar
tree.get_file_lines is now used to get lines of text |
62 |
"""search for pattern in specfic file. should issue warning.""" |
|
0.40.11
by Parth Malwankar
added basic test |
63 |
wd = 'foobar0' |
64 |
self.make_branch_and_tree(wd) |
|
65 |
os.chdir(wd) |
|
|
0.40.37
by Parth Malwankar
grep now accepts rev range |
66 |
self._mk_versioned_file('filex.txt') # force rev to revno:1 and not revno:0 |
67 |
self._mk_unknown_file('file0.txt') |
|
|
0.40.11
by Parth Malwankar
added basic test |
68 |
out, err = self.run_bzr(['grep', 'line1', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
69 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
70 |
self.assertTrue(self._str_contains(err, "warning: skipped.*file0.txt.*\.")) |
|
|
0.40.11
by Parth Malwankar
added basic test |
71 |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
72 |
def test_basic_versioned_file(self): |
|
0.40.12
by Parth Malwankar
added test for versioned file |
73 |
"""search for pattern in specfic file""" |
74 |
wd = 'foobar0' |
|
75 |
self.make_branch_and_tree(wd) |
|
76 |
os.chdir(wd) |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
77 |
self._mk_versioned_file('file0.txt') |
|
0.40.12
by Parth Malwankar
added test for versioned file |
78 |
out, err = self.run_bzr(['grep', 'line1', 'file0.txt']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
79 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
80 |
self.assertFalse(self._str_contains(err, "warning: skipped.*file0.txt.*\.")) |
|
|
0.40.12
by Parth Malwankar
added test for versioned file |
81 |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
82 |
def test_multiple_files(self): |
83 |
"""search for pattern in multiple files""" |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
84 |
wd = 'foobar0' |
85 |
self.make_branch_and_tree(wd) |
|
86 |
os.chdir(wd) |
|
|
0.40.26
by Parth Malwankar
test passing for multiple matches |
87 |
self._mk_versioned_file('file0.txt', total_lines=2) |
88 |
self._mk_versioned_file('file1.txt', total_lines=2) |
|
89 |
self._mk_versioned_file('file2.txt', total_lines=2) |
|
90 |
out, err = self.run_bzr(['grep', 'line[1-2]']) |
|
91 |
||
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
92 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
93 |
self.assertTrue(self._str_contains(out, "file0.txt:line2")) |
|
94 |
self.assertTrue(self._str_contains(out, "file1.txt:line1")) |
|
95 |
self.assertTrue(self._str_contains(out, "file1.txt:line2")) |
|
96 |
self.assertTrue(self._str_contains(out, "file2.txt:line1")) |
|
97 |
self.assertTrue(self._str_contains(out, "file2.txt:line2")) |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
98 |
|
|
0.40.27
by Parth Malwankar
added test for null option |
99 |
def test_null_option(self): |
100 |
"""--null option should use NUL instead of newline""" |
|
101 |
wd = 'foobar0' |
|
102 |
self.make_branch_and_tree(wd) |
|
103 |
os.chdir(wd) |
|
104 |
self._mk_versioned_file('file0.txt', total_lines=3) |
|
105 |
||
106 |
out, err = self.run_bzr(['grep', '--null', 'line[1-3]']) |
|
107 |
self.assertTrue(out == "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") |
|
108 |
||
109 |
out, err = self.run_bzr(['grep', '-Z', 'line[1-3]']) |
|
110 |
self.assertTrue(out == "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") |
|
111 |
||
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
112 |
def test_versioned_file_in_dir_no_recurse(self): |
113 |
"""should not recurse without -R""" |
|
114 |
wd = 'foobar0' |
|
115 |
self.make_branch_and_tree(wd) |
|
116 |
os.chdir(wd) |
|
117 |
self._mk_versioned_dir('dir0') |
|
118 |
self._mk_versioned_file('dir0/file0.txt') |
|
119 |
out, err = self.run_bzr(['grep', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
120 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
121 |
|
122 |
def test_versioned_file_in_dir_recurse(self): |
|
123 |
"""should find pattern in hierarchy with -R""" |
|
124 |
wd = 'foobar0' |
|
125 |
self.make_branch_and_tree(wd) |
|
126 |
os.chdir(wd) |
|
127 |
self._mk_versioned_dir('dir0') |
|
128 |
self._mk_versioned_file('dir0/file0.txt') |
|
129 |
out, err = self.run_bzr(['grep', '-R', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
130 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1")) |
|
0.40.24
by Parth Malwankar
added support for --line-number. |
131 |
out, err = self.run_bzr(['grep', '--recursive', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
132 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt:line1")) |
|
0.40.23
by Parth Malwankar
added test case for search while inside dir. |
133 |
|
134 |
def test_versioned_file_within_dir(self): |
|
135 |
"""search for pattern while in nested dir""" |
|
136 |
wd = 'foobar0' |
|
137 |
self.make_branch_and_tree(wd) |
|
138 |
os.chdir(wd) |
|
139 |
self._mk_versioned_dir('dir0') |
|
140 |
self._mk_versioned_file('dir0/file0.txt') |
|
141 |
os.chdir('dir0') |
|
142 |
out, err = self.run_bzr(['grep', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
143 |
self.assertTrue(self._str_contains(out, "^file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
144 |
|
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
145 |
def test_versioned_file_within_dir_two_levels(self): |
146 |
"""search for pattern while in nested dir (two levels)""" |
|
147 |
wd = 'foobar0' |
|
148 |
self.make_branch_and_tree(wd) |
|
149 |
os.chdir(wd) |
|
150 |
self._mk_versioned_dir('dir0') |
|
151 |
self._mk_versioned_dir('dir0/dir1') |
|
152 |
self._mk_versioned_file('dir0/dir1/file0.txt') |
|
153 |
os.chdir('dir0') |
|
154 |
out, err = self.run_bzr(['grep', '-R', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
155 |
self.assertTrue(self._str_contains(out, "^dir1/file0.txt:line1")) |
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
156 |
out, err = self.run_bzr(['grep', '--from-root', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
157 |
self.assertTrue(self._str_contains(out, "^dir0/dir1/file0.txt:line1")) |
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
158 |
out, err = self.run_bzr(['grep', 'line1']) |
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
159 |
self.assertFalse(self._str_contains(out, "file0.txt")) |
|
0.40.25
by Parth Malwankar
added test case for multilevel dir. |
160 |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
161 |
def test_ignore_case_no_match(self): |
162 |
"""match fails without --ignore-case""" |
|
163 |
wd = 'foobar0' |
|
164 |
self.make_branch_and_tree(wd) |
|
165 |
os.chdir(wd) |
|
166 |
self._mk_versioned_file('file0.txt') |
|
167 |
out, err = self.run_bzr(['grep', 'LinE1', 'file0.txt']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
168 |
self.assertFalse(self._str_contains(out, "file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
169 |
|
170 |
def test_ignore_case_match(self): |
|
171 |
"""match fails without --ignore-case""" |
|
172 |
wd = 'foobar0' |
|
173 |
self.make_branch_and_tree(wd) |
|
174 |
os.chdir(wd) |
|
175 |
self._mk_versioned_file('file0.txt') |
|
176 |
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 |
177 |
self.assertTrue(self._str_contains(out, "file0.txt:line1")) |
|
0.40.24
by Parth Malwankar
added support for --line-number. |
178 |
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 |
179 |
self.assertTrue(self._str_contains(out, "^file0.txt:line1")) |
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
180 |
|
|
0.40.15
by Parth Malwankar
some fixes and test updates |
181 |
def test_from_root_fail(self): |
|
0.40.14
by Parth Malwankar
added test for --from-root |
182 |
"""match should fail without --from-root""" |
183 |
wd = 'foobar0' |
|
184 |
self.make_branch_and_tree(wd) |
|
185 |
os.chdir(wd) |
|
186 |
self._mk_versioned_file('file0.txt') |
|
187 |
self._mk_versioned_dir('dir0') |
|
188 |
os.chdir('dir0') |
|
189 |
out, err = self.run_bzr(['grep', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
190 |
self.assertFalse(self._str_contains(out, ".*file0.txt:line1")) |
|
0.40.14
by Parth Malwankar
added test for --from-root |
191 |
|
|
0.40.15
by Parth Malwankar
some fixes and test updates |
192 |
def test_from_root_pass(self): |
|
0.40.14
by Parth Malwankar
added test for --from-root |
193 |
"""match pass with --from-root""" |
194 |
wd = 'foobar0' |
|
195 |
self.make_branch_and_tree(wd) |
|
196 |
os.chdir(wd) |
|
197 |
self._mk_versioned_file('file0.txt') |
|
198 |
self._mk_versioned_dir('dir0') |
|
199 |
os.chdir('dir0') |
|
200 |
out, err = self.run_bzr(['grep', '--from-root', 'line1']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
201 |
self.assertTrue(self._str_contains(out, ".*file0.txt:line1")) |
|
0.40.24
by Parth Malwankar
added support for --line-number. |
202 |
|
203 |
def test_with_line_number(self): |
|
204 |
"""search for pattern with --line-number""" |
|
205 |
wd = 'foobar0' |
|
206 |
self.make_branch_and_tree(wd) |
|
207 |
os.chdir(wd) |
|
208 |
self._mk_versioned_file('file0.txt') |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
209 |
|
|
0.40.24
by Parth Malwankar
added support for --line-number. |
210 |
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 |
211 |
self.assertTrue(self._str_contains(out, "file0.txt:3:line3")) |
212 |
||
|
0.40.24
by Parth Malwankar
added support for --line-number. |
213 |
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 |
214 |
self.assertTrue(self._str_contains(out, "file0.txt:1:line1")) |
|
0.40.14
by Parth Malwankar
added test for --from-root |
215 |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
216 |
def test_revno_basic_history_grep_file(self): |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
217 |
"""search for pattern in specific revision number in a file""" |
218 |
wd = 'foobar0' |
|
219 |
fname = 'file0.txt' |
|
220 |
self.make_branch_and_tree(wd) |
|
221 |
os.chdir(wd) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
222 |
self._mk_versioned_file(fname, total_lines=0) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
223 |
self._update_file(fname, text="v2 text\n") |
224 |
self._update_file(fname, text="v3 text\n") |
|
225 |
self._update_file(fname, text="v4 text\n") |
|
226 |
||
227 |
# rev 2 should not have text 'v3'
|
|
228 |
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 |
229 |
self.assertFalse(self._str_contains(out, "file0.txt")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
230 |
|
231 |
# rev 3 should not have text 'v3'
|
|
232 |
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 |
233 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3.*")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
234 |
|
235 |
# rev 3 should not have text 'v3' with line number
|
|
236 |
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 |
237 |
self.assertTrue(self._str_contains(out, "file0.txt~3:2:v3.*")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
238 |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
239 |
def test_revno_basic_history_grep_full(self): |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
240 |
"""search for pattern in specific revision number in a file""" |
241 |
wd = 'foobar0' |
|
242 |
fname = 'file0.txt' |
|
243 |
self.make_branch_and_tree(wd) |
|
244 |
os.chdir(wd) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
245 |
self._mk_versioned_file(fname, total_lines=0) # rev1 |
246 |
self._mk_versioned_file('file1.txt') # rev2 |
|
247 |
self._update_file(fname, text="v3 text\n") # rev3 |
|
248 |
self._update_file(fname, text="v4 text\n") # rev4 |
|
249 |
self._update_file(fname, text="v5 text\n") # rev5 |
|
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
250 |
|
251 |
# rev 2 should not have text 'v3'
|
|
252 |
out, err = self.run_bzr(['grep', '-r', '2', 'v3']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
253 |
self.assertFalse(self._str_contains(out, "file0.txt")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
254 |
|
255 |
# rev 3 should not have text 'v3'
|
|
256 |
out, err = self.run_bzr(['grep', '-r', '3', 'v3']) |
|
|
0.40.35
by Parth Malwankar
fixed asserts and added test for revno based grep |
257 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3")) |
|
0.40.34
by Parth Malwankar
added tests for single revision history search |
258 |
|
259 |
# rev 3 should not have text 'v3' with line number
|
|
260 |
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 |
261 |
self.assertTrue(self._str_contains(out, "file0.txt~3:1:v3")) |
262 |
||
263 |
def test_revno_versioned_file_in_dir(self): |
|
264 |
"""we create a file 'foobar0/dir0/file0.txt' and grep specific version of content""" |
|
265 |
wd = 'foobar0' |
|
266 |
self.make_branch_and_tree(wd) |
|
267 |
os.chdir(wd) |
|
268 |
self._mk_versioned_dir('dir0') # rev1 |
|
269 |
self._mk_versioned_file('dir0/file0.txt') # rev2 |
|
270 |
self._update_file('dir0/file0.txt', "v3 text\n") # rev3 |
|
271 |
self._update_file('dir0/file0.txt', "v4 text\n") # rev4 |
|
272 |
self._update_file('dir0/file0.txt', "v5 text\n") # rev5 |
|
273 |
||
274 |
# v4 should not be present in revno 3
|
|
275 |
out, err = self.run_bzr(['grep', '-r', 'last:3', '-R', 'v4']) |
|
276 |
self.assertFalse(self._str_contains(out, "^dir0/file0.txt")) |
|
277 |
||
278 |
# v4 should be present in revno 4
|
|
279 |
out, err = self.run_bzr(['grep', '-r', 'last:2', '-R', 'v4']) |
|
280 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v4")) |
|
281 |
||
|
0.40.38
by Parth Malwankar
added --levels options. added tests for range search. |
282 |
def test_revno_range_basic_history_grep(self): |
283 |
"""search for pattern in revision range for file""" |
|
284 |
wd = 'foobar0' |
|
285 |
fname = 'file0.txt' |
|
286 |
self.make_branch_and_tree(wd) |
|
287 |
os.chdir(wd) |
|
288 |
self._mk_versioned_file(fname, total_lines=0) # rev1 |
|
289 |
self._mk_versioned_file('file1.txt') # rev2 |
|
290 |
self._update_file(fname, text="v3 text\n") # rev3 |
|
291 |
self._update_file(fname, text="v4 text\n") # rev4 |
|
292 |
self._update_file(fname, text="v5 text\n") # rev5 |
|
293 |
self._update_file(fname, text="v6 text\n") # rev6 |
|
294 |
||
295 |
out, err = self.run_bzr(['grep', '-r', '1..', 'v3']) |
|
296 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3")) |
|
297 |
self.assertTrue(self._str_contains(out, "file0.txt~4:v3")) |
|
298 |
self.assertTrue(self._str_contains(out, "file0.txt~5:v3")) |
|
299 |
||
300 |
out, err = self.run_bzr(['grep', '-r', '1..5', 'v3']) |
|
301 |
self.assertTrue(self._str_contains(out, "file0.txt~3:v3")) |
|
302 |
self.assertTrue(self._str_contains(out, "file0.txt~4:v3")) |
|
303 |
self.assertTrue(self._str_contains(out, "file0.txt~5:v3")) |
|
304 |
self.assertFalse(self._str_contains(out, "file0.txt~6:v3")) |
|
305 |
||
306 |
def test_revno_range_versioned_file_in_dir(self): |
|
307 |
"""we create a file 'foobar0/dir0/file0.txt' and grep rev-range for pattern""" |
|
308 |
wd = 'foobar0' |
|
309 |
self.make_branch_and_tree(wd) |
|
310 |
os.chdir(wd) |
|
311 |
self._mk_versioned_dir('dir0') # rev1 |
|
312 |
self._mk_versioned_file('dir0/file0.txt') # rev2 |
|
313 |
self._update_file('dir0/file0.txt', "v3 text\n") # rev3 |
|
314 |
self._update_file('dir0/file0.txt', "v4 text\n") # rev4 |
|
315 |
self._update_file('dir0/file0.txt', "v5 text\n") # rev5 |
|
316 |
self._update_file('dir0/file0.txt', "v6 text\n") # rev6 |
|
317 |
||
318 |
out, err = self.run_bzr(['grep', '-R', '-r', '2..5', 'v3']) |
|
319 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~3:v3")) |
|
320 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~4:v3")) |
|
321 |
self.assertTrue(self._str_contains(out, "^dir0/file0.txt~5:v3")) |
|
322 |
self.assertFalse(self._str_contains(out, "^dir0/file0.txt~6:v3")) |
|
323 |
||
324 |
def test_revno_range_versioned_file_from_outside_dir(self): |
|
325 |
"""grep rev-range for pattern from outside dir""" |
|
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 |
self._update_file('dir0/file0.txt', "v6 text\n") # rev6 |
|
335 |
||
336 |
out, err = self.run_bzr(['grep', '-r', '2..5', 'v3', 'dir0']) |
|
337 |
self.assertTrue(self._str_contains(out, "^file0.txt~3:v3")) |
|
338 |
self.assertTrue(self._str_contains(out, "^file0.txt~4:v3")) |
|
339 |
self.assertTrue(self._str_contains(out, "^file0.txt~5:v3")) |
|
340 |
self.assertFalse(self._str_contains(out, "^file0.txt~6:v3")) |
|
|
0.40.13
by Parth Malwankar
added tests for -R and -i |
341 |