Merge lp:~jelmer/bzr/merge-grep into lp:bzr
- merge-grep
- Merge into bzr.dev
Status: | Superseded |
---|---|
Proposed branch: | lp:~jelmer/bzr/merge-grep |
Merge into: | lp:bzr |
Diff against target: |
3488 lines (+3435/-0) 9 files modified
bzrlib/plugins/grep/.bzrignore (+1/-0) bzrlib/plugins/grep/NEWS (+73/-0) bzrlib/plugins/grep/__init__.py (+38/-0) bzrlib/plugins/grep/cmds.py (+249/-0) bzrlib/plugins/grep/grep.py (+728/-0) bzrlib/plugins/grep/test_grep.py (+2254/-0) bzrlib/termcolor.py (+78/-0) bzrlib/tests/features.py (+12/-0) doc/en/release-notes/bzr-2.6.txt (+2/-0) |
To merge this branch: | bzr merge lp:~jelmer/bzr/merge-grep |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Needs Fixing | ||
Review via email: mp+112723@code.launchpad.net |
Commit message
Add bzr-grep as a core plugin
Description of the change
Martin Packman (gz) wrote : | # |
sent to pqm by email
Martin Packman (gz) wrote : | # |
Tests do not pass.
bp.grep.
bp.grep.
bp.grep.
Traceback (most recent call last):
...
File "/home/
grep.
File "/home/
dir_grep(tree, path, relpath, opts, revno, path_prefix)
File "/home/
cache_id = tree.inventory[
File "/home/
warn(
DeprecationWarning: bzrlib.
bp.grep.
bp.grep.
Traceback (most recent call last):
...
File "/home/
grep.
File "/home/
for revid, revno, merge_depth in given_revs:
File "/home/
for revision_id in repo.iter_
AttributeError: 'CHKInventoryRe
Preview Diff
1 | === added directory 'bzrlib/plugins/grep' | |||
2 | === added file 'bzrlib/plugins/grep/.bzrignore' | |||
3 | --- bzrlib/plugins/grep/.bzrignore 1970-01-01 00:00:00 +0000 | |||
4 | +++ bzrlib/plugins/grep/.bzrignore 2012-08-03 11:45:28 +0000 | |||
5 | @@ -0,0 +1,1 @@ | |||
6 | 1 | ./build | ||
7 | 0 | 2 | ||
8 | === added file 'bzrlib/plugins/grep/NEWS' | |||
9 | --- bzrlib/plugins/grep/NEWS 1970-01-01 00:00:00 +0000 | |||
10 | +++ bzrlib/plugins/grep/NEWS 2012-08-03 11:45:28 +0000 | |||
11 | @@ -0,0 +1,73 @@ | |||
12 | 1 | This is the NEWS file from bzr-grep from before it was merged into bzr core. | ||
13 | 2 | For changes before then, please refer to the main bzr log file. | ||
14 | 3 | |||
15 | 4 | bzr-grep 0.5.0-final - Unreleased | ||
16 | 5 | ================================== | ||
17 | 6 | * ``bzr grep`` now supports ``--diff|-p`` option to search through | ||
18 | 7 | changesets. (Parth Malwankar, #540705) | ||
19 | 8 | |||
20 | 9 | * Option ``grep_color`` can be set in ``bazaar.conf`` instead of using | ||
21 | 10 | the option ``--color`` from the command line. (Johan Dahlin) | ||
22 | 11 | |||
23 | 12 | bzr-grep 0.4.0-final - 08-Jun-2010 | ||
24 | 13 | ================================== | ||
25 | 14 | * Add seperate output formatter to reduce duplication of search loops, | ||
26 | 15 | additionally make -Fi use regexp rather than lowercasing pattern and | ||
27 | 16 | entirety of text for the same reason. This also fixes bug #590589 | ||
28 | 17 | - UnicodeDecodeError with options -Fi. (Martin [gz]) | ||
29 | 18 | |||
30 | 19 | * Added fast path for no match that avoids splitting the file text into | ||
31 | 20 | seperate lines and testing each one, by checking the entire text for a | ||
32 | 21 | possible match initially. (Martin [gz]) | ||
33 | 22 | |||
34 | 23 | * Added Makefile. (Parth Malwankar) | ||
35 | 24 | |||
36 | 25 | * Fixed setup.py to work correctly. (Martin [gz]) | ||
37 | 26 | |||
38 | 27 | bzr-grep 0.3.0-final - 23-May-2010 | ||
39 | 28 | ================================== | ||
40 | 29 | * Support for --color option (POSIX only). (Parth Malwankar, #571694) | ||
41 | 30 | |||
42 | 31 | * Revisions in branches without trees can now be searched with | ||
43 | 32 | -r option. (Parth Malwankar, #584240) | ||
44 | 33 | |||
45 | 34 | * Trying to search working tree for a treeless branch no longer | ||
46 | 35 | produces a stack trace but gives an error message suggesting use of | ||
47 | 36 | -r option. (Parth Malwankar, #572658) | ||
48 | 37 | |||
49 | 38 | bzr-grep 0.2.0-final - 30-Mar-2010 | ||
50 | 39 | ================================== | ||
51 | 40 | * 'binary file skipped' warning is not shows without --verbose flag | ||
52 | 41 | (Parth Malwankar, #539031) | ||
53 | 42 | |||
54 | 43 | * Added support for -F/--fixed-string for faster search. | ||
55 | 44 | Simple patterns [a-zA-Z0-9 _] are now implicitly -F and searched faster. | ||
56 | 45 | (Parth Malwankar, #539263) | ||
57 | 46 | |||
58 | 47 | * Better unicode handling. bzr-grep no longer crashes with UnicodeDecode | ||
59 | 48 | error for some outputs. (Parth Malwankar, #539258) | ||
60 | 49 | |||
61 | 50 | * Faster grep for revision range. bzr-grep now caches results for | ||
62 | 51 | files that have not changed between revisions. | ||
63 | 52 | (Parth Malwankar, #542375) | ||
64 | 53 | |||
65 | 54 | * Faster grep for specific revision. (Parth Malwankar, #539429) | ||
66 | 55 | |||
67 | 56 | * Significant performance improvement. Working tree grep for bzr.dev | ||
68 | 57 | has gone from ~7.5s to ~1s. (Parth Malwankar, #539028) | ||
69 | 58 | |||
70 | 59 | * Support for -L/--files-without-match and -l/files-with-matches | ||
71 | 60 | (Parth Malwankar, #540097) | ||
72 | 61 | |||
73 | 62 | bzr-grep 0.1.0-final - 14-Mar-2010 | ||
74 | 63 | ================================== | ||
75 | 64 | * --recursive is now default. (Parth Malwankar, #536688) | ||
76 | 65 | |||
77 | 66 | * ``bzr grep`` searches working copy by default. (Parth Malwankar, #537072) | ||
78 | 67 | |||
79 | 68 | * --include/exclude=GLOB is now supported. (Parth Malwankar, #529889) | ||
80 | 69 | |||
81 | 70 | bzr-grep 0.0.1-final - 10-Mar-2010 | ||
82 | 71 | ================================== | ||
83 | 72 | * Initial release (Parth Malwankar) | ||
84 | 73 | |||
85 | 0 | 74 | ||
86 | === added file 'bzrlib/plugins/grep/__init__.py' | |||
87 | --- bzrlib/plugins/grep/__init__.py 1970-01-01 00:00:00 +0000 | |||
88 | +++ bzrlib/plugins/grep/__init__.py 2012-08-03 11:45:28 +0000 | |||
89 | @@ -0,0 +1,38 @@ | |||
90 | 1 | # Copyright (C) 2010 Canonical Ltd | ||
91 | 2 | # | ||
92 | 3 | # This program is free software; you can redistribute it and/or modify | ||
93 | 4 | # it under the terms of the GNU General Public License as published by | ||
94 | 5 | # the Free Software Foundation; either version 2 of the License, or | ||
95 | 6 | # (at your option) any later version. | ||
96 | 7 | # | ||
97 | 8 | # This program is distributed in the hope that it will be useful, | ||
98 | 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
99 | 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
100 | 11 | # GNU General Public License for more details. | ||
101 | 12 | # | ||
102 | 13 | # You should have received a copy of the GNU General Public License | ||
103 | 14 | # along with this program; if not, write to the Free Software | ||
104 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
105 | 16 | |||
106 | 17 | """Print lines matching PATTERN for specified files and revisions.""" | ||
107 | 18 | |||
108 | 19 | from __future__ import absolute_import | ||
109 | 20 | |||
110 | 21 | from bzrlib import version_info | ||
111 | 22 | from bzrlib.commands import plugin_cmds | ||
112 | 23 | |||
113 | 24 | plugin_cmds.register_lazy("cmd_grep", [], "bzrlib.plugins.grep.cmds") | ||
114 | 25 | |||
115 | 26 | def test_suite(): | ||
116 | 27 | from bzrlib.tests import TestUtil | ||
117 | 28 | |||
118 | 29 | suite = TestUtil.TestSuite() | ||
119 | 30 | loader = TestUtil.TestLoader() | ||
120 | 31 | testmod_names = [ | ||
121 | 32 | 'test_grep', | ||
122 | 33 | ] | ||
123 | 34 | |||
124 | 35 | suite.addTest(loader.loadTestsFromModuleNames( | ||
125 | 36 | ["%s.%s" % (__name__, tmn) for tmn in testmod_names])) | ||
126 | 37 | return suite | ||
127 | 38 | |||
128 | 0 | 39 | ||
129 | === added file 'bzrlib/plugins/grep/cmds.py' | |||
130 | --- bzrlib/plugins/grep/cmds.py 1970-01-01 00:00:00 +0000 | |||
131 | +++ bzrlib/plugins/grep/cmds.py 2012-08-03 11:45:28 +0000 | |||
132 | @@ -0,0 +1,249 @@ | |||
133 | 1 | # Copyright (C) 2010 Canonical Ltd | ||
134 | 2 | # | ||
135 | 3 | # This program is free software; you can redistribute it and/or modify | ||
136 | 4 | # it under the terms of the GNU General Public License as published by | ||
137 | 5 | # the Free Software Foundation; either version 2 of the License, or | ||
138 | 6 | # (at your option) any later version. | ||
139 | 7 | # | ||
140 | 8 | # This program is distributed in the hope that it will be useful, | ||
141 | 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
142 | 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
143 | 11 | # GNU General Public License for more details. | ||
144 | 12 | # | ||
145 | 13 | # You should have received a copy of the GNU General Public License | ||
146 | 14 | # along with this program; if not, write to the Free Software | ||
147 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
148 | 16 | |||
149 | 17 | """Print lines matching PATTERN for specified files and revisions.""" | ||
150 | 18 | |||
151 | 19 | from __future__ import absolute_import | ||
152 | 20 | |||
153 | 21 | from bzrlib import errors | ||
154 | 22 | from bzrlib.commands import Command, display_command | ||
155 | 23 | from bzrlib.option import Option, ListOption | ||
156 | 24 | from bzrlib.config import GlobalConfig | ||
157 | 25 | |||
158 | 26 | # FIXME: _parse_levels should be shared with bzrlib.builtins. this is a copy | ||
159 | 27 | # to avoid the error | ||
160 | 28 | # "IllegalUseOfScopeReplacer: ScopeReplacer object '_parse_levels' was used | ||
161 | 29 | # incorrectly: Object already cleaned up, did you assign it to another | ||
162 | 30 | # variable?: _factory | ||
163 | 31 | # with lazy import | ||
164 | 32 | def _parse_levels(s): | ||
165 | 33 | try: | ||
166 | 34 | return int(s) | ||
167 | 35 | except ValueError: | ||
168 | 36 | msg = "The levels argument must be an integer." | ||
169 | 37 | raise errors.BzrCommandError(msg) | ||
170 | 38 | |||
171 | 39 | |||
172 | 40 | class GrepOptions(object): | ||
173 | 41 | """Container to pass around grep options. | ||
174 | 42 | |||
175 | 43 | This class is used as a container to pass around user option and | ||
176 | 44 | some other params (like outf) to processing functions. This makes | ||
177 | 45 | it easier to add more options as grep evolves. | ||
178 | 46 | """ | ||
179 | 47 | verbose = False | ||
180 | 48 | ignore_case = False | ||
181 | 49 | no_recursive = False | ||
182 | 50 | from_root = False | ||
183 | 51 | null = False | ||
184 | 52 | levels = None | ||
185 | 53 | line_number = False | ||
186 | 54 | path_list = None | ||
187 | 55 | revision = None | ||
188 | 56 | pattern = None | ||
189 | 57 | include = None | ||
190 | 58 | exclude = None | ||
191 | 59 | fixed_string = False | ||
192 | 60 | files_with_matches = False | ||
193 | 61 | files_without_match = False | ||
194 | 62 | color = None | ||
195 | 63 | diff = False | ||
196 | 64 | |||
197 | 65 | # derived options | ||
198 | 66 | recursive = None | ||
199 | 67 | eol_marker = None | ||
200 | 68 | patternc = None | ||
201 | 69 | sub_patternc = None | ||
202 | 70 | print_revno = None | ||
203 | 71 | fixed_string = None | ||
204 | 72 | outf = None | ||
205 | 73 | show_color = False | ||
206 | 74 | |||
207 | 75 | |||
208 | 76 | class cmd_grep(Command): | ||
209 | 77 | """Print lines matching PATTERN for specified files and revisions. | ||
210 | 78 | |||
211 | 79 | This command searches the specified files and revisions for a given | ||
212 | 80 | pattern. The pattern is specified as a Python regular expressions[1]. | ||
213 | 81 | |||
214 | 82 | If the file name is not specified, the revisions starting with the | ||
215 | 83 | current directory are searched recursively. If the revision number is | ||
216 | 84 | not specified, the working copy is searched. To search the last committed | ||
217 | 85 | revision, use the '-r -1' or '-r last:1' option. | ||
218 | 86 | |||
219 | 87 | Unversioned files are not searched unless explicitly specified on the | ||
220 | 88 | command line. Unversioned directores are not searched. | ||
221 | 89 | |||
222 | 90 | When searching a pattern, the output is shown in the 'filepath:string' | ||
223 | 91 | format. If a revision is explicitly searched, the output is shown as | ||
224 | 92 | 'filepath~N:string', where N is the revision number. | ||
225 | 93 | |||
226 | 94 | --include and --exclude options can be used to search only (or exclude | ||
227 | 95 | from search) files with base name matches the specified Unix style GLOB | ||
228 | 96 | pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\ | ||
229 | 97 | to quote wildcard or backslash character literally. Note that the glob | ||
230 | 98 | pattern is not a regular expression. | ||
231 | 99 | |||
232 | 100 | [1] http://docs.python.org/library/re.html#regular-expression-syntax | ||
233 | 101 | """ | ||
234 | 102 | |||
235 | 103 | encoding_type = 'replace' | ||
236 | 104 | takes_args = ['pattern', 'path*'] | ||
237 | 105 | takes_options = [ | ||
238 | 106 | 'verbose', | ||
239 | 107 | 'revision', | ||
240 | 108 | Option('color', type=str, argname='when', | ||
241 | 109 | help='Show match in color. WHEN is never, always or auto.'), | ||
242 | 110 | Option('diff', short_name='p', | ||
243 | 111 | help='Grep for pattern in changeset for each revision.'), | ||
244 | 112 | ListOption('exclude', type=str, argname='glob', short_name='X', | ||
245 | 113 | help="Skip files whose base name matches GLOB."), | ||
246 | 114 | ListOption('include', type=str, argname='glob', short_name='I', | ||
247 | 115 | help="Search only files whose base name matches GLOB."), | ||
248 | 116 | Option('files-with-matches', short_name='l', | ||
249 | 117 | help='Print only the name of each input file in ' | ||
250 | 118 | 'which PATTERN is found.'), | ||
251 | 119 | Option('files-without-match', short_name='L', | ||
252 | 120 | help='Print only the name of each input file in ' | ||
253 | 121 | 'which PATTERN is not found.'), | ||
254 | 122 | Option('fixed-string', short_name='F', | ||
255 | 123 | help='Interpret PATTERN is a single fixed string (not regex).'), | ||
256 | 124 | Option('from-root', | ||
257 | 125 | help='Search for pattern starting from the root of the branch. ' | ||
258 | 126 | '(implies --recursive)'), | ||
259 | 127 | Option('ignore-case', short_name='i', | ||
260 | 128 | help='ignore case distinctions while matching.'), | ||
261 | 129 | Option('levels', | ||
262 | 130 | help='Number of levels to display - 0 for all, 1 for collapsed ' | ||
263 | 131 | '(1 is default).', | ||
264 | 132 | argname='N', | ||
265 | 133 | type=_parse_levels), | ||
266 | 134 | Option('line-number', short_name='n', | ||
267 | 135 | help='show 1-based line number.'), | ||
268 | 136 | Option('no-recursive', | ||
269 | 137 | help="Don't recurse into subdirectories. (default is --recursive)"), | ||
270 | 138 | Option('null', short_name='Z', | ||
271 | 139 | help='Write an ASCII NUL (\\0) separator ' | ||
272 | 140 | 'between output lines rather than a newline.'), | ||
273 | 141 | ] | ||
274 | 142 | |||
275 | 143 | |||
276 | 144 | @display_command | ||
277 | 145 | def run(self, verbose=False, ignore_case=False, no_recursive=False, | ||
278 | 146 | from_root=False, null=False, levels=None, line_number=False, | ||
279 | 147 | path_list=None, revision=None, pattern=None, include=None, | ||
280 | 148 | exclude=None, fixed_string=False, files_with_matches=False, | ||
281 | 149 | files_without_match=False, color=None, diff=False): | ||
282 | 150 | from bzrlib import termcolor | ||
283 | 151 | from bzrlib.plugins.grep import ( | ||
284 | 152 | grep, | ||
285 | 153 | ) | ||
286 | 154 | import re | ||
287 | 155 | if path_list is None: | ||
288 | 156 | path_list = ['.'] | ||
289 | 157 | else: | ||
290 | 158 | if from_root: | ||
291 | 159 | raise errors.BzrCommandError('cannot specify both --from-root and PATH.') | ||
292 | 160 | |||
293 | 161 | if files_with_matches and files_without_match: | ||
294 | 162 | raise errors.BzrCommandError('cannot specify both ' | ||
295 | 163 | '-l/--files-with-matches and -L/--files-without-matches.') | ||
296 | 164 | |||
297 | 165 | global_config = GlobalConfig() | ||
298 | 166 | |||
299 | 167 | if color is None: | ||
300 | 168 | color = global_config.get_user_option('grep_color') | ||
301 | 169 | |||
302 | 170 | if color is None: | ||
303 | 171 | color = 'never' | ||
304 | 172 | |||
305 | 173 | if color not in ['always', 'never', 'auto']: | ||
306 | 174 | raise errors.BzrCommandError('Valid values for --color are ' | ||
307 | 175 | '"always", "never" or "auto".') | ||
308 | 176 | |||
309 | 177 | if levels==None: | ||
310 | 178 | levels=1 | ||
311 | 179 | |||
312 | 180 | print_revno = False | ||
313 | 181 | if revision != None or levels == 0: | ||
314 | 182 | # print revision numbers as we may be showing multiple revisions | ||
315 | 183 | print_revno = True | ||
316 | 184 | |||
317 | 185 | eol_marker = '\n' | ||
318 | 186 | if null: | ||
319 | 187 | eol_marker = '\0' | ||
320 | 188 | |||
321 | 189 | if not ignore_case and grep.is_fixed_string(pattern): | ||
322 | 190 | # if the pattern isalnum, implicitly use to -F for faster grep | ||
323 | 191 | fixed_string = True | ||
324 | 192 | elif ignore_case and fixed_string: | ||
325 | 193 | # GZ 2010-06-02: Fall back to regexp rather than lowercasing | ||
326 | 194 | # pattern and text which will cause pain later | ||
327 | 195 | fixed_string = False | ||
328 | 196 | pattern = re.escape(pattern) | ||
329 | 197 | |||
330 | 198 | patternc = None | ||
331 | 199 | re_flags = re.MULTILINE | ||
332 | 200 | if ignore_case: | ||
333 | 201 | re_flags |= re.IGNORECASE | ||
334 | 202 | |||
335 | 203 | if not fixed_string: | ||
336 | 204 | patternc = grep.compile_pattern(pattern, re_flags) | ||
337 | 205 | |||
338 | 206 | if color == 'always': | ||
339 | 207 | show_color = True | ||
340 | 208 | elif color == 'never': | ||
341 | 209 | show_color = False | ||
342 | 210 | elif color == 'auto': | ||
343 | 211 | show_color = termcolor.allow_color() | ||
344 | 212 | |||
345 | 213 | GrepOptions.verbose = verbose | ||
346 | 214 | GrepOptions.ignore_case = ignore_case | ||
347 | 215 | GrepOptions.no_recursive = no_recursive | ||
348 | 216 | GrepOptions.from_root = from_root | ||
349 | 217 | GrepOptions.null = null | ||
350 | 218 | GrepOptions.levels = levels | ||
351 | 219 | GrepOptions.line_number = line_number | ||
352 | 220 | GrepOptions.path_list = path_list | ||
353 | 221 | GrepOptions.revision = revision | ||
354 | 222 | GrepOptions.pattern = pattern | ||
355 | 223 | GrepOptions.include = include | ||
356 | 224 | GrepOptions.exclude = exclude | ||
357 | 225 | GrepOptions.fixed_string = fixed_string | ||
358 | 226 | GrepOptions.files_with_matches = files_with_matches | ||
359 | 227 | GrepOptions.files_without_match = files_without_match | ||
360 | 228 | GrepOptions.color = color | ||
361 | 229 | GrepOptions.diff = False | ||
362 | 230 | |||
363 | 231 | GrepOptions.eol_marker = eol_marker | ||
364 | 232 | GrepOptions.print_revno = print_revno | ||
365 | 233 | GrepOptions.patternc = patternc | ||
366 | 234 | GrepOptions.recursive = not no_recursive | ||
367 | 235 | GrepOptions.fixed_string = fixed_string | ||
368 | 236 | GrepOptions.outf = self.outf | ||
369 | 237 | GrepOptions.show_color = show_color | ||
370 | 238 | |||
371 | 239 | if diff: | ||
372 | 240 | # options not used: | ||
373 | 241 | # files_with_matches, files_without_match | ||
374 | 242 | # levels(?), line_number, from_root | ||
375 | 243 | # include, exclude | ||
376 | 244 | # These are silently ignored. | ||
377 | 245 | grep.grep_diff(GrepOptions) | ||
378 | 246 | elif revision is None: | ||
379 | 247 | grep.workingtree_grep(GrepOptions) | ||
380 | 248 | else: | ||
381 | 249 | grep.versioned_grep(GrepOptions) | ||
382 | 0 | 250 | ||
383 | === added file 'bzrlib/plugins/grep/grep.py' | |||
384 | --- bzrlib/plugins/grep/grep.py 1970-01-01 00:00:00 +0000 | |||
385 | +++ bzrlib/plugins/grep/grep.py 2012-08-03 11:45:28 +0000 | |||
386 | @@ -0,0 +1,728 @@ | |||
387 | 1 | # Copyright (C) 2010 Canonical Ltd | ||
388 | 2 | # | ||
389 | 3 | # This program is free software; you can redistribute it and/or modify | ||
390 | 4 | # it under the terms of the GNU General Public License as published by | ||
391 | 5 | # the Free Software Foundation; either version 2 of the License, or | ||
392 | 6 | # (at your option) any later version. | ||
393 | 7 | # | ||
394 | 8 | # This program is distributed in the hope that it will be useful, | ||
395 | 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
396 | 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
397 | 11 | # GNU General Public License for more details. | ||
398 | 12 | # | ||
399 | 13 | # You should have received a copy of the GNU General Public License | ||
400 | 14 | # along with this program; if not, write to the Free Software | ||
401 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
402 | 16 | |||
403 | 17 | from __future__ import absolute_import | ||
404 | 18 | |||
405 | 19 | import sys | ||
406 | 20 | |||
407 | 21 | from bzrlib.lazy_import import lazy_import | ||
408 | 22 | lazy_import(globals(), """ | ||
409 | 23 | from fnmatch import fnmatch | ||
410 | 24 | import re | ||
411 | 25 | from cStringIO import StringIO | ||
412 | 26 | |||
413 | 27 | from bzrlib.termcolor import color_string, re_color_string, FG | ||
414 | 28 | |||
415 | 29 | from bzrlib.revisionspec import ( | ||
416 | 30 | RevisionSpec, | ||
417 | 31 | RevisionSpec_revid, | ||
418 | 32 | RevisionSpec_revno, | ||
419 | 33 | ) | ||
420 | 34 | from bzrlib import ( | ||
421 | 35 | bzrdir, | ||
422 | 36 | diff, | ||
423 | 37 | errors, | ||
424 | 38 | lazy_regex, | ||
425 | 39 | osutils, | ||
426 | 40 | revision as _mod_revision, | ||
427 | 41 | trace, | ||
428 | 42 | ) | ||
429 | 43 | """) | ||
430 | 44 | |||
431 | 45 | _user_encoding = osutils.get_user_encoding() | ||
432 | 46 | |||
433 | 47 | |||
434 | 48 | class _RevisionNotLinear(Exception): | ||
435 | 49 | """Raised when a revision is not on left-hand history.""" | ||
436 | 50 | |||
437 | 51 | |||
438 | 52 | def _rev_on_mainline(rev_tuple): | ||
439 | 53 | """returns True is rev tuple is on mainline""" | ||
440 | 54 | if len(rev_tuple) == 1: | ||
441 | 55 | return True | ||
442 | 56 | return rev_tuple[1] == 0 and rev_tuple[2] == 0 | ||
443 | 57 | |||
444 | 58 | |||
445 | 59 | # NOTE: _linear_view_revisions is basided on | ||
446 | 60 | # bzrlib.log._linear_view_revisions. | ||
447 | 61 | # This should probably be a common public API | ||
448 | 62 | def _linear_view_revisions(branch, start_rev_id, end_rev_id): | ||
449 | 63 | # requires that start is older than end | ||
450 | 64 | repo = branch.repository | ||
451 | 65 | graph = repo.get_graph() | ||
452 | 66 | for revision_id in graph.iter_lefthand_ancestry( | ||
453 | 67 | end_rev_id, (_mod_revision.NULL_REVISION, )): | ||
454 | 68 | revno = branch.revision_id_to_dotted_revno(revision_id) | ||
455 | 69 | revno_str = '.'.join(str(n) for n in revno) | ||
456 | 70 | if revision_id == start_rev_id: | ||
457 | 71 | yield revision_id, revno_str, 0 | ||
458 | 72 | break | ||
459 | 73 | yield revision_id, revno_str, 0 | ||
460 | 74 | |||
461 | 75 | |||
462 | 76 | # NOTE: _graph_view_revisions is copied from | ||
463 | 77 | # bzrlib.log._graph_view_revisions. | ||
464 | 78 | # This should probably be a common public API | ||
465 | 79 | def _graph_view_revisions(branch, start_rev_id, end_rev_id, | ||
466 | 80 | rebase_initial_depths=True): | ||
467 | 81 | """Calculate revisions to view including merges, newest to oldest. | ||
468 | 82 | |||
469 | 83 | :param branch: the branch | ||
470 | 84 | :param start_rev_id: the lower revision-id | ||
471 | 85 | :param end_rev_id: the upper revision-id | ||
472 | 86 | :param rebase_initial_depth: should depths be rebased until a mainline | ||
473 | 87 | revision is found? | ||
474 | 88 | :return: An iterator of (revision_id, dotted_revno, merge_depth) tuples. | ||
475 | 89 | """ | ||
476 | 90 | # requires that start is older than end | ||
477 | 91 | view_revisions = branch.iter_merge_sorted_revisions( | ||
478 | 92 | start_revision_id=end_rev_id, stop_revision_id=start_rev_id, | ||
479 | 93 | stop_rule="with-merges") | ||
480 | 94 | if not rebase_initial_depths: | ||
481 | 95 | for (rev_id, merge_depth, revno, end_of_merge | ||
482 | 96 | ) in view_revisions: | ||
483 | 97 | yield rev_id, '.'.join(map(str, revno)), merge_depth | ||
484 | 98 | else: | ||
485 | 99 | # We're following a development line starting at a merged revision. | ||
486 | 100 | # We need to adjust depths down by the initial depth until we find | ||
487 | 101 | # a depth less than it. Then we use that depth as the adjustment. | ||
488 | 102 | # If and when we reach the mainline, depth adjustment ends. | ||
489 | 103 | depth_adjustment = None | ||
490 | 104 | for (rev_id, merge_depth, revno, end_of_merge | ||
491 | 105 | ) in view_revisions: | ||
492 | 106 | if depth_adjustment is None: | ||
493 | 107 | depth_adjustment = merge_depth | ||
494 | 108 | if depth_adjustment: | ||
495 | 109 | if merge_depth < depth_adjustment: | ||
496 | 110 | # From now on we reduce the depth adjustement, this can be | ||
497 | 111 | # surprising for users. The alternative requires two passes | ||
498 | 112 | # which breaks the fast display of the first revision | ||
499 | 113 | # though. | ||
500 | 114 | depth_adjustment = merge_depth | ||
501 | 115 | merge_depth -= depth_adjustment | ||
502 | 116 | yield rev_id, '.'.join(map(str, revno)), merge_depth | ||
503 | 117 | |||
504 | 118 | |||
505 | 119 | def compile_pattern(pattern, flags=0): | ||
506 | 120 | patternc = None | ||
507 | 121 | try: | ||
508 | 122 | # use python's re.compile as we need to catch re.error in case of bad pattern | ||
509 | 123 | lazy_regex.reset_compile() | ||
510 | 124 | patternc = re.compile(pattern, flags) | ||
511 | 125 | except re.error, e: | ||
512 | 126 | raise errors.BzrError("Invalid pattern: '%s'" % pattern) | ||
513 | 127 | return patternc | ||
514 | 128 | |||
515 | 129 | |||
516 | 130 | def is_fixed_string(s): | ||
517 | 131 | if re.match("^([A-Za-z0-9_]|\s)*$", s): | ||
518 | 132 | return True | ||
519 | 133 | return False | ||
520 | 134 | |||
521 | 135 | |||
522 | 136 | class _GrepDiffOutputter(object): | ||
523 | 137 | """Precalculate formatting based on options given for diff grep. | ||
524 | 138 | """ | ||
525 | 139 | |||
526 | 140 | def __init__(self, opts): | ||
527 | 141 | self.opts = opts | ||
528 | 142 | self.outf = opts.outf | ||
529 | 143 | if opts.show_color: | ||
530 | 144 | pat = opts.pattern.encode(_user_encoding, 'replace') | ||
531 | 145 | if opts.fixed_string: | ||
532 | 146 | self._old = pat | ||
533 | 147 | self._new = color_string(pat, FG.BOLD_RED) | ||
534 | 148 | self.get_writer = self._get_writer_fixed_highlighted | ||
535 | 149 | else: | ||
536 | 150 | flags = opts.patternc.flags | ||
537 | 151 | self._sub = re.compile(pat.join(("((?:",")+)")), flags).sub | ||
538 | 152 | self._highlight = color_string("\\1", FG.BOLD_RED) | ||
539 | 153 | self.get_writer = self._get_writer_regexp_highlighted | ||
540 | 154 | else: | ||
541 | 155 | self.get_writer = self._get_writer_plain | ||
542 | 156 | |||
543 | 157 | def get_file_header_writer(self): | ||
544 | 158 | """Get function for writing file headers""" | ||
545 | 159 | write = self.outf.write | ||
546 | 160 | eol_marker = self.opts.eol_marker | ||
547 | 161 | def _line_writer(line): | ||
548 | 162 | write(line + eol_marker) | ||
549 | 163 | def _line_writer_color(line): | ||
550 | 164 | write(FG.BOLD_MAGENTA + line + FG.NONE + eol_marker) | ||
551 | 165 | if self.opts.show_color: | ||
552 | 166 | return _line_writer_color | ||
553 | 167 | else: | ||
554 | 168 | return _line_writer | ||
555 | 169 | return _line_writer | ||
556 | 170 | |||
557 | 171 | def get_revision_header_writer(self): | ||
558 | 172 | """Get function for writing revno lines""" | ||
559 | 173 | write = self.outf.write | ||
560 | 174 | eol_marker = self.opts.eol_marker | ||
561 | 175 | def _line_writer(line): | ||
562 | 176 | write(line + eol_marker) | ||
563 | 177 | def _line_writer_color(line): | ||
564 | 178 | write(FG.BOLD_BLUE + line + FG.NONE + eol_marker) | ||
565 | 179 | if self.opts.show_color: | ||
566 | 180 | return _line_writer_color | ||
567 | 181 | else: | ||
568 | 182 | return _line_writer | ||
569 | 183 | return _line_writer | ||
570 | 184 | |||
571 | 185 | def _get_writer_plain(self): | ||
572 | 186 | """Get function for writing uncoloured output""" | ||
573 | 187 | write = self.outf.write | ||
574 | 188 | eol_marker = self.opts.eol_marker | ||
575 | 189 | def _line_writer(line): | ||
576 | 190 | write(line + eol_marker) | ||
577 | 191 | return _line_writer | ||
578 | 192 | |||
579 | 193 | def _get_writer_regexp_highlighted(self): | ||
580 | 194 | """Get function for writing output with regexp match highlighted""" | ||
581 | 195 | _line_writer = self._get_writer_plain() | ||
582 | 196 | sub, highlight = self._sub, self._highlight | ||
583 | 197 | def _line_writer_regexp_highlighted(line): | ||
584 | 198 | """Write formatted line with matched pattern highlighted""" | ||
585 | 199 | return _line_writer(line=sub(highlight, line)) | ||
586 | 200 | return _line_writer_regexp_highlighted | ||
587 | 201 | |||
588 | 202 | def _get_writer_fixed_highlighted(self): | ||
589 | 203 | """Get function for writing output with search string highlighted""" | ||
590 | 204 | _line_writer = self._get_writer_plain() | ||
591 | 205 | old, new = self._old, self._new | ||
592 | 206 | def _line_writer_fixed_highlighted(line): | ||
593 | 207 | """Write formatted line with string searched for highlighted""" | ||
594 | 208 | return _line_writer(line=line.replace(old, new)) | ||
595 | 209 | return _line_writer_fixed_highlighted | ||
596 | 210 | |||
597 | 211 | |||
598 | 212 | def grep_diff(opts): | ||
599 | 213 | wt, branch, relpath = \ | ||
600 | 214 | bzrdir.BzrDir.open_containing_tree_or_branch('.') | ||
601 | 215 | branch.lock_read() | ||
602 | 216 | try: | ||
603 | 217 | if opts.revision: | ||
604 | 218 | start_rev = opts.revision[0] | ||
605 | 219 | else: | ||
606 | 220 | # if no revision is sepcified for diff grep we grep all changesets. | ||
607 | 221 | opts.revision = [RevisionSpec.from_string('revno:1'), | ||
608 | 222 | RevisionSpec.from_string('last:1')] | ||
609 | 223 | start_rev = opts.revision[0] | ||
610 | 224 | start_revid = start_rev.as_revision_id(branch) | ||
611 | 225 | if start_revid == 'null:': | ||
612 | 226 | return | ||
613 | 227 | srevno_tuple = branch.revision_id_to_dotted_revno(start_revid) | ||
614 | 228 | if len(opts.revision) == 2: | ||
615 | 229 | end_rev = opts.revision[1] | ||
616 | 230 | end_revid = end_rev.as_revision_id(branch) | ||
617 | 231 | if end_revid is None: | ||
618 | 232 | end_revno, end_revid = branch.last_revision_info() | ||
619 | 233 | erevno_tuple = branch.revision_id_to_dotted_revno(end_revid) | ||
620 | 234 | |||
621 | 235 | grep_mainline = (_rev_on_mainline(srevno_tuple) and | ||
622 | 236 | _rev_on_mainline(erevno_tuple)) | ||
623 | 237 | |||
624 | 238 | # ensure that we go in reverse order | ||
625 | 239 | if srevno_tuple > erevno_tuple: | ||
626 | 240 | srevno_tuple, erevno_tuple = erevno_tuple, srevno_tuple | ||
627 | 241 | start_revid, end_revid = end_revid, start_revid | ||
628 | 242 | |||
629 | 243 | # Optimization: Traversing the mainline in reverse order is much | ||
630 | 244 | # faster when we don't want to look at merged revs. We try this | ||
631 | 245 | # with _linear_view_revisions. If all revs are to be grepped we | ||
632 | 246 | # use the slower _graph_view_revisions | ||
633 | 247 | if opts.levels==1 and grep_mainline: | ||
634 | 248 | given_revs = _linear_view_revisions(branch, start_revid, end_revid) | ||
635 | 249 | else: | ||
636 | 250 | given_revs = _graph_view_revisions(branch, start_revid, end_revid) | ||
637 | 251 | else: | ||
638 | 252 | # We do an optimization below. For grepping a specific revison | ||
639 | 253 | # We don't need to call _graph_view_revisions which is slow. | ||
640 | 254 | # We create the start_rev_tuple for only that specific revision. | ||
641 | 255 | # _graph_view_revisions is used only for revision range. | ||
642 | 256 | start_revno = '.'.join(map(str, srevno_tuple)) | ||
643 | 257 | start_rev_tuple = (start_revid, start_revno, 0) | ||
644 | 258 | given_revs = [start_rev_tuple] | ||
645 | 259 | repo = branch.repository | ||
646 | 260 | diff_pattern = re.compile("^[+\-].*(" + opts.pattern + ")") | ||
647 | 261 | file_pattern = re.compile("=== (modified|added|removed) file '.*'", re.UNICODE) | ||
648 | 262 | outputter = _GrepDiffOutputter(opts) | ||
649 | 263 | writeline = outputter.get_writer() | ||
650 | 264 | writerevno = outputter.get_revision_header_writer() | ||
651 | 265 | writefileheader = outputter.get_file_header_writer() | ||
652 | 266 | file_encoding = _user_encoding | ||
653 | 267 | for revid, revno, merge_depth in given_revs: | ||
654 | 268 | if opts.levels == 1 and merge_depth != 0: | ||
655 | 269 | # with level=1 show only top level | ||
656 | 270 | continue | ||
657 | 271 | |||
658 | 272 | rev_spec = RevisionSpec_revid.from_string("revid:"+revid) | ||
659 | 273 | new_rev = repo.get_revision(revid) | ||
660 | 274 | new_tree = rev_spec.as_tree(branch) | ||
661 | 275 | if len(new_rev.parent_ids) == 0: | ||
662 | 276 | ancestor_id = _mod_revision.NULL_REVISION | ||
663 | 277 | else: | ||
664 | 278 | ancestor_id = new_rev.parent_ids[0] | ||
665 | 279 | old_tree = repo.revision_tree(ancestor_id) | ||
666 | 280 | s = StringIO() | ||
667 | 281 | diff.show_diff_trees(old_tree, new_tree, s, | ||
668 | 282 | old_label='', new_label='') | ||
669 | 283 | display_revno = True | ||
670 | 284 | display_file = False | ||
671 | 285 | file_header = None | ||
672 | 286 | text = s.getvalue() | ||
673 | 287 | for line in text.splitlines(): | ||
674 | 288 | if file_pattern.search(line): | ||
675 | 289 | file_header = line | ||
676 | 290 | display_file = True | ||
677 | 291 | elif diff_pattern.search(line): | ||
678 | 292 | if display_revno: | ||
679 | 293 | writerevno("=== revno:%s ===" % (revno,)) | ||
680 | 294 | display_revno = False | ||
681 | 295 | if display_file: | ||
682 | 296 | writefileheader(" %s" % (file_header,)) | ||
683 | 297 | display_file = False | ||
684 | 298 | line = line.decode(file_encoding, 'replace') | ||
685 | 299 | writeline(" %s" % (line,)) | ||
686 | 300 | finally: | ||
687 | 301 | branch.unlock() | ||
688 | 302 | |||
689 | 303 | |||
690 | 304 | def versioned_grep(opts): | ||
691 | 305 | wt, branch, relpath = \ | ||
692 | 306 | bzrdir.BzrDir.open_containing_tree_or_branch('.') | ||
693 | 307 | branch.lock_read() | ||
694 | 308 | try: | ||
695 | 309 | start_rev = opts.revision[0] | ||
696 | 310 | start_revid = start_rev.as_revision_id(branch) | ||
697 | 311 | if start_revid is None: | ||
698 | 312 | start_rev = RevisionSpec_revno.from_string("revno:1") | ||
699 | 313 | start_revid = start_rev.as_revision_id(branch) | ||
700 | 314 | srevno_tuple = branch.revision_id_to_dotted_revno(start_revid) | ||
701 | 315 | |||
702 | 316 | if len(opts.revision) == 2: | ||
703 | 317 | end_rev = opts.revision[1] | ||
704 | 318 | end_revid = end_rev.as_revision_id(branch) | ||
705 | 319 | if end_revid is None: | ||
706 | 320 | end_revno, end_revid = branch.last_revision_info() | ||
707 | 321 | erevno_tuple = branch.revision_id_to_dotted_revno(end_revid) | ||
708 | 322 | |||
709 | 323 | grep_mainline = (_rev_on_mainline(srevno_tuple) and | ||
710 | 324 | _rev_on_mainline(erevno_tuple)) | ||
711 | 325 | |||
712 | 326 | # ensure that we go in reverse order | ||
713 | 327 | if srevno_tuple > erevno_tuple: | ||
714 | 328 | srevno_tuple, erevno_tuple = erevno_tuple, srevno_tuple | ||
715 | 329 | start_revid, end_revid = end_revid, start_revid | ||
716 | 330 | |||
717 | 331 | # Optimization: Traversing the mainline in reverse order is much | ||
718 | 332 | # faster when we don't want to look at merged revs. We try this | ||
719 | 333 | # with _linear_view_revisions. If all revs are to be grepped we | ||
720 | 334 | # use the slower _graph_view_revisions | ||
721 | 335 | if opts.levels == 1 and grep_mainline: | ||
722 | 336 | given_revs = _linear_view_revisions(branch, start_revid, end_revid) | ||
723 | 337 | else: | ||
724 | 338 | given_revs = _graph_view_revisions(branch, start_revid, end_revid) | ||
725 | 339 | else: | ||
726 | 340 | # We do an optimization below. For grepping a specific revison | ||
727 | 341 | # We don't need to call _graph_view_revisions which is slow. | ||
728 | 342 | # We create the start_rev_tuple for only that specific revision. | ||
729 | 343 | # _graph_view_revisions is used only for revision range. | ||
730 | 344 | start_revno = '.'.join(map(str, srevno_tuple)) | ||
731 | 345 | start_rev_tuple = (start_revid, start_revno, 0) | ||
732 | 346 | given_revs = [start_rev_tuple] | ||
733 | 347 | |||
734 | 348 | # GZ 2010-06-02: Shouldn't be smuggling this on opts, but easy for now | ||
735 | 349 | opts.outputter = _Outputter(opts, use_cache=True) | ||
736 | 350 | |||
737 | 351 | for revid, revno, merge_depth in given_revs: | ||
738 | 352 | if opts.levels == 1 and merge_depth != 0: | ||
739 | 353 | # with level=1 show only top level | ||
740 | 354 | continue | ||
741 | 355 | |||
742 | 356 | rev = RevisionSpec_revid.from_string("revid:"+revid) | ||
743 | 357 | tree = rev.as_tree(branch) | ||
744 | 358 | for path in opts.path_list: | ||
745 | 359 | path_for_id = osutils.pathjoin(relpath, path) | ||
746 | 360 | id = tree.path2id(path_for_id) | ||
747 | 361 | if not id: | ||
748 | 362 | trace.warning("Skipped unknown file '%s'." % path) | ||
749 | 363 | continue | ||
750 | 364 | |||
751 | 365 | if osutils.isdir(path): | ||
752 | 366 | path_prefix = path | ||
753 | 367 | dir_grep(tree, path, relpath, opts, revno, path_prefix) | ||
754 | 368 | else: | ||
755 | 369 | versioned_file_grep(tree, id, '.', path, opts, revno) | ||
756 | 370 | finally: | ||
757 | 371 | branch.unlock() | ||
758 | 372 | |||
759 | 373 | |||
760 | 374 | def workingtree_grep(opts): | ||
761 | 375 | revno = opts.print_revno = None # for working tree set revno to None | ||
762 | 376 | |||
763 | 377 | tree, branch, relpath = \ | ||
764 | 378 | bzrdir.BzrDir.open_containing_tree_or_branch('.') | ||
765 | 379 | if not tree: | ||
766 | 380 | msg = ('Cannot search working tree. Working tree not found.\n' | ||
767 | 381 | 'To search for specific revision in history use the -r option.') | ||
768 | 382 | raise errors.BzrCommandError(msg) | ||
769 | 383 | |||
770 | 384 | # GZ 2010-06-02: Shouldn't be smuggling this on opts, but easy for now | ||
771 | 385 | opts.outputter = _Outputter(opts) | ||
772 | 386 | |||
773 | 387 | tree.lock_read() | ||
774 | 388 | try: | ||
775 | 389 | for path in opts.path_list: | ||
776 | 390 | if osutils.isdir(path): | ||
777 | 391 | path_prefix = path | ||
778 | 392 | dir_grep(tree, path, relpath, opts, revno, path_prefix) | ||
779 | 393 | else: | ||
780 | 394 | _file_grep(open(path).read(), path, opts, revno) | ||
781 | 395 | finally: | ||
782 | 396 | tree.unlock() | ||
783 | 397 | |||
784 | 398 | |||
785 | 399 | def _skip_file(include, exclude, path): | ||
786 | 400 | if include and not _path_in_glob_list(path, include): | ||
787 | 401 | return True | ||
788 | 402 | if exclude and _path_in_glob_list(path, exclude): | ||
789 | 403 | return True | ||
790 | 404 | return False | ||
791 | 405 | |||
792 | 406 | |||
793 | 407 | def dir_grep(tree, path, relpath, opts, revno, path_prefix): | ||
794 | 408 | # setup relpath to open files relative to cwd | ||
795 | 409 | rpath = relpath | ||
796 | 410 | if relpath: | ||
797 | 411 | rpath = osutils.pathjoin('..',relpath) | ||
798 | 412 | |||
799 | 413 | from_dir = osutils.pathjoin(relpath, path) | ||
800 | 414 | if opts.from_root: | ||
801 | 415 | # start searching recursively from root | ||
802 | 416 | from_dir=None | ||
803 | 417 | recursive=True | ||
804 | 418 | |||
805 | 419 | to_grep = [] | ||
806 | 420 | to_grep_append = to_grep.append | ||
807 | 421 | # GZ 2010-06-05: The cache dict used to be recycled every call to dir_grep | ||
808 | 422 | # and hits manually refilled. Could do this again if it was | ||
809 | 423 | # for a good reason, otherwise cache might want purging. | ||
810 | 424 | outputter = opts.outputter | ||
811 | 425 | for fp, fc, fkind, fid, entry in tree.list_files(include_root=False, | ||
812 | 426 | from_dir=from_dir, recursive=opts.recursive): | ||
813 | 427 | |||
814 | 428 | if _skip_file(opts.include, opts.exclude, fp): | ||
815 | 429 | continue | ||
816 | 430 | |||
817 | 431 | if fc == 'V' and fkind == 'file': | ||
818 | 432 | if revno != None: | ||
819 | 433 | # If old result is valid, print results immediately. | ||
820 | 434 | # Otherwise, add file info to to_grep so that the | ||
821 | 435 | # loop later will get chunks and grep them | ||
822 | 436 | cache_id = tree.get_file_revision(fid) | ||
823 | 437 | if cache_id in outputter.cache: | ||
824 | 438 | # GZ 2010-06-05: Not really sure caching and re-outputting | ||
825 | 439 | # the old path is really the right thing, | ||
826 | 440 | # but it's what the old code seemed to do | ||
827 | 441 | outputter.write_cached_lines(cache_id, revno) | ||
828 | 442 | else: | ||
829 | 443 | to_grep_append((fid, (fp, fid))) | ||
830 | 444 | else: | ||
831 | 445 | # we are grepping working tree. | ||
832 | 446 | if from_dir is None: | ||
833 | 447 | from_dir = '.' | ||
834 | 448 | |||
835 | 449 | path_for_file = osutils.pathjoin(tree.basedir, from_dir, fp) | ||
836 | 450 | if opts.files_with_matches or opts.files_without_match: | ||
837 | 451 | # Optimize for wtree list-only as we don't need to read the | ||
838 | 452 | # entire file | ||
839 | 453 | file = open(path_for_file, 'r', buffering=4096) | ||
840 | 454 | _file_grep_list_only_wtree(file, fp, opts, path_prefix) | ||
841 | 455 | else: | ||
842 | 456 | file_text = open(path_for_file, 'r').read() | ||
843 | 457 | _file_grep(file_text, fp, opts, revno, path_prefix) | ||
844 | 458 | |||
845 | 459 | if revno != None: # grep versioned files | ||
846 | 460 | for (path, fid), chunks in tree.iter_files_bytes(to_grep): | ||
847 | 461 | path = _make_display_path(relpath, path) | ||
848 | 462 | _file_grep(chunks[0], path, opts, revno, path_prefix, | ||
849 | 463 | tree.get_file_revision(fid, path)) | ||
850 | 464 | |||
851 | 465 | |||
852 | 466 | def _make_display_path(relpath, path): | ||
853 | 467 | """Return path string relative to user cwd. | ||
854 | 468 | |||
855 | 469 | Take tree's 'relpath' and user supplied 'path', and return path | ||
856 | 470 | that can be displayed to the user. | ||
857 | 471 | """ | ||
858 | 472 | if relpath: | ||
859 | 473 | # update path so to display it w.r.t cwd | ||
860 | 474 | # handle windows slash separator | ||
861 | 475 | path = osutils.normpath(osutils.pathjoin(relpath, path)) | ||
862 | 476 | path = path.replace('\\', '/') | ||
863 | 477 | path = path.replace(relpath + '/', '', 1) | ||
864 | 478 | return path | ||
865 | 479 | |||
866 | 480 | |||
867 | 481 | def versioned_file_grep(tree, id, relpath, path, opts, revno, path_prefix = None): | ||
868 | 482 | """Create a file object for the specified id and pass it on to _file_grep. | ||
869 | 483 | """ | ||
870 | 484 | |||
871 | 485 | path = _make_display_path(relpath, path) | ||
872 | 486 | file_text = tree.get_file_text(id) | ||
873 | 487 | _file_grep(file_text, path, opts, revno, path_prefix) | ||
874 | 488 | |||
875 | 489 | |||
876 | 490 | def _path_in_glob_list(path, glob_list): | ||
877 | 491 | for glob in glob_list: | ||
878 | 492 | if fnmatch(path, glob): | ||
879 | 493 | return True | ||
880 | 494 | return False | ||
881 | 495 | |||
882 | 496 | |||
883 | 497 | def _file_grep_list_only_wtree(file, path, opts, path_prefix=None): | ||
884 | 498 | # test and skip binary files | ||
885 | 499 | if '\x00' in file.read(1024): | ||
886 | 500 | if opts.verbose: | ||
887 | 501 | trace.warning("Binary file '%s' skipped." % path) | ||
888 | 502 | return | ||
889 | 503 | |||
890 | 504 | file.seek(0) # search from beginning | ||
891 | 505 | |||
892 | 506 | found = False | ||
893 | 507 | if opts.fixed_string: | ||
894 | 508 | pattern = opts.pattern.encode(_user_encoding, 'replace') | ||
895 | 509 | for line in file: | ||
896 | 510 | if pattern in line: | ||
897 | 511 | found = True | ||
898 | 512 | break | ||
899 | 513 | else: # not fixed_string | ||
900 | 514 | for line in file: | ||
901 | 515 | if opts.patternc.search(line): | ||
902 | 516 | found = True | ||
903 | 517 | break | ||
904 | 518 | |||
905 | 519 | if (opts.files_with_matches and found) or \ | ||
906 | 520 | (opts.files_without_match and not found): | ||
907 | 521 | if path_prefix and path_prefix != '.': | ||
908 | 522 | # user has passed a dir arg, show that as result prefix | ||
909 | 523 | path = osutils.pathjoin(path_prefix, path) | ||
910 | 524 | opts.outputter.get_writer(path, None, None)() | ||
911 | 525 | |||
912 | 526 | |||
913 | 527 | class _Outputter(object): | ||
914 | 528 | """Precalculate formatting based on options given | ||
915 | 529 | |||
916 | 530 | The idea here is to do this work only once per run, and finally return a | ||
917 | 531 | function that will do the minimum amount possible for each match. | ||
918 | 532 | """ | ||
919 | 533 | def __init__(self, opts, use_cache=False): | ||
920 | 534 | self.outf = opts.outf | ||
921 | 535 | if use_cache: | ||
922 | 536 | # self.cache is used to cache results for dir grep based on fid. | ||
923 | 537 | # If the fid is does not change between results, it means that | ||
924 | 538 | # the result will be the same apart from revno. In such a case | ||
925 | 539 | # we avoid getting file chunks from repo and grepping. The result | ||
926 | 540 | # is just printed by replacing old revno with new one. | ||
927 | 541 | self.cache = {} | ||
928 | 542 | else: | ||
929 | 543 | self.cache = None | ||
930 | 544 | no_line = opts.files_with_matches or opts.files_without_match | ||
931 | 545 | |||
932 | 546 | if opts.show_color: | ||
933 | 547 | pat = opts.pattern.encode(_user_encoding, 'replace') | ||
934 | 548 | if no_line: | ||
935 | 549 | self.get_writer = self._get_writer_plain | ||
936 | 550 | elif opts.fixed_string: | ||
937 | 551 | self._old = pat | ||
938 | 552 | self._new = color_string(pat, FG.BOLD_RED) | ||
939 | 553 | self.get_writer = self._get_writer_fixed_highlighted | ||
940 | 554 | else: | ||
941 | 555 | flags = opts.patternc.flags | ||
942 | 556 | self._sub = re.compile(pat.join(("((?:",")+)")), flags).sub | ||
943 | 557 | self._highlight = color_string("\\1", FG.BOLD_RED) | ||
944 | 558 | self.get_writer = self._get_writer_regexp_highlighted | ||
945 | 559 | path_start = FG.MAGENTA | ||
946 | 560 | path_end = FG.NONE | ||
947 | 561 | sep = color_string(':', FG.BOLD_CYAN) | ||
948 | 562 | rev_sep = color_string('~', FG.BOLD_YELLOW) | ||
949 | 563 | else: | ||
950 | 564 | self.get_writer = self._get_writer_plain | ||
951 | 565 | path_start = path_end = "" | ||
952 | 566 | sep = ":" | ||
953 | 567 | rev_sep = "~" | ||
954 | 568 | |||
955 | 569 | parts = [path_start, "%(path)s"] | ||
956 | 570 | if opts.print_revno: | ||
957 | 571 | parts.extend([rev_sep, "%(revno)s"]) | ||
958 | 572 | self._format_initial = "".join(parts) | ||
959 | 573 | parts = [] | ||
960 | 574 | if no_line: | ||
961 | 575 | if not opts.print_revno: | ||
962 | 576 | parts.append(path_end) | ||
963 | 577 | else: | ||
964 | 578 | if opts.line_number: | ||
965 | 579 | parts.extend([sep, "%(lineno)s"]) | ||
966 | 580 | parts.extend([sep, "%(line)s"]) | ||
967 | 581 | parts.append(opts.eol_marker) | ||
968 | 582 | self._format_perline = "".join(parts) | ||
969 | 583 | |||
970 | 584 | def _get_writer_plain(self, path, revno, cache_id): | ||
971 | 585 | """Get function for writing uncoloured output""" | ||
972 | 586 | per_line = self._format_perline | ||
973 | 587 | start = self._format_initial % {"path":path, "revno":revno} | ||
974 | 588 | write = self.outf.write | ||
975 | 589 | if self.cache is not None and cache_id is not None: | ||
976 | 590 | result_list = [] | ||
977 | 591 | self.cache[cache_id] = path, result_list | ||
978 | 592 | add_to_cache = result_list.append | ||
979 | 593 | def _line_cache_and_writer(**kwargs): | ||
980 | 594 | """Write formatted line and cache arguments""" | ||
981 | 595 | end = per_line % kwargs | ||
982 | 596 | add_to_cache(end) | ||
983 | 597 | write(start + end) | ||
984 | 598 | return _line_cache_and_writer | ||
985 | 599 | def _line_writer(**kwargs): | ||
986 | 600 | """Write formatted line from arguments given by underlying opts""" | ||
987 | 601 | write(start + per_line % kwargs) | ||
988 | 602 | return _line_writer | ||
989 | 603 | |||
990 | 604 | def write_cached_lines(self, cache_id, revno): | ||
991 | 605 | """Write cached results out again for new revision""" | ||
992 | 606 | cached_path, cached_matches = self.cache[cache_id] | ||
993 | 607 | start = self._format_initial % {"path":cached_path, "revno":revno} | ||
994 | 608 | write = self.outf.write | ||
995 | 609 | for end in cached_matches: | ||
996 | 610 | write(start + end) | ||
997 | 611 | |||
998 | 612 | def _get_writer_regexp_highlighted(self, path, revno, cache_id): | ||
999 | 613 | """Get function for writing output with regexp match highlighted""" | ||
1000 | 614 | _line_writer = self._get_writer_plain(path, revno, cache_id) | ||
1001 | 615 | sub, highlight = self._sub, self._highlight | ||
1002 | 616 | def _line_writer_regexp_highlighted(line, **kwargs): | ||
1003 | 617 | """Write formatted line with matched pattern highlighted""" | ||
1004 | 618 | return _line_writer(line=sub(highlight, line), **kwargs) | ||
1005 | 619 | return _line_writer_regexp_highlighted | ||
1006 | 620 | |||
1007 | 621 | def _get_writer_fixed_highlighted(self, path, revno, cache_id): | ||
1008 | 622 | """Get function for writing output with search string highlighted""" | ||
1009 | 623 | _line_writer = self._get_writer_plain(path, revno, cache_id) | ||
1010 | 624 | old, new = self._old, self._new | ||
1011 | 625 | def _line_writer_fixed_highlighted(line, **kwargs): | ||
1012 | 626 | """Write formatted line with string searched for highlighted""" | ||
1013 | 627 | return _line_writer(line=line.replace(old, new), **kwargs) | ||
1014 | 628 | return _line_writer_fixed_highlighted | ||
1015 | 629 | |||
1016 | 630 | |||
1017 | 631 | def _file_grep(file_text, path, opts, revno, path_prefix=None, cache_id=None): | ||
1018 | 632 | # test and skip binary files | ||
1019 | 633 | if '\x00' in file_text[:1024]: | ||
1020 | 634 | if opts.verbose: | ||
1021 | 635 | trace.warning("Binary file '%s' skipped." % path) | ||
1022 | 636 | return | ||
1023 | 637 | |||
1024 | 638 | if path_prefix and path_prefix != '.': | ||
1025 | 639 | # user has passed a dir arg, show that as result prefix | ||
1026 | 640 | path = osutils.pathjoin(path_prefix, path) | ||
1027 | 641 | |||
1028 | 642 | # GZ 2010-06-07: There's no actual guarentee the file contents will be in | ||
1029 | 643 | # the user encoding, but we have to guess something and it | ||
1030 | 644 | # is a reasonable default without a better mechanism. | ||
1031 | 645 | file_encoding = _user_encoding | ||
1032 | 646 | pattern = opts.pattern.encode(_user_encoding, 'replace') | ||
1033 | 647 | |||
1034 | 648 | writeline = opts.outputter.get_writer(path, revno, cache_id) | ||
1035 | 649 | |||
1036 | 650 | if opts.files_with_matches or opts.files_without_match: | ||
1037 | 651 | if opts.fixed_string: | ||
1038 | 652 | if sys.platform > (2, 5): | ||
1039 | 653 | found = pattern in file_text | ||
1040 | 654 | else: | ||
1041 | 655 | for line in file_text.splitlines(): | ||
1042 | 656 | if pattern in line: | ||
1043 | 657 | found = True | ||
1044 | 658 | break | ||
1045 | 659 | else: | ||
1046 | 660 | found = False | ||
1047 | 661 | else: | ||
1048 | 662 | search = opts.patternc.search | ||
1049 | 663 | if "$" not in pattern: | ||
1050 | 664 | found = search(file_text) is not None | ||
1051 | 665 | else: | ||
1052 | 666 | for line in file_text.splitlines(): | ||
1053 | 667 | if search(line): | ||
1054 | 668 | found = True | ||
1055 | 669 | break | ||
1056 | 670 | else: | ||
1057 | 671 | found = False | ||
1058 | 672 | if (opts.files_with_matches and found) or \ | ||
1059 | 673 | (opts.files_without_match and not found): | ||
1060 | 674 | writeline() | ||
1061 | 675 | elif opts.fixed_string: | ||
1062 | 676 | # Fast path for no match, search through the entire file at once rather | ||
1063 | 677 | # than a line at a time. However, we don't want this without Python 2.5 | ||
1064 | 678 | # as the quick string search algorithm wasn't implemented till then: | ||
1065 | 679 | # <http://effbot.org/zone/stringlib.htm> | ||
1066 | 680 | if sys.version_info > (2, 5): | ||
1067 | 681 | i = file_text.find(pattern) | ||
1068 | 682 | if i == -1: | ||
1069 | 683 | return | ||
1070 | 684 | b = file_text.rfind("\n", 0, i) + 1 | ||
1071 | 685 | if opts.line_number: | ||
1072 | 686 | start = file_text.count("\n", 0, b) + 1 | ||
1073 | 687 | file_text = file_text[b:] | ||
1074 | 688 | else: | ||
1075 | 689 | start = 1 | ||
1076 | 690 | if opts.line_number: | ||
1077 | 691 | for index, line in enumerate(file_text.splitlines()): | ||
1078 | 692 | if pattern in line: | ||
1079 | 693 | line = line.decode(file_encoding, 'replace') | ||
1080 | 694 | writeline(lineno=index+start, line=line) | ||
1081 | 695 | else: | ||
1082 | 696 | for line in file_text.splitlines(): | ||
1083 | 697 | if pattern in line: | ||
1084 | 698 | line = line.decode(file_encoding, 'replace') | ||
1085 | 699 | writeline(line=line) | ||
1086 | 700 | else: | ||
1087 | 701 | # Fast path on no match, the re module avoids bad behaviour in most | ||
1088 | 702 | # standard cases, but perhaps could try and detect backtracking | ||
1089 | 703 | # patterns here and avoid whole text search in those cases | ||
1090 | 704 | search = opts.patternc.search | ||
1091 | 705 | if "$" not in pattern: | ||
1092 | 706 | # GZ 2010-06-05: Grr, re.MULTILINE can't save us when searching | ||
1093 | 707 | # through revisions as bazaar returns binary mode | ||
1094 | 708 | # and trailing \r breaks $ as line ending match | ||
1095 | 709 | m = search(file_text) | ||
1096 | 710 | if m is None: | ||
1097 | 711 | return | ||
1098 | 712 | b = file_text.rfind("\n", 0, m.start()) + 1 | ||
1099 | 713 | if opts.line_number: | ||
1100 | 714 | start = file_text.count("\n", 0, b) + 1 | ||
1101 | 715 | file_text = file_text[b:] | ||
1102 | 716 | else: | ||
1103 | 717 | start = 1 | ||
1104 | 718 | if opts.line_number: | ||
1105 | 719 | for index, line in enumerate(file_text.splitlines()): | ||
1106 | 720 | if search(line): | ||
1107 | 721 | line = line.decode(file_encoding, 'replace') | ||
1108 | 722 | writeline(lineno=index+start, line=line) | ||
1109 | 723 | else: | ||
1110 | 724 | for line in file_text.splitlines(): | ||
1111 | 725 | if search(line): | ||
1112 | 726 | line = line.decode(file_encoding, 'replace') | ||
1113 | 727 | writeline(line=line) | ||
1114 | 728 | |||
1115 | 0 | 729 | ||
1116 | === added file 'bzrlib/plugins/grep/test_grep.py' | |||
1117 | --- bzrlib/plugins/grep/test_grep.py 1970-01-01 00:00:00 +0000 | |||
1118 | +++ bzrlib/plugins/grep/test_grep.py 2012-08-03 11:45:28 +0000 | |||
1119 | @@ -0,0 +1,2254 @@ | |||
1120 | 1 | # Copyright (C) 2010 Canonical Ltd | ||
1121 | 2 | # | ||
1122 | 3 | # This program is free software; you can redistribute it and/or modify | ||
1123 | 4 | # it under the terms of the GNU General Public License as published by | ||
1124 | 5 | # the Free Software Foundation; either version 2 of the License, or | ||
1125 | 6 | # (at your option) any later version. | ||
1126 | 7 | # | ||
1127 | 8 | # This program is distributed in the hope that it will be useful, | ||
1128 | 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1129 | 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1130 | 11 | # GNU General Public License for more details. | ||
1131 | 12 | # | ||
1132 | 13 | # You should have received a copy of the GNU General Public License | ||
1133 | 14 | # along with this program; if not, write to the Free Software | ||
1134 | 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
1135 | 16 | |||
1136 | 17 | from __future__ import absolute_import | ||
1137 | 18 | |||
1138 | 19 | import os | ||
1139 | 20 | import re | ||
1140 | 21 | import unicodedata as ud | ||
1141 | 22 | |||
1142 | 23 | from bzrlib import tests, osutils | ||
1143 | 24 | from bzrlib.termcolor import color_string, FG | ||
1144 | 25 | |||
1145 | 26 | from bzrlib.tests.features import ( | ||
1146 | 27 | ColorFeature, | ||
1147 | 28 | UnicodeFilenameFeature, | ||
1148 | 29 | ) | ||
1149 | 30 | |||
1150 | 31 | # NOTE: As bzr-grep optimizes PATTERN search to -F/--fixed-string | ||
1151 | 32 | # for patterns that are not alphanumeric+whitespace, we test grep | ||
1152 | 33 | # specfically with patterns that have special characters so that | ||
1153 | 34 | # regex path is tested. alphanumeric patterns test the -F path. | ||
1154 | 35 | |||
1155 | 36 | class GrepTestBase(tests.TestCaseWithTransport): | ||
1156 | 37 | """Base class for testing grep. | ||
1157 | 38 | |||
1158 | 39 | Provides support methods for creating directory and file revisions. | ||
1159 | 40 | """ | ||
1160 | 41 | _reflags = re.MULTILINE|re.DOTALL | ||
1161 | 42 | |||
1162 | 43 | def _mk_file(self, path, line_prefix, total_lines, versioned): | ||
1163 | 44 | text='' | ||
1164 | 45 | for i in range(total_lines): | ||
1165 | 46 | text += line_prefix + str(i+1) + "\n" | ||
1166 | 47 | |||
1167 | 48 | open(path, 'w').write(text) | ||
1168 | 49 | if versioned: | ||
1169 | 50 | self.run_bzr(['add', path]) | ||
1170 | 51 | self.run_bzr(['ci', '-m', '"' + path + '"']) | ||
1171 | 52 | |||
1172 | 53 | def _update_file(self, path, text, checkin=True): | ||
1173 | 54 | """append text to file 'path' and check it in""" | ||
1174 | 55 | open(path, 'a').write(text) | ||
1175 | 56 | if checkin: | ||
1176 | 57 | self.run_bzr(['ci', path, '-m', '"' + path + '"']) | ||
1177 | 58 | |||
1178 | 59 | def _mk_unknown_file(self, path, line_prefix='line', total_lines=10): | ||
1179 | 60 | self._mk_file(path, line_prefix, total_lines, versioned=False) | ||
1180 | 61 | |||
1181 | 62 | def _mk_versioned_file(self, path, line_prefix='line', total_lines=10): | ||
1182 | 63 | self._mk_file(path, line_prefix, total_lines, versioned=True) | ||
1183 | 64 | |||
1184 | 65 | def _mk_dir(self, path, versioned): | ||
1185 | 66 | os.mkdir(path) | ||
1186 | 67 | if versioned: | ||
1187 | 68 | self.run_bzr(['add', path]) | ||
1188 | 69 | self.run_bzr(['ci', '-m', '"' + path + '"']) | ||
1189 | 70 | |||
1190 | 71 | def _mk_unknown_dir(self, path): | ||
1191 | 72 | self._mk_dir(path, versioned=False) | ||
1192 | 73 | |||
1193 | 74 | def _mk_versioned_dir(self, path): | ||
1194 | 75 | self._mk_dir(path, versioned=True) | ||
1195 | 76 | |||
1196 | 77 | |||
1197 | 78 | class TestGrep(GrepTestBase): | ||
1198 | 79 | """Core functional tests for grep.""" | ||
1199 | 80 | |||
1200 | 81 | def test_basic_unknown_file(self): | ||
1201 | 82 | """Search for pattern in specfic file. | ||
1202 | 83 | |||
1203 | 84 | If specified file is unknown, grep it anyway.""" | ||
1204 | 85 | wd = 'foobar0' | ||
1205 | 86 | self.make_branch_and_tree(wd) | ||
1206 | 87 | os.chdir(wd) | ||
1207 | 88 | self._mk_unknown_file('file0.txt') | ||
1208 | 89 | |||
1209 | 90 | out, err = self.run_bzr(['grep', 'line1', 'file0.txt']) | ||
1210 | 91 | self.assertContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
1211 | 92 | self.assertEqual(len(out.splitlines()), 2) # finds line1 and line10 | ||
1212 | 93 | |||
1213 | 94 | out, err = self.run_bzr(['grep', 'line\d+', 'file0.txt']) | ||
1214 | 95 | self.assertContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
1215 | 96 | self.assertEqual(len(out.splitlines()), 10) | ||
1216 | 97 | |||
1217 | 98 | # unknown file is not grepped unless explicitely specified | ||
1218 | 99 | out, err = self.run_bzr(['grep', 'line1']) | ||
1219 | 100 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1220 | 101 | self.assertEqual(len(out.splitlines()), 0) | ||
1221 | 102 | |||
1222 | 103 | # unknown file is not grepped unless explicitely specified | ||
1223 | 104 | out, err = self.run_bzr(['grep', 'line1$']) | ||
1224 | 105 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1225 | 106 | self.assertEqual(len(out.splitlines()), 0) | ||
1226 | 107 | |||
1227 | 108 | def test_ver_basic_file(self): | ||
1228 | 109 | """(versioned) Search for pattern in specfic file. | ||
1229 | 110 | """ | ||
1230 | 111 | wd = 'foobar0' | ||
1231 | 112 | self.make_branch_and_tree(wd) | ||
1232 | 113 | os.chdir(wd) | ||
1233 | 114 | self._mk_versioned_file('file0.txt') | ||
1234 | 115 | |||
1235 | 116 | out, err = self.run_bzr(['grep', '-r', '1', 'line1', 'file0.txt']) | ||
1236 | 117 | self.assertContainsRe(out, "file0.txt~1:line1", flags=TestGrep._reflags) | ||
1237 | 118 | self.assertEqual(len(out.splitlines()), 2) # finds line1 and line10 | ||
1238 | 119 | |||
1239 | 120 | out, err = self.run_bzr(['grep', '-r', '1', 'line[0-9]$', 'file0.txt']) | ||
1240 | 121 | self.assertContainsRe(out, "file0.txt~1:line1", flags=TestGrep._reflags) | ||
1241 | 122 | self.assertEqual(len(out.splitlines()), 9) | ||
1242 | 123 | |||
1243 | 124 | # finds all the lines | ||
1244 | 125 | out, err = self.run_bzr(['grep', '-r', '1', 'line[0-9]', 'file0.txt']) | ||
1245 | 126 | self.assertContainsRe(out, "file0.txt~1:line1", flags=TestGrep._reflags) | ||
1246 | 127 | self.assertEqual(len(out.splitlines()), 10) | ||
1247 | 128 | |||
1248 | 129 | def test_wtree_basic_file(self): | ||
1249 | 130 | """(wtree) Search for pattern in specfic file. | ||
1250 | 131 | """ | ||
1251 | 132 | wd = 'foobar0' | ||
1252 | 133 | self.make_branch_and_tree(wd) | ||
1253 | 134 | os.chdir(wd) | ||
1254 | 135 | self._mk_versioned_file('file0.txt') | ||
1255 | 136 | self._update_file('file0.txt', 'ABC\n', checkin=False) | ||
1256 | 137 | |||
1257 | 138 | out, err = self.run_bzr(['grep', 'ABC', 'file0.txt']) | ||
1258 | 139 | self.assertContainsRe(out, "file0.txt:ABC", flags=TestGrep._reflags) | ||
1259 | 140 | self.assertEqual(len(out.splitlines()), 1) | ||
1260 | 141 | |||
1261 | 142 | out, err = self.run_bzr(['grep', '[A-Z]{3}', 'file0.txt']) | ||
1262 | 143 | self.assertContainsRe(out, "file0.txt:ABC", flags=TestGrep._reflags) | ||
1263 | 144 | self.assertEqual(len(out.splitlines()), 1) | ||
1264 | 145 | |||
1265 | 146 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'ABC', 'file0.txt']) | ||
1266 | 147 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1267 | 148 | self.assertEqual(len(out.splitlines()), 0) | ||
1268 | 149 | |||
1269 | 150 | out, err = self.run_bzr(['grep', '-r', 'last:1', '[A-Z]{3}', 'file0.txt']) | ||
1270 | 151 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1271 | 152 | self.assertEqual(len(out.splitlines()), 0) | ||
1272 | 153 | |||
1273 | 154 | def test_ver_basic_include(self): | ||
1274 | 155 | """(versioned) Ensure that -I flag is respected. | ||
1275 | 156 | """ | ||
1276 | 157 | wd = 'foobar0' | ||
1277 | 158 | self.make_branch_and_tree(wd) | ||
1278 | 159 | os.chdir(wd) | ||
1279 | 160 | self._mk_versioned_file('file0.aa') | ||
1280 | 161 | self._mk_versioned_file('file0.bb') | ||
1281 | 162 | self._mk_versioned_file('file0.cc') | ||
1282 | 163 | |||
1283 | 164 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1284 | 165 | '--include', '*.aa', '--include', '*.bb', 'line1']) | ||
1285 | 166 | self.assertContainsRe(out, "file0.aa~.:line1", flags=TestGrep._reflags) | ||
1286 | 167 | self.assertContainsRe(out, "file0.bb~.:line1", flags=TestGrep._reflags) | ||
1287 | 168 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1288 | 169 | # two lines each (line1, line10) from file0.aa and file0.bb | ||
1289 | 170 | self.assertEqual(len(out.splitlines()), 4) | ||
1290 | 171 | |||
1291 | 172 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1292 | 173 | '--include', '*.aa', '--include', '*.bb', 'line1$']) | ||
1293 | 174 | self.assertContainsRe(out, "file0.aa~.:line1", flags=TestGrep._reflags) | ||
1294 | 175 | self.assertContainsRe(out, "file0.bb~.:line1", flags=TestGrep._reflags) | ||
1295 | 176 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1296 | 177 | # one lines each (line1) from file0.aa and file0.bb | ||
1297 | 178 | self.assertEqual(len(out.splitlines()), 2) | ||
1298 | 179 | |||
1299 | 180 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1300 | 181 | '-I', '*.aa', '-I', '*.bb', 'line1']) | ||
1301 | 182 | self.assertContainsRe(out, "file0.aa~.:line1", flags=TestGrep._reflags) | ||
1302 | 183 | self.assertContainsRe(out, "file0.bb~.:line1", flags=TestGrep._reflags) | ||
1303 | 184 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1304 | 185 | # two lines each (line1, line10) from file0.aa and file0.bb | ||
1305 | 186 | self.assertEqual(len(out.splitlines()), 4) | ||
1306 | 187 | |||
1307 | 188 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1308 | 189 | '-I', '*.aa', '-I', '*.bb', 'line1$']) | ||
1309 | 190 | self.assertContainsRe(out, "file0.aa~.:line1", flags=TestGrep._reflags) | ||
1310 | 191 | self.assertContainsRe(out, "file0.bb~.:line1", flags=TestGrep._reflags) | ||
1311 | 192 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1312 | 193 | # one lines each (line1) from file0.aa and file0.bb | ||
1313 | 194 | self.assertEqual(len(out.splitlines()), 2) | ||
1314 | 195 | |||
1315 | 196 | def test_wtree_basic_include(self): | ||
1316 | 197 | """(wtree) Ensure that --include flag is respected. | ||
1317 | 198 | """ | ||
1318 | 199 | wd = 'foobar0' | ||
1319 | 200 | self.make_branch_and_tree(wd) | ||
1320 | 201 | os.chdir(wd) | ||
1321 | 202 | self._mk_versioned_file('file0.aa') | ||
1322 | 203 | self._mk_versioned_file('file0.bb') | ||
1323 | 204 | self._mk_versioned_file('file0.cc') | ||
1324 | 205 | |||
1325 | 206 | out, err = self.run_bzr(['grep', '--include', '*.aa', | ||
1326 | 207 | '--include', '*.bb', 'line1']) | ||
1327 | 208 | self.assertContainsRe(out, "file0.aa:line1", flags=TestGrep._reflags) | ||
1328 | 209 | self.assertContainsRe(out, "file0.bb:line1", flags=TestGrep._reflags) | ||
1329 | 210 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1330 | 211 | # two lines each (line1, line10) from file0.aa and file0.bb | ||
1331 | 212 | self.assertEqual(len(out.splitlines()), 4) | ||
1332 | 213 | |||
1333 | 214 | out, err = self.run_bzr(['grep', '--include', '*.aa', | ||
1334 | 215 | '--include', '*.bb', 'line1$']) | ||
1335 | 216 | self.assertContainsRe(out, "file0.aa:line1", flags=TestGrep._reflags) | ||
1336 | 217 | self.assertContainsRe(out, "file0.bb:line1", flags=TestGrep._reflags) | ||
1337 | 218 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1338 | 219 | # one line each (line1) from file0.aa and file0.bb | ||
1339 | 220 | self.assertEqual(len(out.splitlines()), 2) | ||
1340 | 221 | |||
1341 | 222 | def test_ver_basic_exclude(self): | ||
1342 | 223 | """(versioned) Ensure that --exclude flag is respected. | ||
1343 | 224 | """ | ||
1344 | 225 | wd = 'foobar0' | ||
1345 | 226 | self.make_branch_and_tree(wd) | ||
1346 | 227 | os.chdir(wd) | ||
1347 | 228 | self._mk_versioned_file('file0.aa') | ||
1348 | 229 | self._mk_versioned_file('file0.bb') | ||
1349 | 230 | self._mk_versioned_file('file0.cc') | ||
1350 | 231 | |||
1351 | 232 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1352 | 233 | '--exclude', '*.cc', 'line1']) | ||
1353 | 234 | self.assertContainsRe(out, "file0.aa~.:line1$", flags=TestGrep._reflags) | ||
1354 | 235 | self.assertContainsRe(out, "file0.bb~.:line1$", flags=TestGrep._reflags) | ||
1355 | 236 | self.assertContainsRe(out, "file0.aa~.:line10", flags=TestGrep._reflags) | ||
1356 | 237 | self.assertContainsRe(out, "file0.bb~.:line10", flags=TestGrep._reflags) | ||
1357 | 238 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1358 | 239 | # two lines each (line1, line10) from file0.aa and file0.bb | ||
1359 | 240 | self.assertEqual(len(out.splitlines()), 4) | ||
1360 | 241 | |||
1361 | 242 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1362 | 243 | '--exclude', '*.cc', 'line1$']) | ||
1363 | 244 | self.assertContainsRe(out, "file0.aa~.:line1", flags=TestGrep._reflags) | ||
1364 | 245 | self.assertContainsRe(out, "file0.bb~.:line1", flags=TestGrep._reflags) | ||
1365 | 246 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1366 | 247 | # one line each (line1) from file0.aa and file0.bb | ||
1367 | 248 | self.assertEqual(len(out.splitlines()), 2) | ||
1368 | 249 | |||
1369 | 250 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1370 | 251 | '-X', '*.cc', 'line1']) | ||
1371 | 252 | self.assertContainsRe(out, "file0.aa~.:line1", flags=TestGrep._reflags) | ||
1372 | 253 | self.assertContainsRe(out, "file0.bb~.:line1", flags=TestGrep._reflags) | ||
1373 | 254 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1374 | 255 | # two lines each (line1, line10) from file0.aa and file0.bb | ||
1375 | 256 | self.assertEqual(len(out.splitlines()), 4) | ||
1376 | 257 | |||
1377 | 258 | def test_wtree_basic_exclude(self): | ||
1378 | 259 | """(wtree) Ensure that --exclude flag is respected. | ||
1379 | 260 | """ | ||
1380 | 261 | wd = 'foobar0' | ||
1381 | 262 | self.make_branch_and_tree(wd) | ||
1382 | 263 | os.chdir(wd) | ||
1383 | 264 | self._mk_versioned_file('file0.aa') | ||
1384 | 265 | self._mk_versioned_file('file0.bb') | ||
1385 | 266 | self._mk_versioned_file('file0.cc') | ||
1386 | 267 | |||
1387 | 268 | out, err = self.run_bzr(['grep', '--exclude', '*.cc', 'line1']) | ||
1388 | 269 | self.assertContainsRe(out, "file0.aa:line1", flags=TestGrep._reflags) | ||
1389 | 270 | self.assertContainsRe(out, "file0.bb:line1", flags=TestGrep._reflags) | ||
1390 | 271 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1391 | 272 | # two lines each (line1, line10) from file0.aa and file0.bb | ||
1392 | 273 | self.assertEqual(len(out.splitlines()), 4) | ||
1393 | 274 | |||
1394 | 275 | out, err = self.run_bzr(['grep', '--exclude', '*.cc', 'lin.1$']) | ||
1395 | 276 | self.assertContainsRe(out, "file0.aa:line1", flags=TestGrep._reflags) | ||
1396 | 277 | self.assertContainsRe(out, "file0.bb:line1", flags=TestGrep._reflags) | ||
1397 | 278 | self.assertNotContainsRe(out, "file0.cc", flags=TestGrep._reflags) | ||
1398 | 279 | # one line each (line1) from file0.aa and file0.bb | ||
1399 | 280 | self.assertEqual(len(out.splitlines()), 2) | ||
1400 | 281 | |||
1401 | 282 | def test_ver_multiple_files(self): | ||
1402 | 283 | """(versioned) Search for pattern in multiple files. | ||
1403 | 284 | """ | ||
1404 | 285 | wd = 'foobar0' | ||
1405 | 286 | self.make_branch_and_tree(wd) | ||
1406 | 287 | os.chdir(wd) | ||
1407 | 288 | self._mk_versioned_file('file0.txt', total_lines=2) | ||
1408 | 289 | self._mk_versioned_file('file1.txt', total_lines=2) | ||
1409 | 290 | self._mk_versioned_file('file2.txt', total_lines=2) | ||
1410 | 291 | |||
1411 | 292 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line[1-2]$']) | ||
1412 | 293 | self.assertContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
1413 | 294 | self.assertContainsRe(out, "file0.txt~.:line2", flags=TestGrep._reflags) | ||
1414 | 295 | self.assertContainsRe(out, "file1.txt~.:line1", flags=TestGrep._reflags) | ||
1415 | 296 | self.assertContainsRe(out, "file1.txt~.:line2", flags=TestGrep._reflags) | ||
1416 | 297 | self.assertContainsRe(out, "file2.txt~.:line1", flags=TestGrep._reflags) | ||
1417 | 298 | self.assertContainsRe(out, "file2.txt~.:line2", flags=TestGrep._reflags) | ||
1418 | 299 | self.assertEqual(len(out.splitlines()), 6) | ||
1419 | 300 | |||
1420 | 301 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line']) | ||
1421 | 302 | self.assertContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
1422 | 303 | self.assertContainsRe(out, "file0.txt~.:line2", flags=TestGrep._reflags) | ||
1423 | 304 | self.assertContainsRe(out, "file1.txt~.:line1", flags=TestGrep._reflags) | ||
1424 | 305 | self.assertContainsRe(out, "file1.txt~.:line2", flags=TestGrep._reflags) | ||
1425 | 306 | self.assertContainsRe(out, "file2.txt~.:line1", flags=TestGrep._reflags) | ||
1426 | 307 | self.assertContainsRe(out, "file2.txt~.:line2", flags=TestGrep._reflags) | ||
1427 | 308 | self.assertEqual(len(out.splitlines()), 6) | ||
1428 | 309 | |||
1429 | 310 | def test_multiple_wtree_files(self): | ||
1430 | 311 | """(wtree) Search for pattern in multiple files in working tree. | ||
1431 | 312 | """ | ||
1432 | 313 | wd = 'foobar0' | ||
1433 | 314 | self.make_branch_and_tree(wd) | ||
1434 | 315 | os.chdir(wd) | ||
1435 | 316 | self._mk_versioned_file('file0.txt', total_lines=2) | ||
1436 | 317 | self._mk_versioned_file('file1.txt', total_lines=2) | ||
1437 | 318 | self._mk_versioned_file('file2.txt', total_lines=2) | ||
1438 | 319 | self._update_file('file0.txt', 'HELLO\n', checkin=False) | ||
1439 | 320 | self._update_file('file1.txt', 'HELLO\n', checkin=True) | ||
1440 | 321 | self._update_file('file2.txt', 'HELLO\n', checkin=False) | ||
1441 | 322 | |||
1442 | 323 | out, err = self.run_bzr(['grep', 'HELLO', | ||
1443 | 324 | 'file0.txt', 'file1.txt', 'file2.txt']) | ||
1444 | 325 | |||
1445 | 326 | self.assertContainsRe(out, "file0.txt:HELLO", flags=TestGrep._reflags) | ||
1446 | 327 | self.assertContainsRe(out, "file1.txt:HELLO", flags=TestGrep._reflags) | ||
1447 | 328 | self.assertContainsRe(out, "file2.txt:HELLO", flags=TestGrep._reflags) | ||
1448 | 329 | self.assertEqual(len(out.splitlines()), 3) | ||
1449 | 330 | |||
1450 | 331 | out, err = self.run_bzr(['grep', 'HELLO', '-r', 'last:1', | ||
1451 | 332 | 'file0.txt', 'file1.txt', 'file2.txt']) | ||
1452 | 333 | |||
1453 | 334 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1454 | 335 | self.assertContainsRe(out, "file1.txt~.:HELLO", flags=TestGrep._reflags) | ||
1455 | 336 | self.assertNotContainsRe(out, "file2.txt", flags=TestGrep._reflags) | ||
1456 | 337 | self.assertEqual(len(out.splitlines()), 1) | ||
1457 | 338 | |||
1458 | 339 | out, err = self.run_bzr(['grep', 'HE..O', | ||
1459 | 340 | 'file0.txt', 'file1.txt', 'file2.txt']) | ||
1460 | 341 | |||
1461 | 342 | self.assertContainsRe(out, "file0.txt:HELLO", flags=TestGrep._reflags) | ||
1462 | 343 | self.assertContainsRe(out, "file1.txt:HELLO", flags=TestGrep._reflags) | ||
1463 | 344 | self.assertContainsRe(out, "file2.txt:HELLO", flags=TestGrep._reflags) | ||
1464 | 345 | self.assertEqual(len(out.splitlines()), 3) | ||
1465 | 346 | |||
1466 | 347 | out, err = self.run_bzr(['grep', 'HE..O', '-r', 'last:1', | ||
1467 | 348 | 'file0.txt', 'file1.txt', 'file2.txt']) | ||
1468 | 349 | |||
1469 | 350 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1470 | 351 | self.assertContainsRe(out, "file1.txt~.:HELLO", flags=TestGrep._reflags) | ||
1471 | 352 | self.assertNotContainsRe(out, "file2.txt", flags=TestGrep._reflags) | ||
1472 | 353 | self.assertEqual(len(out.splitlines()), 1) | ||
1473 | 354 | |||
1474 | 355 | def test_ver_null_option(self): | ||
1475 | 356 | """(versioned) --null option should use NUL instead of newline. | ||
1476 | 357 | """ | ||
1477 | 358 | wd = 'foobar0' | ||
1478 | 359 | self.make_branch_and_tree(wd) | ||
1479 | 360 | os.chdir(wd) | ||
1480 | 361 | self._mk_versioned_file('file0.txt', total_lines=3) | ||
1481 | 362 | |||
1482 | 363 | nref = ud.normalize(u'NFC', u"file0.txt~1:line1\0file0.txt~1:line2\0file0.txt~1:line3\0") | ||
1483 | 364 | |||
1484 | 365 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line[1-3]']) | ||
1485 | 366 | nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore')) | ||
1486 | 367 | self.assertEqual(nout, nref) | ||
1487 | 368 | self.assertEqual(len(out.splitlines()), 1) | ||
1488 | 369 | |||
1489 | 370 | out, err = self.run_bzr(['grep', '-r', 'last:1', '-Z', 'line[1-3]']) | ||
1490 | 371 | nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore')) | ||
1491 | 372 | self.assertEqual(nout, nref) | ||
1492 | 373 | self.assertEqual(len(out.splitlines()), 1) | ||
1493 | 374 | |||
1494 | 375 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--null', 'line']) | ||
1495 | 376 | nout = ud.normalize(u'NFC', out.decode('utf-8', 'ignore')) | ||
1496 | 377 | self.assertEqual(nout, nref) | ||
1497 | 378 | self.assertEqual(len(out.splitlines()), 1) | ||
1498 | 379 | |||
1499 | 380 | def test_wtree_null_option(self): | ||
1500 | 381 | """(wtree) --null option should use NUL instead of newline. | ||
1501 | 382 | """ | ||
1502 | 383 | wd = 'foobar0' | ||
1503 | 384 | self.make_branch_and_tree(wd) | ||
1504 | 385 | os.chdir(wd) | ||
1505 | 386 | self._mk_versioned_file('file0.txt', total_lines=3) | ||
1506 | 387 | |||
1507 | 388 | out, err = self.run_bzr(['grep', '--null', 'line[1-3]']) | ||
1508 | 389 | self.assertEqual(out, "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") | ||
1509 | 390 | self.assertEqual(len(out.splitlines()), 1) | ||
1510 | 391 | |||
1511 | 392 | out, err = self.run_bzr(['grep', '-Z', 'line[1-3]']) | ||
1512 | 393 | self.assertEqual(out, "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") | ||
1513 | 394 | self.assertEqual(len(out.splitlines()), 1) | ||
1514 | 395 | |||
1515 | 396 | out, err = self.run_bzr(['grep', '-Z', 'line']) | ||
1516 | 397 | self.assertEqual(out, "file0.txt:line1\0file0.txt:line2\0file0.txt:line3\0") | ||
1517 | 398 | self.assertEqual(len(out.splitlines()), 1) | ||
1518 | 399 | |||
1519 | 400 | def test_versioned_file_in_dir_no_recursive(self): | ||
1520 | 401 | """(versioned) Should not recurse with --no-recursive""" | ||
1521 | 402 | wd = 'foobar0' | ||
1522 | 403 | self.make_branch_and_tree(wd) | ||
1523 | 404 | os.chdir(wd) | ||
1524 | 405 | self._mk_versioned_file('fileX.txt', line_prefix='lin') | ||
1525 | 406 | self._mk_versioned_dir('dir0') | ||
1526 | 407 | self._mk_versioned_file('dir0/file0.txt') | ||
1527 | 408 | |||
1528 | 409 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--no-recursive', 'line1']) | ||
1529 | 410 | self.assertNotContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
1530 | 411 | self.assertEqual(len(out.splitlines()), 0) | ||
1531 | 412 | |||
1532 | 413 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--no-recursive', 'line1$']) | ||
1533 | 414 | self.assertNotContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
1534 | 415 | self.assertEqual(len(out.splitlines()), 0) | ||
1535 | 416 | |||
1536 | 417 | def test_wtree_file_in_dir_no_recursive(self): | ||
1537 | 418 | """(wtree) Should not recurse with --no-recursive""" | ||
1538 | 419 | wd = 'foobar0' | ||
1539 | 420 | self.make_branch_and_tree(wd) | ||
1540 | 421 | os.chdir(wd) | ||
1541 | 422 | self._mk_versioned_file('fileX.txt', line_prefix='lin') | ||
1542 | 423 | self._mk_versioned_dir('dir0') | ||
1543 | 424 | self._mk_versioned_file('dir0/file0.txt') | ||
1544 | 425 | |||
1545 | 426 | out, err = self.run_bzr(['grep', '--no-recursive', 'line1']) | ||
1546 | 427 | self.assertNotContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
1547 | 428 | self.assertEqual(len(out.splitlines()), 0) | ||
1548 | 429 | |||
1549 | 430 | out, err = self.run_bzr(['grep', '--no-recursive', 'lin.1']) | ||
1550 | 431 | self.assertNotContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
1551 | 432 | self.assertEqual(len(out.splitlines()), 0) | ||
1552 | 433 | |||
1553 | 434 | def test_versioned_file_in_dir_recurse(self): | ||
1554 | 435 | """(versioned) Should recurse by default. | ||
1555 | 436 | """ | ||
1556 | 437 | wd = 'foobar0' | ||
1557 | 438 | self.make_branch_and_tree(wd) | ||
1558 | 439 | os.chdir(wd) | ||
1559 | 440 | self._mk_versioned_dir('dir0') | ||
1560 | 441 | self._mk_versioned_file('dir0/file0.txt') | ||
1561 | 442 | |||
1562 | 443 | out, err = self.run_bzr(['grep', '-r', '-1', '.i.e1']) | ||
1563 | 444 | self.assertContainsRe(out, "^dir0/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1564 | 445 | # find line1 and line10 | ||
1565 | 446 | self.assertEqual(len(out.splitlines()), 2) | ||
1566 | 447 | |||
1567 | 448 | out, err = self.run_bzr(['grep', '-r', '-1', 'line1']) | ||
1568 | 449 | self.assertContainsRe(out, "^dir0/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1569 | 450 | # find line1 and line10 | ||
1570 | 451 | self.assertEqual(len(out.splitlines()), 2) | ||
1571 | 452 | |||
1572 | 453 | def test_wtree_file_in_dir_recurse(self): | ||
1573 | 454 | """(wtree) Should recurse by default. | ||
1574 | 455 | """ | ||
1575 | 456 | wd = 'foobar0' | ||
1576 | 457 | self.make_branch_and_tree(wd) | ||
1577 | 458 | os.chdir(wd) | ||
1578 | 459 | self._mk_versioned_dir('dir0') | ||
1579 | 460 | self._mk_versioned_file('dir0/file0.txt') | ||
1580 | 461 | |||
1581 | 462 | out, err = self.run_bzr(['grep', 'line1']) | ||
1582 | 463 | self.assertContainsRe(out, "^dir0/file0.txt:line1", flags=TestGrep._reflags) | ||
1583 | 464 | # find line1 and line10 | ||
1584 | 465 | self.assertEqual(len(out.splitlines()), 2) | ||
1585 | 466 | |||
1586 | 467 | out, err = self.run_bzr(['grep', 'lin.1']) | ||
1587 | 468 | self.assertContainsRe(out, "^dir0/file0.txt:line1", flags=TestGrep._reflags) | ||
1588 | 469 | # find line1 and line10 | ||
1589 | 470 | self.assertEqual(len(out.splitlines()), 2) | ||
1590 | 471 | |||
1591 | 472 | def test_versioned_file_within_dir(self): | ||
1592 | 473 | """(versioned) Search for pattern while in nested dir. | ||
1593 | 474 | """ | ||
1594 | 475 | wd = 'foobar0' | ||
1595 | 476 | self.make_branch_and_tree(wd) | ||
1596 | 477 | os.chdir(wd) | ||
1597 | 478 | self._mk_versioned_dir('dir0') | ||
1598 | 479 | self._mk_versioned_file('dir0/file0.txt') | ||
1599 | 480 | os.chdir('dir0') | ||
1600 | 481 | |||
1601 | 482 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line1']) | ||
1602 | 483 | self.assertContainsRe(out, "^file0.txt~.:line1", flags=TestGrep._reflags) | ||
1603 | 484 | # finds line1 and line10 | ||
1604 | 485 | self.assertEqual(len(out.splitlines()), 2) | ||
1605 | 486 | |||
1606 | 487 | out, err = self.run_bzr(['grep', '-r', 'last:1', '.i.e1']) | ||
1607 | 488 | self.assertContainsRe(out, "^file0.txt~.:line1", flags=TestGrep._reflags) | ||
1608 | 489 | # finds line1 and line10 | ||
1609 | 490 | self.assertEqual(len(out.splitlines()), 2) | ||
1610 | 491 | |||
1611 | 492 | def test_versioned_include_file_within_dir(self): | ||
1612 | 493 | """(versioned) Ensure --include is respected with file within dir. | ||
1613 | 494 | """ | ||
1614 | 495 | wd = 'foobar0' | ||
1615 | 496 | self.make_branch_and_tree(wd) | ||
1616 | 497 | os.chdir(wd) | ||
1617 | 498 | self._mk_versioned_dir('dir0') # revno 1 | ||
1618 | 499 | self._mk_versioned_file('dir0/file0.txt') # revno 2 | ||
1619 | 500 | self._mk_versioned_file('dir0/file1.aa') # revno 3 | ||
1620 | 501 | self._update_file('dir0/file1.aa', 'hello\n') # revno 4 | ||
1621 | 502 | self._update_file('dir0/file0.txt', 'hello\n') # revno 5 | ||
1622 | 503 | os.chdir('dir0') | ||
1623 | 504 | |||
1624 | 505 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1625 | 506 | '--include', '*.aa', 'line1']) | ||
1626 | 507 | self.assertContainsRe(out, "^file1.aa~5:line1$", flags=TestGrep._reflags) | ||
1627 | 508 | self.assertContainsRe(out, "^file1.aa~5:line10$", flags=TestGrep._reflags) | ||
1628 | 509 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1629 | 510 | # finds line1 and line10 | ||
1630 | 511 | self.assertEqual(len(out.splitlines()), 2) | ||
1631 | 512 | |||
1632 | 513 | out, err = self.run_bzr(['grep', '-r', 'last:2..last:1', | ||
1633 | 514 | '--include', '*.aa', 'line1']) | ||
1634 | 515 | self.assertContainsRe(out, "^file1.aa~4:line1$", flags=TestGrep._reflags) | ||
1635 | 516 | self.assertContainsRe(out, "^file1.aa~4:line10$", flags=TestGrep._reflags) | ||
1636 | 517 | self.assertContainsRe(out, "^file1.aa~5:line1$", flags=TestGrep._reflags) | ||
1637 | 518 | self.assertContainsRe(out, "^file1.aa~5:line10$", flags=TestGrep._reflags) | ||
1638 | 519 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1639 | 520 | # finds line1 and line10 over two revisions | ||
1640 | 521 | self.assertEqual(len(out.splitlines()), 4) | ||
1641 | 522 | |||
1642 | 523 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1643 | 524 | '--include', '*.aa', 'lin.1']) | ||
1644 | 525 | self.assertContainsRe(out, "^file1.aa~5:line1$", flags=TestGrep._reflags) | ||
1645 | 526 | self.assertContainsRe(out, "^file1.aa~5:line10$", flags=TestGrep._reflags) | ||
1646 | 527 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1647 | 528 | # finds line1 and line10 | ||
1648 | 529 | self.assertEqual(len(out.splitlines()), 2) | ||
1649 | 530 | |||
1650 | 531 | out, err = self.run_bzr(['grep', '-r', 'last:3..last:1', | ||
1651 | 532 | '--include', '*.aa', 'lin.1']) | ||
1652 | 533 | self.assertContainsRe(out, "^file1.aa~3:line1$", flags=TestGrep._reflags) | ||
1653 | 534 | self.assertContainsRe(out, "^file1.aa~4:line1$", flags=TestGrep._reflags) | ||
1654 | 535 | self.assertContainsRe(out, "^file1.aa~5:line1$", flags=TestGrep._reflags) | ||
1655 | 536 | self.assertContainsRe(out, "^file1.aa~3:line10$", flags=TestGrep._reflags) | ||
1656 | 537 | self.assertContainsRe(out, "^file1.aa~4:line10$", flags=TestGrep._reflags) | ||
1657 | 538 | self.assertContainsRe(out, "^file1.aa~5:line10$", flags=TestGrep._reflags) | ||
1658 | 539 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1659 | 540 | # finds line1 and line10 over 3 revisions | ||
1660 | 541 | self.assertEqual(len(out.splitlines()), 6) | ||
1661 | 542 | |||
1662 | 543 | def test_versioned_exclude_file_within_dir(self): | ||
1663 | 544 | """(versioned) Ensure --exclude is respected with file within dir. | ||
1664 | 545 | """ | ||
1665 | 546 | wd = 'foobar0' | ||
1666 | 547 | self.make_branch_and_tree(wd) | ||
1667 | 548 | os.chdir(wd) | ||
1668 | 549 | self._mk_versioned_dir('dir0') | ||
1669 | 550 | self._mk_versioned_file('dir0/file0.txt') | ||
1670 | 551 | self._mk_versioned_file('dir0/file1.aa') | ||
1671 | 552 | os.chdir('dir0') | ||
1672 | 553 | |||
1673 | 554 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1674 | 555 | '--exclude', '*.txt', 'line1']) | ||
1675 | 556 | self.assertContainsRe(out, "^file1.aa~.:line1", flags=TestGrep._reflags) | ||
1676 | 557 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1677 | 558 | # finds line1 and line10 | ||
1678 | 559 | self.assertEqual(len(out.splitlines()), 2) | ||
1679 | 560 | |||
1680 | 561 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1681 | 562 | '--exclude', '*.txt', 'l[a-z]ne1']) | ||
1682 | 563 | self.assertContainsRe(out, "^file1.aa~.:line1", flags=TestGrep._reflags) | ||
1683 | 564 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1684 | 565 | # finds line1 and line10 | ||
1685 | 566 | self.assertEqual(len(out.splitlines()), 2) | ||
1686 | 567 | |||
1687 | 568 | def test_wtree_file_within_dir(self): | ||
1688 | 569 | """(wtree) Search for pattern while in nested dir. | ||
1689 | 570 | """ | ||
1690 | 571 | wd = 'foobar0' | ||
1691 | 572 | self.make_branch_and_tree(wd) | ||
1692 | 573 | os.chdir(wd) | ||
1693 | 574 | self._mk_versioned_dir('dir0') | ||
1694 | 575 | self._mk_versioned_file('dir0/file0.txt') | ||
1695 | 576 | os.chdir('dir0') | ||
1696 | 577 | |||
1697 | 578 | out, err = self.run_bzr(['grep', 'line1']) | ||
1698 | 579 | self.assertContainsRe(out, "^file0.txt:line1", flags=TestGrep._reflags) | ||
1699 | 580 | # finds line1 and line10 | ||
1700 | 581 | self.assertEqual(len(out.splitlines()), 2) | ||
1701 | 582 | |||
1702 | 583 | out, err = self.run_bzr(['grep', 'l[aeiou]ne1']) | ||
1703 | 584 | self.assertContainsRe(out, "^file0.txt:line1", flags=TestGrep._reflags) | ||
1704 | 585 | # finds line1 and line10 | ||
1705 | 586 | self.assertEqual(len(out.splitlines()), 2) | ||
1706 | 587 | |||
1707 | 588 | def test_wtree_include_file_within_dir(self): | ||
1708 | 589 | """(wtree) Ensure --include is respected with file within dir. | ||
1709 | 590 | """ | ||
1710 | 591 | wd = 'foobar0' | ||
1711 | 592 | self.make_branch_and_tree(wd) | ||
1712 | 593 | os.chdir(wd) | ||
1713 | 594 | self._mk_versioned_dir('dir0') | ||
1714 | 595 | self._mk_versioned_file('dir0/file0.txt') | ||
1715 | 596 | self._mk_versioned_file('dir0/file1.aa') | ||
1716 | 597 | os.chdir('dir0') | ||
1717 | 598 | |||
1718 | 599 | out, err = self.run_bzr(['grep', '--include', '*.aa', 'line1']) | ||
1719 | 600 | self.assertContainsRe(out, "^file1.aa:line1", flags=TestGrep._reflags) | ||
1720 | 601 | # finds line1 and line10 | ||
1721 | 602 | self.assertEqual(len(out.splitlines()), 2) | ||
1722 | 603 | |||
1723 | 604 | out, err = self.run_bzr(['grep', '--include', '*.aa', 'l[ixn]ne1']) | ||
1724 | 605 | self.assertContainsRe(out, "^file1.aa:line1", flags=TestGrep._reflags) | ||
1725 | 606 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1726 | 607 | # finds line1 and line10 | ||
1727 | 608 | self.assertEqual(len(out.splitlines()), 2) | ||
1728 | 609 | |||
1729 | 610 | def test_wtree_exclude_file_within_dir(self): | ||
1730 | 611 | """(wtree) Ensure --exclude is respected with file within dir. | ||
1731 | 612 | """ | ||
1732 | 613 | wd = 'foobar0' | ||
1733 | 614 | self.make_branch_and_tree(wd) | ||
1734 | 615 | os.chdir(wd) | ||
1735 | 616 | self._mk_versioned_dir('dir0') | ||
1736 | 617 | self._mk_versioned_file('dir0/file0.txt') | ||
1737 | 618 | self._mk_versioned_file('dir0/file1.aa') | ||
1738 | 619 | os.chdir('dir0') | ||
1739 | 620 | |||
1740 | 621 | out, err = self.run_bzr(['grep', '--exclude', '*.txt', 'li.e1']) | ||
1741 | 622 | self.assertContainsRe(out, "^file1.aa:line1$", flags=TestGrep._reflags) | ||
1742 | 623 | self.assertContainsRe(out, "^file1.aa:line10$", flags=TestGrep._reflags) | ||
1743 | 624 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1744 | 625 | # finds line1 and line10 | ||
1745 | 626 | self.assertEqual(len(out.splitlines()), 2) | ||
1746 | 627 | |||
1747 | 628 | out, err = self.run_bzr(['grep', '--exclude', '*.txt', 'line1']) | ||
1748 | 629 | self.assertContainsRe(out, "^file1.aa:line1$", flags=TestGrep._reflags) | ||
1749 | 630 | self.assertContainsRe(out, "^file1.aa:line10$", flags=TestGrep._reflags) | ||
1750 | 631 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
1751 | 632 | # finds line1 and line10 | ||
1752 | 633 | self.assertEqual(len(out.splitlines()), 2) | ||
1753 | 634 | |||
1754 | 635 | def test_versioned_include_from_outside_dir(self): | ||
1755 | 636 | """(versioned) Ensure --include is respected during recursive search. | ||
1756 | 637 | """ | ||
1757 | 638 | wd = 'foobar0' | ||
1758 | 639 | self.make_branch_and_tree(wd) | ||
1759 | 640 | os.chdir(wd) | ||
1760 | 641 | |||
1761 | 642 | self._mk_versioned_dir('dir0') | ||
1762 | 643 | self._mk_versioned_file('dir0/file0.aa') | ||
1763 | 644 | |||
1764 | 645 | self._mk_versioned_dir('dir1') | ||
1765 | 646 | self._mk_versioned_file('dir1/file1.bb') | ||
1766 | 647 | |||
1767 | 648 | self._mk_versioned_dir('dir2') | ||
1768 | 649 | self._mk_versioned_file('dir2/file2.cc') | ||
1769 | 650 | |||
1770 | 651 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1771 | 652 | '--include', '*.aa', '--include', '*.bb', 'l..e1']) | ||
1772 | 653 | self.assertContainsRe(out, "^dir0/file0.aa~.:line1$", flags=TestGrep._reflags) | ||
1773 | 654 | self.assertContainsRe(out, "^dir1/file1.bb~.:line1$", flags=TestGrep._reflags) | ||
1774 | 655 | self.assertContainsRe(out, "^dir0/file0.aa~.:line10$", flags=TestGrep._reflags) | ||
1775 | 656 | self.assertContainsRe(out, "^dir1/file1.bb~.:line10$", flags=TestGrep._reflags) | ||
1776 | 657 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1777 | 658 | # finds line1 and line10 | ||
1778 | 659 | self.assertEqual(len(out.splitlines()), 4) | ||
1779 | 660 | |||
1780 | 661 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1781 | 662 | '--include', '*.aa', '--include', '*.bb', 'line1']) | ||
1782 | 663 | self.assertContainsRe(out, "^dir0/file0.aa~.:line1$", flags=TestGrep._reflags) | ||
1783 | 664 | self.assertContainsRe(out, "^dir1/file1.bb~.:line1$", flags=TestGrep._reflags) | ||
1784 | 665 | self.assertContainsRe(out, "^dir0/file0.aa~.:line10$", flags=TestGrep._reflags) | ||
1785 | 666 | self.assertContainsRe(out, "^dir1/file1.bb~.:line10$", flags=TestGrep._reflags) | ||
1786 | 667 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1787 | 668 | # finds line1 and line10 | ||
1788 | 669 | self.assertEqual(len(out.splitlines()), 4) | ||
1789 | 670 | |||
1790 | 671 | def test_wtree_include_from_outside_dir(self): | ||
1791 | 672 | """(wtree) Ensure --include is respected during recursive search. | ||
1792 | 673 | """ | ||
1793 | 674 | wd = 'foobar0' | ||
1794 | 675 | self.make_branch_and_tree(wd) | ||
1795 | 676 | os.chdir(wd) | ||
1796 | 677 | |||
1797 | 678 | self._mk_versioned_dir('dir0') | ||
1798 | 679 | self._mk_versioned_file('dir0/file0.aa') | ||
1799 | 680 | |||
1800 | 681 | self._mk_versioned_dir('dir1') | ||
1801 | 682 | self._mk_versioned_file('dir1/file1.bb') | ||
1802 | 683 | |||
1803 | 684 | self._mk_versioned_dir('dir2') | ||
1804 | 685 | self._mk_versioned_file('dir2/file2.cc') | ||
1805 | 686 | |||
1806 | 687 | out, err = self.run_bzr(['grep', '--include', '*.aa', | ||
1807 | 688 | '--include', '*.bb', 'l.n.1']) | ||
1808 | 689 | self.assertContainsRe(out, "^dir0/file0.aa:line1$", flags=TestGrep._reflags) | ||
1809 | 690 | self.assertContainsRe(out, "^dir1/file1.bb:line1$", flags=TestGrep._reflags) | ||
1810 | 691 | self.assertContainsRe(out, "^dir0/file0.aa:line10$", flags=TestGrep._reflags) | ||
1811 | 692 | self.assertContainsRe(out, "^dir1/file1.bb:line10$", flags=TestGrep._reflags) | ||
1812 | 693 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1813 | 694 | # finds line1 and line10 | ||
1814 | 695 | self.assertEqual(len(out.splitlines()), 4) | ||
1815 | 696 | |||
1816 | 697 | out, err = self.run_bzr(['grep', '--include', '*.aa', | ||
1817 | 698 | '--include', '*.bb', 'line1']) | ||
1818 | 699 | self.assertContainsRe(out, "^dir0/file0.aa:line1$", flags=TestGrep._reflags) | ||
1819 | 700 | self.assertContainsRe(out, "^dir1/file1.bb:line1$", flags=TestGrep._reflags) | ||
1820 | 701 | self.assertContainsRe(out, "^dir0/file0.aa:line10$", flags=TestGrep._reflags) | ||
1821 | 702 | self.assertContainsRe(out, "^dir1/file1.bb:line10$", flags=TestGrep._reflags) | ||
1822 | 703 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1823 | 704 | # finds line1 and line10 | ||
1824 | 705 | self.assertEqual(len(out.splitlines()), 4) | ||
1825 | 706 | |||
1826 | 707 | def test_versioned_exclude_from_outside_dir(self): | ||
1827 | 708 | """(versioned) Ensure --exclude is respected during recursive search. | ||
1828 | 709 | """ | ||
1829 | 710 | wd = 'foobar0' | ||
1830 | 711 | self.make_branch_and_tree(wd) | ||
1831 | 712 | os.chdir(wd) | ||
1832 | 713 | |||
1833 | 714 | self._mk_versioned_dir('dir0') | ||
1834 | 715 | self._mk_versioned_file('dir0/file0.aa') | ||
1835 | 716 | |||
1836 | 717 | self._mk_versioned_dir('dir1') | ||
1837 | 718 | self._mk_versioned_file('dir1/file1.bb') | ||
1838 | 719 | |||
1839 | 720 | self._mk_versioned_dir('dir2') | ||
1840 | 721 | self._mk_versioned_file('dir2/file2.cc') | ||
1841 | 722 | |||
1842 | 723 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1843 | 724 | '--exclude', '*.cc', 'l..e1']) | ||
1844 | 725 | self.assertContainsRe(out, "^dir0/file0.aa~.:line1", flags=TestGrep._reflags) | ||
1845 | 726 | self.assertContainsRe(out, "^dir1/file1.bb~.:line1", flags=TestGrep._reflags) | ||
1846 | 727 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1847 | 728 | |||
1848 | 729 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
1849 | 730 | '--exclude', '*.cc', 'line1']) | ||
1850 | 731 | self.assertContainsRe(out, "^dir0/file0.aa~.:line1", flags=TestGrep._reflags) | ||
1851 | 732 | self.assertContainsRe(out, "^dir1/file1.bb~.:line1", flags=TestGrep._reflags) | ||
1852 | 733 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1853 | 734 | |||
1854 | 735 | def test_wtree_exclude_from_outside_dir(self): | ||
1855 | 736 | """(wtree) Ensure --exclude is respected during recursive search. | ||
1856 | 737 | """ | ||
1857 | 738 | wd = 'foobar0' | ||
1858 | 739 | self.make_branch_and_tree(wd) | ||
1859 | 740 | os.chdir(wd) | ||
1860 | 741 | |||
1861 | 742 | self._mk_versioned_dir('dir0') | ||
1862 | 743 | self._mk_versioned_file('dir0/file0.aa') | ||
1863 | 744 | |||
1864 | 745 | self._mk_versioned_dir('dir1') | ||
1865 | 746 | self._mk_versioned_file('dir1/file1.bb') | ||
1866 | 747 | |||
1867 | 748 | self._mk_versioned_dir('dir2') | ||
1868 | 749 | self._mk_versioned_file('dir2/file2.cc') | ||
1869 | 750 | |||
1870 | 751 | out, err = self.run_bzr(['grep', '--exclude', '*.cc', 'l[hijk]ne1']) | ||
1871 | 752 | self.assertContainsRe(out, "^dir0/file0.aa:line1", flags=TestGrep._reflags) | ||
1872 | 753 | self.assertContainsRe(out, "^dir1/file1.bb:line1", flags=TestGrep._reflags) | ||
1873 | 754 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1874 | 755 | |||
1875 | 756 | out, err = self.run_bzr(['grep', '--exclude', '*.cc', 'line1']) | ||
1876 | 757 | self.assertContainsRe(out, "^dir0/file0.aa:line1", flags=TestGrep._reflags) | ||
1877 | 758 | self.assertContainsRe(out, "^dir1/file1.bb:line1", flags=TestGrep._reflags) | ||
1878 | 759 | self.assertNotContainsRe(out, "file1.cc", flags=TestGrep._reflags) | ||
1879 | 760 | |||
1880 | 761 | def test_workingtree_files_from_outside_dir(self): | ||
1881 | 762 | """(wtree) Grep for pattern with dirs passed as argument. | ||
1882 | 763 | """ | ||
1883 | 764 | wd = 'foobar0' | ||
1884 | 765 | self.make_branch_and_tree(wd) | ||
1885 | 766 | os.chdir(wd) | ||
1886 | 767 | |||
1887 | 768 | self._mk_versioned_dir('dir0') | ||
1888 | 769 | self._mk_versioned_file('dir0/file0.txt') | ||
1889 | 770 | |||
1890 | 771 | self._mk_versioned_dir('dir1') | ||
1891 | 772 | self._mk_versioned_file('dir1/file1.txt') | ||
1892 | 773 | |||
1893 | 774 | out, err = self.run_bzr(['grep', 'l[aeiou]ne1', 'dir0', 'dir1']) | ||
1894 | 775 | self.assertContainsRe(out, "^dir0/file0.txt:line1", flags=TestGrep._reflags) | ||
1895 | 776 | self.assertContainsRe(out, "^dir1/file1.txt:line1", flags=TestGrep._reflags) | ||
1896 | 777 | |||
1897 | 778 | out, err = self.run_bzr(['grep', 'line1', 'dir0', 'dir1']) | ||
1898 | 779 | self.assertContainsRe(out, "^dir0/file0.txt:line1", flags=TestGrep._reflags) | ||
1899 | 780 | self.assertContainsRe(out, "^dir1/file1.txt:line1", flags=TestGrep._reflags) | ||
1900 | 781 | |||
1901 | 782 | def test_versioned_files_from_outside_dir(self): | ||
1902 | 783 | """(versioned) Grep for pattern with dirs passed as argument. | ||
1903 | 784 | """ | ||
1904 | 785 | wd = 'foobar0' | ||
1905 | 786 | self.make_branch_and_tree(wd) | ||
1906 | 787 | os.chdir(wd) | ||
1907 | 788 | |||
1908 | 789 | self._mk_versioned_dir('dir0') | ||
1909 | 790 | self._mk_versioned_file('dir0/file0.txt') | ||
1910 | 791 | |||
1911 | 792 | self._mk_versioned_dir('dir1') | ||
1912 | 793 | self._mk_versioned_file('dir1/file1.txt') | ||
1913 | 794 | |||
1914 | 795 | out, err = self.run_bzr(['grep', '-r', 'last:1', '.ine1', 'dir0', 'dir1']) | ||
1915 | 796 | self.assertContainsRe(out, "^dir0/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1916 | 797 | self.assertContainsRe(out, "^dir1/file1.txt~.:line1", flags=TestGrep._reflags) | ||
1917 | 798 | |||
1918 | 799 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line1', 'dir0', 'dir1']) | ||
1919 | 800 | self.assertContainsRe(out, "^dir0/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1920 | 801 | self.assertContainsRe(out, "^dir1/file1.txt~.:line1", flags=TestGrep._reflags) | ||
1921 | 802 | |||
1922 | 803 | def test_wtree_files_from_outside_dir(self): | ||
1923 | 804 | """(wtree) Grep for pattern with dirs passed as argument. | ||
1924 | 805 | """ | ||
1925 | 806 | wd = 'foobar0' | ||
1926 | 807 | self.make_branch_and_tree(wd) | ||
1927 | 808 | os.chdir(wd) | ||
1928 | 809 | |||
1929 | 810 | self._mk_versioned_dir('dir0') | ||
1930 | 811 | self._mk_versioned_file('dir0/file0.txt') | ||
1931 | 812 | |||
1932 | 813 | self._mk_versioned_dir('dir1') | ||
1933 | 814 | self._mk_versioned_file('dir1/file1.txt') | ||
1934 | 815 | |||
1935 | 816 | out, err = self.run_bzr(['grep', 'li.e1', 'dir0', 'dir1']) | ||
1936 | 817 | self.assertContainsRe(out, "^dir0/file0.txt:line1", flags=TestGrep._reflags) | ||
1937 | 818 | self.assertContainsRe(out, "^dir1/file1.txt:line1", flags=TestGrep._reflags) | ||
1938 | 819 | |||
1939 | 820 | out, err = self.run_bzr(['grep', 'line1', 'dir0', 'dir1']) | ||
1940 | 821 | self.assertContainsRe(out, "^dir0/file0.txt:line1", flags=TestGrep._reflags) | ||
1941 | 822 | self.assertContainsRe(out, "^dir1/file1.txt:line1", flags=TestGrep._reflags) | ||
1942 | 823 | |||
1943 | 824 | def test_versioned_files_from_outside_two_dirs(self): | ||
1944 | 825 | """(versioned) Grep for pattern with two levels of nested dir. | ||
1945 | 826 | """ | ||
1946 | 827 | wd = 'foobar0' | ||
1947 | 828 | self.make_branch_and_tree(wd) | ||
1948 | 829 | os.chdir(wd) | ||
1949 | 830 | |||
1950 | 831 | self._mk_versioned_dir('dir0') | ||
1951 | 832 | self._mk_versioned_file('dir0/file0.txt') | ||
1952 | 833 | |||
1953 | 834 | self._mk_versioned_dir('dir1') | ||
1954 | 835 | self._mk_versioned_file('dir1/file1.txt') | ||
1955 | 836 | |||
1956 | 837 | self._mk_versioned_dir('dir0/dir00') | ||
1957 | 838 | self._mk_versioned_file('dir0/dir00/file0.txt') | ||
1958 | 839 | |||
1959 | 840 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'l.ne1', 'dir0/dir00']) | ||
1960 | 841 | self.assertContainsRe(out, "^dir0/dir00/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1961 | 842 | |||
1962 | 843 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'l.ne1']) | ||
1963 | 844 | self.assertContainsRe(out, "^dir0/dir00/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1964 | 845 | |||
1965 | 846 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line1', 'dir0/dir00']) | ||
1966 | 847 | self.assertContainsRe(out, "^dir0/dir00/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1967 | 848 | |||
1968 | 849 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line1']) | ||
1969 | 850 | self.assertContainsRe(out, "^dir0/dir00/file0.txt~.:line1", flags=TestGrep._reflags) | ||
1970 | 851 | |||
1971 | 852 | def test_wtree_files_from_outside_two_dirs(self): | ||
1972 | 853 | """(wtree) Grep for pattern with two levels of nested dir. | ||
1973 | 854 | """ | ||
1974 | 855 | wd = 'foobar0' | ||
1975 | 856 | self.make_branch_and_tree(wd) | ||
1976 | 857 | os.chdir(wd) | ||
1977 | 858 | |||
1978 | 859 | self._mk_versioned_dir('dir0') | ||
1979 | 860 | self._mk_versioned_file('dir0/file0.txt') | ||
1980 | 861 | |||
1981 | 862 | self._mk_versioned_dir('dir1') | ||
1982 | 863 | self._mk_versioned_file('dir1/file1.txt') | ||
1983 | 864 | |||
1984 | 865 | self._mk_versioned_dir('dir0/dir00') | ||
1985 | 866 | self._mk_versioned_file('dir0/dir00/file0.txt') | ||
1986 | 867 | |||
1987 | 868 | out, err = self.run_bzr(['grep', 'lin.1', 'dir0/dir00']) | ||
1988 | 869 | self.assertContainsRe(out, "^dir0/dir00/file0.txt:line1", flags=TestGrep._reflags) | ||
1989 | 870 | |||
1990 | 871 | out, err = self.run_bzr(['grep', 'li.e1']) | ||
1991 | 872 | self.assertContainsRe(out, "^dir0/dir00/file0.txt:line1", flags=TestGrep._reflags) | ||
1992 | 873 | |||
1993 | 874 | out, err = self.run_bzr(['grep', 'line1', 'dir0/dir00']) | ||
1994 | 875 | self.assertContainsRe(out, "^dir0/dir00/file0.txt:line1", flags=TestGrep._reflags) | ||
1995 | 876 | |||
1996 | 877 | out, err = self.run_bzr(['grep', 'line1']) | ||
1997 | 878 | self.assertContainsRe(out, "^dir0/dir00/file0.txt:line1", flags=TestGrep._reflags) | ||
1998 | 879 | |||
1999 | 880 | def test_versioned_file_within_dir_two_levels(self): | ||
2000 | 881 | """(versioned) Search for pattern while in nested dir (two levels). | ||
2001 | 882 | """ | ||
2002 | 883 | wd = 'foobar0' | ||
2003 | 884 | self.make_branch_and_tree(wd) | ||
2004 | 885 | os.chdir(wd) | ||
2005 | 886 | self._mk_versioned_dir('dir0') | ||
2006 | 887 | self._mk_versioned_dir('dir0/dir1') | ||
2007 | 888 | self._mk_versioned_file('dir0/dir1/file0.txt') | ||
2008 | 889 | os.chdir('dir0') | ||
2009 | 890 | |||
2010 | 891 | out, err = self.run_bzr(['grep', '-r', 'last:1', '.ine1']) | ||
2011 | 892 | self.assertContainsRe(out, "^dir1/file0.txt~.:line1", flags=TestGrep._reflags) | ||
2012 | 893 | |||
2013 | 894 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--from-root', 'l.ne1']) | ||
2014 | 895 | self.assertContainsRe(out, "^dir0/dir1/file0.txt~.:line1", flags=TestGrep._reflags) | ||
2015 | 896 | |||
2016 | 897 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--no-recursive', 'line1']) | ||
2017 | 898 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2018 | 899 | |||
2019 | 900 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'lin.1']) | ||
2020 | 901 | self.assertContainsRe(out, "^dir1/file0.txt~.:line1", flags=TestGrep._reflags) | ||
2021 | 902 | |||
2022 | 903 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--from-root', 'line1']) | ||
2023 | 904 | self.assertContainsRe(out, "^dir0/dir1/file0.txt~.:line1", flags=TestGrep._reflags) | ||
2024 | 905 | |||
2025 | 906 | out, err = self.run_bzr(['grep', '-r', 'last:1', '--no-recursive', 'line1']) | ||
2026 | 907 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2027 | 908 | self.assertEqual(len(out.splitlines()), 0) | ||
2028 | 909 | |||
2029 | 910 | def test_wtree_file_within_dir_two_levels(self): | ||
2030 | 911 | """(wtree) Search for pattern while in nested dir (two levels). | ||
2031 | 912 | """ | ||
2032 | 913 | wd = 'foobar0' | ||
2033 | 914 | self.make_branch_and_tree(wd) | ||
2034 | 915 | os.chdir(wd) | ||
2035 | 916 | self._mk_versioned_dir('dir0') | ||
2036 | 917 | self._mk_versioned_dir('dir0/dir1') | ||
2037 | 918 | self._mk_versioned_file('dir0/dir1/file0.txt') | ||
2038 | 919 | os.chdir('dir0') | ||
2039 | 920 | |||
2040 | 921 | out, err = self.run_bzr(['grep', 'l[hij]ne1']) | ||
2041 | 922 | self.assertContainsRe(out, "^dir1/file0.txt:line1", flags=TestGrep._reflags) | ||
2042 | 923 | |||
2043 | 924 | out, err = self.run_bzr(['grep', '--from-root', 'l.ne1']) | ||
2044 | 925 | self.assertContainsRe(out, "^dir0/dir1/file0.txt:line1", flags=TestGrep._reflags) | ||
2045 | 926 | |||
2046 | 927 | out, err = self.run_bzr(['grep', '--no-recursive', 'lin.1']) | ||
2047 | 928 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2048 | 929 | |||
2049 | 930 | out, err = self.run_bzr(['grep', 'line1']) | ||
2050 | 931 | self.assertContainsRe(out, "^dir1/file0.txt:line1", flags=TestGrep._reflags) | ||
2051 | 932 | |||
2052 | 933 | out, err = self.run_bzr(['grep', '--from-root', 'line1']) | ||
2053 | 934 | self.assertContainsRe(out, "^dir0/dir1/file0.txt:line1", flags=TestGrep._reflags) | ||
2054 | 935 | |||
2055 | 936 | out, err = self.run_bzr(['grep', '--no-recursive', 'line1']) | ||
2056 | 937 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2057 | 938 | |||
2058 | 939 | def test_versioned_ignore_case_no_match(self): | ||
2059 | 940 | """(versioned) Match fails without --ignore-case. | ||
2060 | 941 | """ | ||
2061 | 942 | wd = 'foobar0' | ||
2062 | 943 | self.make_branch_and_tree(wd) | ||
2063 | 944 | os.chdir(wd) | ||
2064 | 945 | self._mk_versioned_file('file0.txt') | ||
2065 | 946 | |||
2066 | 947 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'LinE1', 'file0.txt']) | ||
2067 | 948 | self.assertNotContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
2068 | 949 | |||
2069 | 950 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'Li.E1', 'file0.txt']) | ||
2070 | 951 | self.assertNotContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
2071 | 952 | |||
2072 | 953 | def test_wtree_ignore_case_no_match(self): | ||
2073 | 954 | """(wtree) Match fails without --ignore-case. | ||
2074 | 955 | """ | ||
2075 | 956 | wd = 'foobar0' | ||
2076 | 957 | self.make_branch_and_tree(wd) | ||
2077 | 958 | os.chdir(wd) | ||
2078 | 959 | self._mk_versioned_file('file0.txt') | ||
2079 | 960 | |||
2080 | 961 | out, err = self.run_bzr(['grep', 'LinE1', 'file0.txt']) | ||
2081 | 962 | self.assertNotContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
2082 | 963 | |||
2083 | 964 | out, err = self.run_bzr(['grep', '.inE1', 'file0.txt']) | ||
2084 | 965 | self.assertNotContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
2085 | 966 | |||
2086 | 967 | def test_versioned_ignore_case_match(self): | ||
2087 | 968 | """(versioned) Match fails without --ignore-case. | ||
2088 | 969 | """ | ||
2089 | 970 | wd = 'foobar0' | ||
2090 | 971 | self.make_branch_and_tree(wd) | ||
2091 | 972 | os.chdir(wd) | ||
2092 | 973 | self._mk_versioned_file('file0.txt') | ||
2093 | 974 | |||
2094 | 975 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2095 | 976 | '-i', 'Li.E1', 'file0.txt']) | ||
2096 | 977 | self.assertContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
2097 | 978 | |||
2098 | 979 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2099 | 980 | '-i', 'LinE1', 'file0.txt']) | ||
2100 | 981 | self.assertContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
2101 | 982 | |||
2102 | 983 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2103 | 984 | '--ignore-case', 'LinE1', 'file0.txt']) | ||
2104 | 985 | self.assertContainsRe(out, "^file0.txt~.:line1", flags=TestGrep._reflags) | ||
2105 | 986 | |||
2106 | 987 | def test_wtree_ignore_case_match(self): | ||
2107 | 988 | """(wtree) Match fails without --ignore-case. | ||
2108 | 989 | """ | ||
2109 | 990 | wd = 'foobar0' | ||
2110 | 991 | self.make_branch_and_tree(wd) | ||
2111 | 992 | os.chdir(wd) | ||
2112 | 993 | self._mk_versioned_file('file0.txt') | ||
2113 | 994 | |||
2114 | 995 | out, err = self.run_bzr(['grep', '-i', 'LinE1', 'file0.txt']) | ||
2115 | 996 | self.assertContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
2116 | 997 | |||
2117 | 998 | out, err = self.run_bzr(['grep', '--ignore-case', 'LinE1', 'file0.txt']) | ||
2118 | 999 | self.assertContainsRe(out, "^file0.txt:line1", flags=TestGrep._reflags) | ||
2119 | 1000 | |||
2120 | 1001 | out, err = self.run_bzr(['grep', '--ignore-case', 'Li.E1', 'file0.txt']) | ||
2121 | 1002 | self.assertContainsRe(out, "^file0.txt:line1", flags=TestGrep._reflags) | ||
2122 | 1003 | |||
2123 | 1004 | def test_versioned_from_root_fail(self): | ||
2124 | 1005 | """(versioned) Match should fail without --from-root. | ||
2125 | 1006 | """ | ||
2126 | 1007 | wd = 'foobar0' | ||
2127 | 1008 | self.make_branch_and_tree(wd) | ||
2128 | 1009 | os.chdir(wd) | ||
2129 | 1010 | self._mk_versioned_file('file0.txt') | ||
2130 | 1011 | self._mk_versioned_dir('dir0') | ||
2131 | 1012 | os.chdir('dir0') | ||
2132 | 1013 | |||
2133 | 1014 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'li.e1']) | ||
2134 | 1015 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2135 | 1016 | |||
2136 | 1017 | out, err = self.run_bzr(['grep', '-r', 'last:1', 'line1']) | ||
2137 | 1018 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2138 | 1019 | |||
2139 | 1020 | def test_wtree_from_root_fail(self): | ||
2140 | 1021 | """(wtree) Match should fail without --from-root. | ||
2141 | 1022 | """ | ||
2142 | 1023 | wd = 'foobar0' | ||
2143 | 1024 | self.make_branch_and_tree(wd) | ||
2144 | 1025 | os.chdir(wd) | ||
2145 | 1026 | self._mk_versioned_file('file0.txt') | ||
2146 | 1027 | self._mk_versioned_dir('dir0') | ||
2147 | 1028 | os.chdir('dir0') | ||
2148 | 1029 | |||
2149 | 1030 | out, err = self.run_bzr(['grep', 'line1']) | ||
2150 | 1031 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2151 | 1032 | |||
2152 | 1033 | out, err = self.run_bzr(['grep', 'li.e1']) | ||
2153 | 1034 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2154 | 1035 | |||
2155 | 1036 | def test_versioned_from_root_pass(self): | ||
2156 | 1037 | """(versioned) Match pass with --from-root. | ||
2157 | 1038 | """ | ||
2158 | 1039 | wd = 'foobar0' | ||
2159 | 1040 | self.make_branch_and_tree(wd) | ||
2160 | 1041 | os.chdir(wd) | ||
2161 | 1042 | self._mk_versioned_file('file0.txt') | ||
2162 | 1043 | self._mk_versioned_dir('dir0') | ||
2163 | 1044 | os.chdir('dir0') | ||
2164 | 1045 | |||
2165 | 1046 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2166 | 1047 | '--from-root', 'l.ne1']) | ||
2167 | 1048 | self.assertContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
2168 | 1049 | |||
2169 | 1050 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2170 | 1051 | '--from-root', 'line1']) | ||
2171 | 1052 | self.assertContainsRe(out, "file0.txt~.:line1", flags=TestGrep._reflags) | ||
2172 | 1053 | |||
2173 | 1054 | def test_wtree_from_root_pass(self): | ||
2174 | 1055 | """(wtree) Match pass with --from-root. | ||
2175 | 1056 | """ | ||
2176 | 1057 | wd = 'foobar0' | ||
2177 | 1058 | self.make_branch_and_tree(wd) | ||
2178 | 1059 | os.chdir(wd) | ||
2179 | 1060 | self._mk_versioned_file('file0.txt') | ||
2180 | 1061 | self._mk_versioned_dir('dir0') | ||
2181 | 1062 | os.chdir('dir0') | ||
2182 | 1063 | |||
2183 | 1064 | out, err = self.run_bzr(['grep', '--from-root', 'lin.1']) | ||
2184 | 1065 | self.assertContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
2185 | 1066 | |||
2186 | 1067 | out, err = self.run_bzr(['grep', '--from-root', 'line1']) | ||
2187 | 1068 | self.assertContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
2188 | 1069 | |||
2189 | 1070 | def test_versioned_with_line_number(self): | ||
2190 | 1071 | """(versioned) Search for pattern with --line-number. | ||
2191 | 1072 | """ | ||
2192 | 1073 | wd = 'foobar0' | ||
2193 | 1074 | self.make_branch_and_tree(wd) | ||
2194 | 1075 | os.chdir(wd) | ||
2195 | 1076 | self._mk_versioned_file('file0.txt') | ||
2196 | 1077 | |||
2197 | 1078 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2198 | 1079 | '--line-number', 'li.e3', 'file0.txt']) | ||
2199 | 1080 | self.assertContainsRe(out, "file0.txt~.:3:line3", flags=TestGrep._reflags) | ||
2200 | 1081 | |||
2201 | 1082 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2202 | 1083 | '--line-number', 'line3', 'file0.txt']) | ||
2203 | 1084 | self.assertContainsRe(out, "file0.txt~.:3:line3", flags=TestGrep._reflags) | ||
2204 | 1085 | |||
2205 | 1086 | out, err = self.run_bzr(['grep', '-r', 'last:1', | ||
2206 | 1087 | '-n', 'line1', 'file0.txt']) | ||
2207 | 1088 | self.assertContainsRe(out, "file0.txt~.:1:line1", flags=TestGrep._reflags) | ||
2208 | 1089 | |||
2209 | 1090 | out, err = self.run_bzr(['grep', '-n', 'line[0-9]', 'file0.txt']) | ||
2210 | 1091 | self.assertContainsRe(out, "file0.txt:3:line3", flags=TestGrep._reflags) | ||
2211 | 1092 | |||
2212 | 1093 | def test_wtree_with_line_number(self): | ||
2213 | 1094 | """(wtree) Search for pattern with --line-number. | ||
2214 | 1095 | """ | ||
2215 | 1096 | wd = 'foobar0' | ||
2216 | 1097 | self.make_branch_and_tree(wd) | ||
2217 | 1098 | os.chdir(wd) | ||
2218 | 1099 | self._mk_versioned_file('file0.txt') | ||
2219 | 1100 | |||
2220 | 1101 | out, err = self.run_bzr(['grep', '--line-number', 'line3', 'file0.txt']) | ||
2221 | 1102 | self.assertContainsRe(out, "file0.txt:3:line3", flags=TestGrep._reflags) | ||
2222 | 1103 | |||
2223 | 1104 | out, err = self.run_bzr(['grep', '-n', 'line1', 'file0.txt']) | ||
2224 | 1105 | self.assertContainsRe(out, "file0.txt:1:line1", flags=TestGrep._reflags) | ||
2225 | 1106 | |||
2226 | 1107 | out, err = self.run_bzr(['grep', '-n', '[hjkl]ine1', 'file0.txt']) | ||
2227 | 1108 | self.assertContainsRe(out, "file0.txt:1:line1", flags=TestGrep._reflags) | ||
2228 | 1109 | |||
2229 | 1110 | out, err = self.run_bzr(['grep', '-n', 'line[0-9]', 'file0.txt']) | ||
2230 | 1111 | self.assertContainsRe(out, "file0.txt:3:line3", flags=TestGrep._reflags) | ||
2231 | 1112 | |||
2232 | 1113 | def test_revno_basic_history_grep_file(self): | ||
2233 | 1114 | """Search for pattern in specific revision number in a file. | ||
2234 | 1115 | """ | ||
2235 | 1116 | wd = 'foobar0' | ||
2236 | 1117 | fname = 'file0.txt' | ||
2237 | 1118 | self.make_branch_and_tree(wd) | ||
2238 | 1119 | os.chdir(wd) | ||
2239 | 1120 | self._mk_versioned_file(fname, total_lines=0) | ||
2240 | 1121 | self._update_file(fname, text="v2 text\n") | ||
2241 | 1122 | self._update_file(fname, text="v3 text\n") | ||
2242 | 1123 | self._update_file(fname, text="v4 text\n") | ||
2243 | 1124 | |||
2244 | 1125 | # rev 2 should not have text 'v3' | ||
2245 | 1126 | out, err = self.run_bzr(['grep', '-r', '2', 'v3', fname]) | ||
2246 | 1127 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2247 | 1128 | |||
2248 | 1129 | # rev 3 should not have text 'v3' | ||
2249 | 1130 | out, err = self.run_bzr(['grep', '-r', '3', 'v3', fname]) | ||
2250 | 1131 | self.assertContainsRe(out, "file0.txt~3:v3.*", flags=TestGrep._reflags) | ||
2251 | 1132 | |||
2252 | 1133 | # rev 3 should not have text 'v3' with line number | ||
2253 | 1134 | out, err = self.run_bzr(['grep', '-r', '3', '-n', 'v3', fname]) | ||
2254 | 1135 | self.assertContainsRe(out, "file0.txt~3:2:v3.*", flags=TestGrep._reflags) | ||
2255 | 1136 | |||
2256 | 1137 | # rev 2 should not have text 'v3' | ||
2257 | 1138 | out, err = self.run_bzr(['grep', '-r', '2', '[tuv]3', fname]) | ||
2258 | 1139 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2259 | 1140 | |||
2260 | 1141 | # rev 3 should not have text 'v3' | ||
2261 | 1142 | out, err = self.run_bzr(['grep', '-r', '3', '[tuv]3', fname]) | ||
2262 | 1143 | self.assertContainsRe(out, "file0.txt~3:v3.*", flags=TestGrep._reflags) | ||
2263 | 1144 | |||
2264 | 1145 | # rev 3 should not have text 'v3' with line number | ||
2265 | 1146 | out, err = self.run_bzr(['grep', '-r', '3', '-n', '[tuv]3', fname]) | ||
2266 | 1147 | self.assertContainsRe(out, "file0.txt~3:2:v3.*", flags=TestGrep._reflags) | ||
2267 | 1148 | |||
2268 | 1149 | def test_revno_basic_history_grep_full(self): | ||
2269 | 1150 | """Search for pattern in specific revision number in a file. | ||
2270 | 1151 | """ | ||
2271 | 1152 | wd = 'foobar0' | ||
2272 | 1153 | fname = 'file0.txt' | ||
2273 | 1154 | self.make_branch_and_tree(wd) | ||
2274 | 1155 | os.chdir(wd) | ||
2275 | 1156 | self._mk_versioned_file(fname, total_lines=0) # rev1 | ||
2276 | 1157 | self._mk_versioned_file('file1.txt') # rev2 | ||
2277 | 1158 | self._update_file(fname, text="v3 text\n") # rev3 | ||
2278 | 1159 | self._update_file(fname, text="v4 text\n") # rev4 | ||
2279 | 1160 | self._update_file(fname, text="v5 text\n") # rev5 | ||
2280 | 1161 | |||
2281 | 1162 | # rev 2 should not have text 'v3' | ||
2282 | 1163 | out, err = self.run_bzr(['grep', '-r', '2', 'v3']) | ||
2283 | 1164 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2284 | 1165 | |||
2285 | 1166 | # rev 3 should not have text 'v3' | ||
2286 | 1167 | out, err = self.run_bzr(['grep', '-r', '3', 'v3']) | ||
2287 | 1168 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2288 | 1169 | |||
2289 | 1170 | # rev 3 should not have text 'v3' with line number | ||
2290 | 1171 | out, err = self.run_bzr(['grep', '-r', '3', '-n', 'v3']) | ||
2291 | 1172 | self.assertContainsRe(out, "file0.txt~3:1:v3", flags=TestGrep._reflags) | ||
2292 | 1173 | |||
2293 | 1174 | # rev 2 should not have text 'v3' | ||
2294 | 1175 | out, err = self.run_bzr(['grep', '-r', '2', '[tuv]3']) | ||
2295 | 1176 | self.assertNotContainsRe(out, "file0.txt", flags=TestGrep._reflags) | ||
2296 | 1177 | |||
2297 | 1178 | # rev 3 should not have text 'v3' | ||
2298 | 1179 | out, err = self.run_bzr(['grep', '-r', '3', '[tuv]3']) | ||
2299 | 1180 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2300 | 1181 | |||
2301 | 1182 | # rev 3 should not have text 'v3' with line number | ||
2302 | 1183 | out, err = self.run_bzr(['grep', '-r', '3', '-n', '[tuv]3']) | ||
2303 | 1184 | self.assertContainsRe(out, "file0.txt~3:1:v3", flags=TestGrep._reflags) | ||
2304 | 1185 | |||
2305 | 1186 | def test_revno_versioned_file_in_dir(self): | ||
2306 | 1187 | """Grep specific version of file withing dir. | ||
2307 | 1188 | """ | ||
2308 | 1189 | wd = 'foobar0' | ||
2309 | 1190 | self.make_branch_and_tree(wd) | ||
2310 | 1191 | os.chdir(wd) | ||
2311 | 1192 | self._mk_versioned_dir('dir0') # rev1 | ||
2312 | 1193 | self._mk_versioned_file('dir0/file0.txt') # rev2 | ||
2313 | 1194 | self._update_file('dir0/file0.txt', "v3 text\n") # rev3 | ||
2314 | 1195 | self._update_file('dir0/file0.txt', "v4 text\n") # rev4 | ||
2315 | 1196 | self._update_file('dir0/file0.txt', "v5 text\n") # rev5 | ||
2316 | 1197 | |||
2317 | 1198 | # v4 should not be present in revno 3 | ||
2318 | 1199 | out, err = self.run_bzr(['grep', '-r', 'last:3', 'v4']) | ||
2319 | 1200 | self.assertNotContainsRe(out, "^dir0/file0.txt", flags=TestGrep._reflags) | ||
2320 | 1201 | |||
2321 | 1202 | # v4 should be present in revno 4 | ||
2322 | 1203 | out, err = self.run_bzr(['grep', '-r', 'last:2', 'v4']) | ||
2323 | 1204 | self.assertContainsRe(out, "^dir0/file0.txt~4:v4", flags=TestGrep._reflags) | ||
2324 | 1205 | |||
2325 | 1206 | # v4 should not be present in revno 3 | ||
2326 | 1207 | out, err = self.run_bzr(['grep', '-r', 'last:3', '[tuv]4']) | ||
2327 | 1208 | self.assertNotContainsRe(out, "^dir0/file0.txt", flags=TestGrep._reflags) | ||
2328 | 1209 | |||
2329 | 1210 | # v4 should be present in revno 4 | ||
2330 | 1211 | out, err = self.run_bzr(['grep', '-r', 'last:2', '[tuv]4']) | ||
2331 | 1212 | self.assertContainsRe(out, "^dir0/file0.txt~4:v4", flags=TestGrep._reflags) | ||
2332 | 1213 | |||
2333 | 1214 | def test_revno_range_basic_history_grep(self): | ||
2334 | 1215 | """Search for pattern in revision range for file. | ||
2335 | 1216 | """ | ||
2336 | 1217 | wd = 'foobar0' | ||
2337 | 1218 | fname = 'file0.txt' | ||
2338 | 1219 | self.make_branch_and_tree(wd) | ||
2339 | 1220 | os.chdir(wd) | ||
2340 | 1221 | self._mk_versioned_file(fname, total_lines=0) # rev1 | ||
2341 | 1222 | self._mk_versioned_file('file1.txt') # rev2 | ||
2342 | 1223 | self._update_file(fname, text="v3 text\n") # rev3 | ||
2343 | 1224 | self._update_file(fname, text="v4 text\n") # rev4 | ||
2344 | 1225 | self._update_file(fname, text="v5 text\n") # rev5 | ||
2345 | 1226 | self._update_file(fname, text="v6 text\n") # rev6 | ||
2346 | 1227 | |||
2347 | 1228 | out, err = self.run_bzr(['grep', '-r', '1..', 'v3']) | ||
2348 | 1229 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2349 | 1230 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2350 | 1231 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2351 | 1232 | self.assertContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2352 | 1233 | self.assertEqual(len(out.splitlines()), 4) | ||
2353 | 1234 | |||
2354 | 1235 | out, err = self.run_bzr(['grep', '-r', '..1', 'v3']) | ||
2355 | 1236 | # searching only rev1 gives nothing | ||
2356 | 1237 | self.assertEqual(len(out.splitlines()), 0) | ||
2357 | 1238 | |||
2358 | 1239 | out, err = self.run_bzr(['grep', '-r', '..6', 'v3']) | ||
2359 | 1240 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2360 | 1241 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2361 | 1242 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2362 | 1243 | self.assertContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2363 | 1244 | self.assertEqual(len(out.splitlines()), 4) | ||
2364 | 1245 | |||
2365 | 1246 | out, err = self.run_bzr(['grep', '-r', '..', 'v3']) | ||
2366 | 1247 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2367 | 1248 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2368 | 1249 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2369 | 1250 | self.assertContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2370 | 1251 | self.assertEqual(len(out.splitlines()), 4) | ||
2371 | 1252 | |||
2372 | 1253 | out, err = self.run_bzr(['grep', '-r', '1..5', 'v3']) | ||
2373 | 1254 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2374 | 1255 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2375 | 1256 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2376 | 1257 | self.assertNotContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2377 | 1258 | self.assertEqual(len(out.splitlines()), 3) | ||
2378 | 1259 | |||
2379 | 1260 | out, err = self.run_bzr(['grep', '-r', '5..1', 'v3']) | ||
2380 | 1261 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2381 | 1262 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2382 | 1263 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2383 | 1264 | self.assertNotContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2384 | 1265 | self.assertEqual(len(out.splitlines()), 3) | ||
2385 | 1266 | |||
2386 | 1267 | out, err = self.run_bzr(['grep', '-r', '1..', '[tuv]3']) | ||
2387 | 1268 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2388 | 1269 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2389 | 1270 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2390 | 1271 | self.assertContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2391 | 1272 | self.assertEqual(len(out.splitlines()), 4) | ||
2392 | 1273 | |||
2393 | 1274 | out, err = self.run_bzr(['grep', '-r', '1..5', '[tuv]3']) | ||
2394 | 1275 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2395 | 1276 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2396 | 1277 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2397 | 1278 | self.assertNotContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2398 | 1279 | self.assertEqual(len(out.splitlines()), 3) | ||
2399 | 1280 | |||
2400 | 1281 | out, err = self.run_bzr(['grep', '-r', '5..1', '[tuv]3']) | ||
2401 | 1282 | self.assertContainsRe(out, "file0.txt~3:v3", flags=TestGrep._reflags) | ||
2402 | 1283 | self.assertContainsRe(out, "file0.txt~4:v3", flags=TestGrep._reflags) | ||
2403 | 1284 | self.assertContainsRe(out, "file0.txt~5:v3", flags=TestGrep._reflags) | ||
2404 | 1285 | self.assertNotContainsRe(out, "file0.txt~6:v3", flags=TestGrep._reflags) | ||
2405 | 1286 | self.assertEqual(len(out.splitlines()), 3) | ||
2406 | 1287 | |||
2407 | 1288 | def test_revno_range_versioned_file_in_dir(self): | ||
2408 | 1289 | """Grep rev-range for pattern for file withing a dir. | ||
2409 | 1290 | """ | ||
2410 | 1291 | wd = 'foobar0' | ||
2411 | 1292 | self.make_branch_and_tree(wd) | ||
2412 | 1293 | os.chdir(wd) | ||
2413 | 1294 | self._mk_versioned_dir('dir0') # rev1 | ||
2414 | 1295 | self._mk_versioned_file('dir0/file0.txt') # rev2 | ||
2415 | 1296 | self._update_file('dir0/file0.txt', "v3 text\n") # rev3 | ||
2416 | 1297 | self._update_file('dir0/file0.txt', "v4 text\n") # rev4 | ||
2417 | 1298 | self._update_file('dir0/file0.txt', "v5 text\n") # rev5 | ||
2418 | 1299 | self._update_file('dir0/file0.txt', "v6 text\n") # rev6 | ||
2419 | 1300 | |||
2420 | 1301 | out, err = self.run_bzr(['grep', '-r', '2..5', 'v3']) | ||
2421 | 1302 | self.assertContainsRe(out, "^dir0/file0.txt~3:v3", flags=TestGrep._reflags) | ||
2422 | 1303 | self.assertContainsRe(out, "^dir0/file0.txt~4:v3", flags=TestGrep._reflags) | ||
2423 | 1304 | self.assertContainsRe(out, "^dir0/file0.txt~5:v3", flags=TestGrep._reflags) | ||
2424 | 1305 | self.assertNotContainsRe(out, "^dir0/file0.txt~6:v3", flags=TestGrep._reflags) | ||
2425 | 1306 | self.assertEqual(len(out.splitlines()), 3) | ||
2426 | 1307 | |||
2427 | 1308 | out, err = self.run_bzr(['grep', '-r', '2..5', '[tuv]3']) | ||
2428 | 1309 | self.assertContainsRe(out, "^dir0/file0.txt~3:v3", flags=TestGrep._reflags) | ||
2429 | 1310 | self.assertContainsRe(out, "^dir0/file0.txt~4:v3", flags=TestGrep._reflags) | ||
2430 | 1311 | self.assertContainsRe(out, "^dir0/file0.txt~5:v3", flags=TestGrep._reflags) | ||
2431 | 1312 | self.assertNotContainsRe(out, "^dir0/file0.txt~6:v3", flags=TestGrep._reflags) | ||
2432 | 1313 | self.assertEqual(len(out.splitlines()), 3) | ||
2433 | 1314 | |||
2434 | 1315 | def test_revno_range_versioned_file_from_outside_dir(self): | ||
2435 | 1316 | """Grep rev-range for pattern from outside dir. | ||
2436 | 1317 | """ | ||
2437 | 1318 | wd = 'foobar0' | ||
2438 | 1319 | self.make_branch_and_tree(wd) | ||
2439 | 1320 | os.chdir(wd) | ||
2440 | 1321 | self._mk_versioned_dir('dir0') # rev1 | ||
2441 | 1322 | self._mk_versioned_file('dir0/file0.txt') # rev2 | ||
2442 | 1323 | self._update_file('dir0/file0.txt', "v3 text\n") # rev3 | ||
2443 | 1324 | self._update_file('dir0/file0.txt', "v4 text\n") # rev4 | ||
2444 | 1325 | self._update_file('dir0/file0.txt', "v5 text\n") # rev5 | ||
2445 | 1326 | self._update_file('dir0/file0.txt', "v6 text\n") # rev6 | ||
2446 | 1327 | |||
2447 | 1328 | out, err = self.run_bzr(['grep', '-r', '2..5', 'v3', 'dir0']) | ||
2448 | 1329 | self.assertContainsRe(out, "^dir0/file0.txt~3:v3", flags=TestGrep._reflags) | ||
2449 | 1330 | self.assertContainsRe(out, "^dir0/file0.txt~4:v3", flags=TestGrep._reflags) | ||
2450 | 1331 | self.assertContainsRe(out, "^dir0/file0.txt~5:v3", flags=TestGrep._reflags) | ||
2451 | 1332 | self.assertNotContainsRe(out, "^dir0/file0.txt~6:v3", flags=TestGrep._reflags) | ||
2452 | 1333 | |||
2453 | 1334 | out, err = self.run_bzr(['grep', '-r', '2..5', '[tuv]3', 'dir0']) | ||
2454 | 1335 | self.assertContainsRe(out, "^dir0/file0.txt~3:v3", flags=TestGrep._reflags) | ||
2455 | 1336 | self.assertContainsRe(out, "^dir0/file0.txt~4:v3", flags=TestGrep._reflags) | ||
2456 | 1337 | self.assertContainsRe(out, "^dir0/file0.txt~5:v3", flags=TestGrep._reflags) | ||
2457 | 1338 | self.assertNotContainsRe(out, "^dir0/file0.txt~6:v3", flags=TestGrep._reflags) | ||
2458 | 1339 | |||
2459 | 1340 | def test_levels(self): | ||
2460 | 1341 | """--levels=0 should show findings from merged revision. | ||
2461 | 1342 | """ | ||
2462 | 1343 | wd0 = 'foobar0' | ||
2463 | 1344 | wd1 = 'foobar1' | ||
2464 | 1345 | |||
2465 | 1346 | self.make_branch_and_tree(wd0) | ||
2466 | 1347 | os.chdir(wd0) | ||
2467 | 1348 | self._mk_versioned_file('file0.txt') | ||
2468 | 1349 | os.chdir('..') | ||
2469 | 1350 | |||
2470 | 1351 | out, err = self.run_bzr(['branch', wd0, wd1]) | ||
2471 | 1352 | os.chdir(wd1) | ||
2472 | 1353 | self._mk_versioned_file('file1.txt') | ||
2473 | 1354 | os.chdir(osutils.pathjoin('..', wd0)) | ||
2474 | 1355 | |||
2475 | 1356 | out, err = self.run_bzr(['merge', osutils.pathjoin('..', wd1)]) | ||
2476 | 1357 | out, err = self.run_bzr(['ci', '-m', 'merged']) | ||
2477 | 1358 | |||
2478 | 1359 | out, err = self.run_bzr(['grep', 'line1']) | ||
2479 | 1360 | self.assertContainsRe(out, "file0.txt:line1", flags=TestGrep._reflags) | ||
2480 | 1361 | self.assertContainsRe(out, "file1.txt:line1", flags=TestGrep._reflags) | ||
2481 | 1362 | |||
2482 | 1363 | # levels should be ignored by wtree grep | ||
2483 | 1364 | out, err = self.run_bzr(['grep', '--levels=0', 'line1']) | ||
2484 | 1365 | self.assertContainsRe(out, "^file0.txt:line1$", flags=TestGrep._reflags) | ||
2485 | 1366 | self.assertContainsRe(out, "^file1.txt:line1$", flags=TestGrep._reflags) | ||
2486 | 1367 | self.assertContainsRe(out, "^file0.txt:line10$", flags=TestGrep._reflags) | ||
2487 | 1368 | self.assertContainsRe(out, "^file1.txt:line10$", flags=TestGrep._reflags) | ||
2488 | 1369 | self.assertEqual(len(out.splitlines()), 4) | ||
2489 | 1370 | |||
2490 | 1371 | out, err = self.run_bzr(['grep', '-r', 'last:1..', '--levels=0', 'line1']) | ||
2491 | 1372 | self.assertContainsRe(out, "^file0.txt~2:line1$", flags=TestGrep._reflags) | ||
2492 | 1373 | self.assertContainsRe(out, "^file1.txt~2:line1$", flags=TestGrep._reflags) | ||
2493 | 1374 | self.assertContainsRe(out, "^file0.txt~1.1.1:line1$", flags=TestGrep._reflags) | ||
2494 | 1375 | self.assertContainsRe(out, "^file1.txt~1.1.1:line1$", flags=TestGrep._reflags) | ||
2495 | 1376 | self.assertContainsRe(out, "^file0.txt~2:line10$", flags=TestGrep._reflags) | ||
2496 | 1377 | self.assertContainsRe(out, "^file1.txt~2:line10$", flags=TestGrep._reflags) | ||
2497 | 1378 | self.assertContainsRe(out, "^file0.txt~1.1.1:line10$", flags=TestGrep._reflags) | ||
2498 | 1379 | self.assertContainsRe(out, "^file1.txt~1.1.1:line10$", flags=TestGrep._reflags) | ||
2499 | 1380 | self.assertEqual(len(out.splitlines()), 8) | ||
2500 | 1381 | |||
2501 | 1382 | out, err = self.run_bzr(['grep', '-r', '-1..', '-n', '--levels=0', 'line1']) | ||
2502 | 1383 | self.assertContainsRe(out, "^file0.txt~2:1:line1$", flags=TestGrep._reflags) | ||
2503 | 1384 | self.assertContainsRe(out, "^file1.txt~2:1:line1$", flags=TestGrep._reflags) | ||
2504 | 1385 | self.assertContainsRe(out, "^file0.txt~1.1.1:1:line1$", flags=TestGrep._reflags) | ||
2505 | 1386 | self.assertContainsRe(out, "^file1.txt~1.1.1:1:line1$", flags=TestGrep._reflags) | ||
2506 | 1387 | self.assertContainsRe(out, "^file0.txt~2:10:line10$", flags=TestGrep._reflags) | ||
2507 | 1388 | self.assertContainsRe(out, "^file1.txt~2:10:line10$", flags=TestGrep._reflags) | ||
2508 | 1389 | self.assertContainsRe(out, "^file0.txt~1.1.1:10:line10$", flags=TestGrep._reflags) | ||
2509 | 1390 | self.assertContainsRe(out, "^file1.txt~1.1.1:10:line10$", flags=TestGrep._reflags) | ||
2510 | 1391 | self.assertEqual(len(out.splitlines()), 8) | ||
2511 | 1392 | |||
2512 | 1393 | # levels should be ignored by wtree grep | ||
2513 | 1394 | out, err = self.run_bzr(['grep', '--levels=0', 'l.ne1']) | ||
2514 | 1395 | self.assertContainsRe(out, "^file0.txt:line1$", flags=TestGrep._reflags) | ||
2515 | 1396 | self.assertContainsRe(out, "^file1.txt:line1$", flags=TestGrep._reflags) | ||
2516 | 1397 | self.assertContainsRe(out, "^file0.txt:line10$", flags=TestGrep._reflags) | ||
2517 | 1398 | self.assertContainsRe(out, "^file1.txt:line10$", flags=TestGrep._reflags) | ||
2518 | 1399 | self.assertEqual(len(out.splitlines()), 4) | ||
2519 | 1400 | |||
2520 | 1401 | out, err = self.run_bzr(['grep', '-r', 'last:1..', '--levels=0', 'lin.1']) | ||
2521 | 1402 | self.assertContainsRe(out, "^file0.txt~2:line1$", flags=TestGrep._reflags) | ||
2522 | 1403 | self.assertContainsRe(out, "^file1.txt~2:line1$", flags=TestGrep._reflags) | ||
2523 | 1404 | self.assertContainsRe(out, "^file0.txt~1.1.1:line1$", flags=TestGrep._reflags) | ||
2524 | 1405 | self.assertContainsRe(out, "^file1.txt~1.1.1:line1$", flags=TestGrep._reflags) | ||
2525 | 1406 | self.assertContainsRe(out, "^file0.txt~2:line10$", flags=TestGrep._reflags) | ||
2526 | 1407 | self.assertContainsRe(out, "^file1.txt~2:line10$", flags=TestGrep._reflags) | ||
2527 | 1408 | self.assertContainsRe(out, "^file0.txt~1.1.1:line10$", flags=TestGrep._reflags) | ||
2528 | 1409 | self.assertContainsRe(out, "^file1.txt~1.1.1:line10$", flags=TestGrep._reflags) | ||
2529 | 1410 | self.assertEqual(len(out.splitlines()), 8) | ||
2530 | 1411 | |||
2531 | 1412 | out, err = self.run_bzr(['grep', '-r', '-1..', '-n', '--levels=0', '.ine1']) | ||
2532 | 1413 | self.assertContainsRe(out, "file0.txt~2:1:line1", flags=TestGrep._reflags) | ||
2533 | 1414 | self.assertContainsRe(out, "file1.txt~2:1:line1", flags=TestGrep._reflags) | ||
2534 | 1415 | self.assertContainsRe(out, "file0.txt~1.1.1:1:line1", flags=TestGrep._reflags) | ||
2535 | 1416 | self.assertContainsRe(out, "file1.txt~1.1.1:1:line1", flags=TestGrep._reflags) | ||
2536 | 1417 | |||
2537 | 1418 | def test_dotted_rev_grep(self): | ||
2538 | 1419 | """Grep in dotted revs | ||
2539 | 1420 | """ | ||
2540 | 1421 | wd0 = 'foobar0' | ||
2541 | 1422 | wd1 = 'foobar1' | ||
2542 | 1423 | |||
2543 | 1424 | self.make_branch_and_tree(wd0) | ||
2544 | 1425 | os.chdir(wd0) | ||
2545 | 1426 | self._mk_versioned_file('file0.txt') | ||
2546 | 1427 | os.chdir('..') | ||
2547 | 1428 | |||
2548 | 1429 | out, err = self.run_bzr(['branch', wd0, wd1]) | ||
2549 | 1430 | os.chdir(wd1) | ||
2550 | 1431 | self._mk_versioned_file('file1.txt') # revno 1.1.1 | ||
2551 | 1432 | self._update_file('file1.txt', "text 0\n") # revno 1.1.2 | ||
2552 | 1433 | self._update_file('file1.txt', "text 1\n") # revno 1.1.3 | ||
2553 | 1434 | self._update_file('file1.txt', "text 2\n") # revno 1.1.4 | ||
2554 | 1435 | os.chdir(osutils.pathjoin('..', wd0)) | ||
2555 | 1436 | |||
2556 | 1437 | out, err = self.run_bzr(['merge', osutils.pathjoin('..', wd1)]) | ||
2557 | 1438 | out, err = self.run_bzr(['ci', '-m', 'merged']) | ||
2558 | 1439 | |||
2559 | 1440 | out, err = self.run_bzr(['grep', '-r', '1.1.1..1.1.4', 'text']) | ||
2560 | 1441 | self.assertContainsRe(out, "file1.txt~1.1.2:text 0", flags=TestGrep._reflags) | ||
2561 | 1442 | self.assertContainsRe(out, "file1.txt~1.1.3:text 1", flags=TestGrep._reflags) | ||
2562 | 1443 | self.assertContainsRe(out, "file1.txt~1.1.3:text 1", flags=TestGrep._reflags) | ||
2563 | 1444 | self.assertContainsRe(out, "file1.txt~1.1.4:text 0", flags=TestGrep._reflags) | ||
2564 | 1445 | self.assertContainsRe(out, "file1.txt~1.1.4:text 1", flags=TestGrep._reflags) | ||
2565 | 1446 | self.assertContainsRe(out, "file1.txt~1.1.4:text 2", flags=TestGrep._reflags) | ||
2566 | 1447 | self.assertEqual(len(out.splitlines()), 6) | ||
2567 | 1448 | |||
2568 | 1449 | def test_versioned_binary_file_grep(self): | ||
2569 | 1450 | """(versioned) Grep for pattern in binary file. | ||
2570 | 1451 | """ | ||
2571 | 1452 | wd = 'foobar0' | ||
2572 | 1453 | self.make_branch_and_tree(wd) | ||
2573 | 1454 | os.chdir(wd) | ||
2574 | 1455 | self._mk_versioned_file('file.txt') | ||
2575 | 1456 | self._mk_versioned_file('file0.bin') | ||
2576 | 1457 | self._update_file('file0.bin', "\x00lineNN\x00\n") | ||
2577 | 1458 | |||
2578 | 1459 | # note: set --verbose/-v flag to get the skip message. | ||
2579 | 1460 | out, err = self.run_bzr(['grep', '-v', '-r', 'last:1', | ||
2580 | 1461 | 'lineNN', 'file0.bin']) | ||
2581 | 1462 | self.assertNotContainsRe(out, "file0.bin", flags=TestGrep._reflags) | ||
2582 | 1463 | self.assertContainsRe(err, "Binary file.*file0.bin.*skipped", flags=TestGrep._reflags) | ||
2583 | 1464 | self.assertEqual(len(out.splitlines()), 0) | ||
2584 | 1465 | self.assertEqual(len(err.splitlines()), 1) | ||
2585 | 1466 | |||
2586 | 1467 | out, err = self.run_bzr(['grep', '-v', '-r', 'last:1', | ||
2587 | 1468 | 'line.N', 'file0.bin']) | ||
2588 | 1469 | self.assertNotContainsRe(out, "file0.bin", flags=TestGrep._reflags) | ||
2589 | 1470 | self.assertContainsRe(err, "Binary file.*file0.bin.*skipped", flags=TestGrep._reflags) | ||
2590 | 1471 | self.assertEqual(len(out.splitlines()), 0) | ||
2591 | 1472 | self.assertEqual(len(err.splitlines()), 1) | ||
2592 | 1473 | |||
2593 | 1474 | def test_wtree_binary_file_grep(self): | ||
2594 | 1475 | """(wtree) Grep for pattern in binary file. | ||
2595 | 1476 | """ | ||
2596 | 1477 | wd = 'foobar0' | ||
2597 | 1478 | self.make_branch_and_tree(wd) | ||
2598 | 1479 | os.chdir(wd) | ||
2599 | 1480 | self._mk_versioned_file('file0.bin') | ||
2600 | 1481 | self._update_file('file0.bin', "\x00lineNN\x00\n") | ||
2601 | 1482 | |||
2602 | 1483 | # note: set --verbose/-v flag to get the skip message. | ||
2603 | 1484 | out, err = self.run_bzr(['grep', '-v', 'lineNN', 'file0.bin']) | ||
2604 | 1485 | self.assertNotContainsRe(out, "file0.bin:line1", flags=TestGrep._reflags) | ||
2605 | 1486 | self.assertContainsRe(err, "Binary file.*file0.bin.*skipped", flags=TestGrep._reflags) | ||
2606 | 1487 | |||
2607 | 1488 | # binary warning should not be shown without --verbose | ||
2608 | 1489 | out, err = self.run_bzr(['grep', 'lineNN', 'file0.bin']) | ||
2609 | 1490 | self.assertNotContainsRe(out, "file0.bin:line1", flags=TestGrep._reflags) | ||
2610 | 1491 | self.assertNotContainsRe(err, "Binary file", flags=TestGrep._reflags) | ||
2611 | 1492 | |||
2612 | 1493 | def test_revspec(self): | ||
2613 | 1494 | """Ensure various revspecs work | ||
2614 | 1495 | """ | ||
2615 | 1496 | wd = 'foobar0' | ||
2616 | 1497 | self.make_branch_and_tree(wd) | ||
2617 | 1498 | os.chdir(wd) | ||
2618 | 1499 | self._mk_versioned_dir('dir0') # rev1 | ||
2619 | 1500 | self._mk_versioned_file('dir0/file0.txt') # rev2 | ||
2620 | 1501 | self._update_file('dir0/file0.txt', "v3 text\n") # rev3 | ||
2621 | 1502 | self._update_file('dir0/file0.txt', "v4 text\n") # rev4 | ||
2622 | 1503 | self._update_file('dir0/file0.txt', "v5 text\n") # rev5 | ||
2623 | 1504 | |||
2624 | 1505 | out, err = self.run_bzr(['grep', '-r', 'revno:1..2', 'v3']) | ||
2625 | 1506 | self.assertNotContainsRe(out, "file0", flags=TestGrep._reflags) | ||
2626 | 1507 | self.assertEqual(len(out.splitlines()), 0) | ||
2627 | 1508 | |||
2628 | 1509 | out, err = self.run_bzr(['grep', '-r', 'revno:4..', 'v4']) | ||
2629 | 1510 | self.assertContainsRe(out, "^dir0/file0.txt", flags=TestGrep._reflags) | ||
2630 | 1511 | self.assertEqual(len(out.splitlines()), 2) # find v4 in rev4 and rev5 | ||
2631 | 1512 | |||
2632 | 1513 | out, err = self.run_bzr(['grep', '-r', '..revno:3', 'v4']) | ||
2633 | 1514 | self.assertNotContainsRe(out, "file0", flags=TestGrep._reflags) | ||
2634 | 1515 | self.assertEqual(len(out.splitlines()), 0) | ||
2635 | 1516 | |||
2636 | 1517 | out, err = self.run_bzr(['grep', '-r', '..revno:3', 'v3']) | ||
2637 | 1518 | self.assertContainsRe(out, "^dir0/file0.txt", flags=TestGrep._reflags) | ||
2638 | 1519 | self.assertEqual(len(out.splitlines()), 1) | ||
2639 | 1520 | |||
2640 | 1521 | def test_wtree_files_with_matches(self): | ||
2641 | 1522 | """(wtree) Ensure --files-with-matches, -l works | ||
2642 | 1523 | """ | ||
2643 | 1524 | wd = 'foobar0' | ||
2644 | 1525 | self.make_branch_and_tree(wd) | ||
2645 | 1526 | os.chdir(wd) | ||
2646 | 1527 | |||
2647 | 1528 | self._mk_versioned_file('file0.txt', total_lines=2) | ||
2648 | 1529 | self._mk_versioned_file('file1.txt', total_lines=2) | ||
2649 | 1530 | self._mk_versioned_dir('dir0') | ||
2650 | 1531 | self._mk_versioned_file('dir0/file00.txt', total_lines=2) | ||
2651 | 1532 | self._mk_versioned_file('dir0/file01.txt', total_lines=2) | ||
2652 | 1533 | |||
2653 | 1534 | self._update_file('file0.txt', 'HELLO\n', checkin=False) | ||
2654 | 1535 | self._update_file('dir0/file00.txt', 'HELLO\n', checkin=False) | ||
2655 | 1536 | |||
2656 | 1537 | # fixed-string | ||
2657 | 1538 | out, err = self.run_bzr(['grep', '--files-with-matches', 'HELLO']) | ||
2658 | 1539 | |||
2659 | 1540 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2660 | 1541 | self.assertContainsRe(out, "^dir0/file00.txt$", flags=TestGrep._reflags) | ||
2661 | 1542 | self.assertEqual(len(out.splitlines()), 2) | ||
2662 | 1543 | |||
2663 | 1544 | # regex | ||
2664 | 1545 | out, err = self.run_bzr(['grep', '--files-with-matches', 'HE.LO']) | ||
2665 | 1546 | |||
2666 | 1547 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2667 | 1548 | self.assertContainsRe(out, "^dir0/file00.txt$", flags=TestGrep._reflags) | ||
2668 | 1549 | self.assertEqual(len(out.splitlines()), 2) | ||
2669 | 1550 | |||
2670 | 1551 | # fixed-string | ||
2671 | 1552 | out, err = self.run_bzr(['grep', '-l', 'HELLO']) | ||
2672 | 1553 | |||
2673 | 1554 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2674 | 1555 | self.assertContainsRe(out, "^dir0/file00.txt$", flags=TestGrep._reflags) | ||
2675 | 1556 | self.assertEqual(len(out.splitlines()), 2) | ||
2676 | 1557 | |||
2677 | 1558 | # regex | ||
2678 | 1559 | out, err = self.run_bzr(['grep', '-l', 'HE.LO']) | ||
2679 | 1560 | |||
2680 | 1561 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2681 | 1562 | self.assertContainsRe(out, "^dir0/file00.txt$", flags=TestGrep._reflags) | ||
2682 | 1563 | self.assertEqual(len(out.splitlines()), 2) | ||
2683 | 1564 | |||
2684 | 1565 | # fixed-string | ||
2685 | 1566 | out, err = self.run_bzr(['grep', '-l', 'HELLO', 'dir0', 'file1.txt']) | ||
2686 | 1567 | |||
2687 | 1568 | self.assertContainsRe(out, "^dir0/file00.txt$", flags=TestGrep._reflags) | ||
2688 | 1569 | self.assertEqual(len(out.splitlines()), 1) | ||
2689 | 1570 | |||
2690 | 1571 | # regex | ||
2691 | 1572 | out, err = self.run_bzr(['grep', '-l', '.ELLO', 'dir0', 'file1.txt']) | ||
2692 | 1573 | |||
2693 | 1574 | self.assertContainsRe(out, "^dir0/file00.txt$", flags=TestGrep._reflags) | ||
2694 | 1575 | self.assertEqual(len(out.splitlines()), 1) | ||
2695 | 1576 | |||
2696 | 1577 | # fixed-string | ||
2697 | 1578 | out, err = self.run_bzr(['grep', '-l', 'HELLO', 'file0.txt']) | ||
2698 | 1579 | |||
2699 | 1580 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2700 | 1581 | self.assertEqual(len(out.splitlines()), 1) | ||
2701 | 1582 | |||
2702 | 1583 | # regex | ||
2703 | 1584 | out, err = self.run_bzr(['grep', '-l', '.ELLO', 'file0.txt']) | ||
2704 | 1585 | |||
2705 | 1586 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2706 | 1587 | self.assertEqual(len(out.splitlines()), 1) | ||
2707 | 1588 | |||
2708 | 1589 | # fixed-string | ||
2709 | 1590 | out, err = self.run_bzr(['grep', '--no-recursive', '-l', 'HELLO']) | ||
2710 | 1591 | |||
2711 | 1592 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2712 | 1593 | self.assertEqual(len(out.splitlines()), 1) | ||
2713 | 1594 | |||
2714 | 1595 | # regex | ||
2715 | 1596 | out, err = self.run_bzr(['grep', '--no-recursive', '-l', '.ELLO']) | ||
2716 | 1597 | |||
2717 | 1598 | self.assertContainsRe(out, "^file0.txt$", flags=TestGrep._reflags) | ||
2718 | 1599 | self.assertEqual(len(out.splitlines()), 1) | ||
2719 | 1600 | |||
2720 | 1601 | def test_ver_files_with_matches(self): | ||
2721 | 1602 | """(ver) Ensure --files-with-matches, -l works | ||
2722 | 1603 | """ | ||
2723 | 1604 | wd = 'foobar0' | ||
2724 | 1605 | self.make_branch_and_tree(wd) | ||
2725 | 1606 | os.chdir(wd) | ||
2726 | 1607 | |||
2727 | 1608 | self._mk_versioned_file('file0.txt', total_lines=2) # rev 1 | ||
2728 | 1609 | self._mk_versioned_file('file1.txt', total_lines=2) # rev 2 | ||
2729 | 1610 | self._mk_versioned_dir('dir0') # rev 3 | ||
2730 | 1611 | self._mk_versioned_file('dir0/file00.txt', total_lines=2) # rev 4 | ||
2731 | 1612 | self._mk_versioned_file('dir0/file01.txt', total_lines=2) # rev 5 | ||
2732 | 1613 | |||
2733 | 1614 | self._update_file('file0.txt', 'HELLO\n') # rev 6 | ||
2734 | 1615 | self._update_file('dir0/file00.txt', 'HELLO\n') # rev 7 | ||
2735 | 1616 | |||
2736 | 1617 | # fixed-string | ||
2737 | 1618 | out, err = self.run_bzr(['grep', '-r', '-1', '--files-with-matches', | ||
2738 | 1619 | 'HELLO']) | ||
2739 | 1620 | |||
2740 | 1621 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2741 | 1622 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2742 | 1623 | self.assertEqual(len(out.splitlines()), 2) | ||
2743 | 1624 | |||
2744 | 1625 | # regex | ||
2745 | 1626 | out, err = self.run_bzr(['grep', '-r', '-1', '--files-with-matches', | ||
2746 | 1627 | 'H.LLO']) | ||
2747 | 1628 | |||
2748 | 1629 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2749 | 1630 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2750 | 1631 | self.assertEqual(len(out.splitlines()), 2) | ||
2751 | 1632 | |||
2752 | 1633 | # fixed-string | ||
2753 | 1634 | out, err = self.run_bzr(['grep', '-r', '6..7', '--files-with-matches', | ||
2754 | 1635 | 'HELLO']) | ||
2755 | 1636 | |||
2756 | 1637 | self.assertContainsRe(out, "^file0.txt~6$", flags=TestGrep._reflags) | ||
2757 | 1638 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2758 | 1639 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2759 | 1640 | self.assertEqual(len(out.splitlines()), 3) | ||
2760 | 1641 | |||
2761 | 1642 | # regex | ||
2762 | 1643 | out, err = self.run_bzr(['grep', '-r', '6..7', '--files-with-matches', | ||
2763 | 1644 | 'H.LLO']) | ||
2764 | 1645 | |||
2765 | 1646 | self.assertContainsRe(out, "^file0.txt~6$", flags=TestGrep._reflags) | ||
2766 | 1647 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2767 | 1648 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2768 | 1649 | self.assertEqual(len(out.splitlines()), 3) | ||
2769 | 1650 | |||
2770 | 1651 | # fixed-string | ||
2771 | 1652 | out, err = self.run_bzr(['grep', '-r', '-1', '-l', 'HELLO']) | ||
2772 | 1653 | |||
2773 | 1654 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2774 | 1655 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2775 | 1656 | self.assertEqual(len(out.splitlines()), 2) | ||
2776 | 1657 | |||
2777 | 1658 | # regex | ||
2778 | 1659 | out, err = self.run_bzr(['grep', '-r', '-1', '-l', 'H.LLO']) | ||
2779 | 1660 | |||
2780 | 1661 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2781 | 1662 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2782 | 1663 | self.assertEqual(len(out.splitlines()), 2) | ||
2783 | 1664 | |||
2784 | 1665 | # fixed-string | ||
2785 | 1666 | out, err = self.run_bzr(['grep', '-l', 'HELLO', '-r', '-1', | ||
2786 | 1667 | 'dir0', 'file1.txt']) | ||
2787 | 1668 | |||
2788 | 1669 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2789 | 1670 | self.assertEqual(len(out.splitlines()), 1) | ||
2790 | 1671 | |||
2791 | 1672 | # regex | ||
2792 | 1673 | out, err = self.run_bzr(['grep', '-l', 'H.LLO', '-r', '-1', | ||
2793 | 1674 | 'dir0', 'file1.txt']) | ||
2794 | 1675 | |||
2795 | 1676 | self.assertContainsRe(out, "^dir0/file00.txt~7$", flags=TestGrep._reflags) | ||
2796 | 1677 | self.assertEqual(len(out.splitlines()), 1) | ||
2797 | 1678 | |||
2798 | 1679 | # fixed-string | ||
2799 | 1680 | out, err = self.run_bzr(['grep', '-l', 'HELLO', | ||
2800 | 1681 | '-r', '-2', 'file0.txt']) | ||
2801 | 1682 | |||
2802 | 1683 | self.assertContainsRe(out, "^file0.txt~6$", flags=TestGrep._reflags) | ||
2803 | 1684 | self.assertEqual(len(out.splitlines()), 1) | ||
2804 | 1685 | |||
2805 | 1686 | # regex | ||
2806 | 1687 | out, err = self.run_bzr(['grep', '-l', 'HE.LO', | ||
2807 | 1688 | '-r', '-2', 'file0.txt']) | ||
2808 | 1689 | |||
2809 | 1690 | self.assertContainsRe(out, "^file0.txt~6$", flags=TestGrep._reflags) | ||
2810 | 1691 | self.assertEqual(len(out.splitlines()), 1) | ||
2811 | 1692 | |||
2812 | 1693 | # fixed-string | ||
2813 | 1694 | out, err = self.run_bzr(['grep', '--no-recursive', '-r', '-1', | ||
2814 | 1695 | '-l', 'HELLO']) | ||
2815 | 1696 | |||
2816 | 1697 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2817 | 1698 | self.assertEqual(len(out.splitlines()), 1) | ||
2818 | 1699 | |||
2819 | 1700 | # regex | ||
2820 | 1701 | out, err = self.run_bzr(['grep', '--no-recursive', '-r', '-1', | ||
2821 | 1702 | '-l', '.ELLO']) | ||
2822 | 1703 | |||
2823 | 1704 | self.assertContainsRe(out, "^file0.txt~7$", flags=TestGrep._reflags) | ||
2824 | 1705 | self.assertEqual(len(out.splitlines()), 1) | ||
2825 | 1706 | |||
2826 | 1707 | def test_wtree_files_without_matches(self): | ||
2827 | 1708 | """(wtree) Ensure --files-without-match, -L works | ||
2828 | 1709 | """ | ||
2829 | 1710 | wd = 'foobar0' | ||
2830 | 1711 | self.make_branch_and_tree(wd) | ||
2831 | 1712 | os.chdir(wd) | ||
2832 | 1713 | |||
2833 | 1714 | self._mk_versioned_file('file0.txt', total_lines=2) | ||
2834 | 1715 | self._mk_versioned_file('file1.txt', total_lines=2) | ||
2835 | 1716 | self._mk_versioned_dir('dir0') | ||
2836 | 1717 | self._mk_versioned_file('dir0/file00.txt', total_lines=2) | ||
2837 | 1718 | self._mk_versioned_file('dir0/file01.txt', total_lines=2) | ||
2838 | 1719 | |||
2839 | 1720 | self._update_file('file0.txt', 'HELLO\n', checkin=False) | ||
2840 | 1721 | self._update_file('dir0/file00.txt', 'HELLO\n', checkin=False) | ||
2841 | 1722 | |||
2842 | 1723 | # fixed-string | ||
2843 | 1724 | out, err = self.run_bzr(['grep', '--files-without-match', 'HELLO']) | ||
2844 | 1725 | |||
2845 | 1726 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2846 | 1727 | self.assertContainsRe(out, "^dir0/file01.txt$", flags=TestGrep._reflags) | ||
2847 | 1728 | self.assertEqual(len(out.splitlines()), 2) | ||
2848 | 1729 | |||
2849 | 1730 | # regex | ||
2850 | 1731 | out, err = self.run_bzr(['grep', '--files-without-match', 'HE.LO']) | ||
2851 | 1732 | |||
2852 | 1733 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2853 | 1734 | self.assertContainsRe(out, "^dir0/file01.txt$", flags=TestGrep._reflags) | ||
2854 | 1735 | self.assertEqual(len(out.splitlines()), 2) | ||
2855 | 1736 | |||
2856 | 1737 | # fixed-string | ||
2857 | 1738 | out, err = self.run_bzr(['grep', '-L', 'HELLO']) | ||
2858 | 1739 | |||
2859 | 1740 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2860 | 1741 | self.assertContainsRe(out, "^dir0/file01.txt$", flags=TestGrep._reflags) | ||
2861 | 1742 | self.assertEqual(len(out.splitlines()), 2) | ||
2862 | 1743 | |||
2863 | 1744 | # regex | ||
2864 | 1745 | out, err = self.run_bzr(['grep', '-L', 'HE.LO']) | ||
2865 | 1746 | |||
2866 | 1747 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2867 | 1748 | self.assertContainsRe(out, "^dir0/file01.txt$", flags=TestGrep._reflags) | ||
2868 | 1749 | self.assertEqual(len(out.splitlines()), 2) | ||
2869 | 1750 | |||
2870 | 1751 | # fixed-string | ||
2871 | 1752 | out, err = self.run_bzr(['grep', '-L', 'HELLO', 'dir0', 'file1.txt']) | ||
2872 | 1753 | |||
2873 | 1754 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2874 | 1755 | self.assertContainsRe(out, "^dir0/file01.txt$", flags=TestGrep._reflags) | ||
2875 | 1756 | self.assertEqual(len(out.splitlines()), 2) | ||
2876 | 1757 | |||
2877 | 1758 | # regex | ||
2878 | 1759 | out, err = self.run_bzr(['grep', '-L', '.ELLO', 'dir0', 'file1.txt']) | ||
2879 | 1760 | |||
2880 | 1761 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2881 | 1762 | self.assertContainsRe(out, "^dir0/file01.txt$", flags=TestGrep._reflags) | ||
2882 | 1763 | self.assertEqual(len(out.splitlines()), 2) | ||
2883 | 1764 | |||
2884 | 1765 | # fixed-string | ||
2885 | 1766 | out, err = self.run_bzr(['grep', '-L', 'HELLO', 'file1.txt']) | ||
2886 | 1767 | |||
2887 | 1768 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2888 | 1769 | self.assertEqual(len(out.splitlines()), 1) | ||
2889 | 1770 | |||
2890 | 1771 | # regex | ||
2891 | 1772 | out, err = self.run_bzr(['grep', '-L', '.ELLO', 'file1.txt']) | ||
2892 | 1773 | |||
2893 | 1774 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2894 | 1775 | self.assertEqual(len(out.splitlines()), 1) | ||
2895 | 1776 | |||
2896 | 1777 | # fixed-string | ||
2897 | 1778 | out, err = self.run_bzr(['grep', '--no-recursive', '-L', 'HELLO']) | ||
2898 | 1779 | |||
2899 | 1780 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2900 | 1781 | self.assertEqual(len(out.splitlines()), 1) | ||
2901 | 1782 | |||
2902 | 1783 | # regex | ||
2903 | 1784 | out, err = self.run_bzr(['grep', '--no-recursive', '-L', '.ELLO']) | ||
2904 | 1785 | |||
2905 | 1786 | self.assertContainsRe(out, "^file1.txt$", flags=TestGrep._reflags) | ||
2906 | 1787 | self.assertEqual(len(out.splitlines()), 1) | ||
2907 | 1788 | |||
2908 | 1789 | def test_ver_files_without_matches(self): | ||
2909 | 1790 | """(ver) Ensure --files-without-match, -L works | ||
2910 | 1791 | """ | ||
2911 | 1792 | wd = 'foobar0' | ||
2912 | 1793 | self.make_branch_and_tree(wd) | ||
2913 | 1794 | os.chdir(wd) | ||
2914 | 1795 | |||
2915 | 1796 | self._mk_versioned_file('file0.txt', total_lines=2) # rev 1 | ||
2916 | 1797 | self._mk_versioned_file('file1.txt', total_lines=2) # rev 2 | ||
2917 | 1798 | self._mk_versioned_dir('dir0') # rev 3 | ||
2918 | 1799 | self._mk_versioned_file('dir0/file00.txt', total_lines=2) # rev 4 | ||
2919 | 1800 | self._mk_versioned_file('dir0/file01.txt', total_lines=2) # rev 5 | ||
2920 | 1801 | |||
2921 | 1802 | self._update_file('file0.txt', 'HELLO\n') # rev 6 | ||
2922 | 1803 | self._update_file('dir0/file00.txt', 'HELLO\n') # rev 7 | ||
2923 | 1804 | |||
2924 | 1805 | # fixed-string | ||
2925 | 1806 | out, err = self.run_bzr(['grep', '-r', '-1', '--files-without-match', | ||
2926 | 1807 | 'HELLO']) | ||
2927 | 1808 | |||
2928 | 1809 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2929 | 1810 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2930 | 1811 | self.assertEqual(len(out.splitlines()), 2) | ||
2931 | 1812 | |||
2932 | 1813 | # regex | ||
2933 | 1814 | out, err = self.run_bzr(['grep', '-r', '-1', '--files-without-match', | ||
2934 | 1815 | 'H.LLO']) | ||
2935 | 1816 | |||
2936 | 1817 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2937 | 1818 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2938 | 1819 | self.assertEqual(len(out.splitlines()), 2) | ||
2939 | 1820 | |||
2940 | 1821 | # fixed-string | ||
2941 | 1822 | out, err = self.run_bzr(['grep', '-r', '6..7', '--files-without-match', | ||
2942 | 1823 | 'HELLO']) | ||
2943 | 1824 | |||
2944 | 1825 | self.assertContainsRe(out, "^file1.txt~6$", flags=TestGrep._reflags) | ||
2945 | 1826 | self.assertContainsRe(out, "^dir0/file00.txt~6$", flags=TestGrep._reflags) | ||
2946 | 1827 | self.assertContainsRe(out, "^dir0/file01.txt~6$", flags=TestGrep._reflags) | ||
2947 | 1828 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2948 | 1829 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2949 | 1830 | self.assertEqual(len(out.splitlines()), 5) | ||
2950 | 1831 | |||
2951 | 1832 | # regex | ||
2952 | 1833 | out, err = self.run_bzr(['grep', '-r', '6..7', '--files-without-match', | ||
2953 | 1834 | 'H.LLO']) | ||
2954 | 1835 | |||
2955 | 1836 | self.assertContainsRe(out, "^file1.txt~6$", flags=TestGrep._reflags) | ||
2956 | 1837 | self.assertContainsRe(out, "^dir0/file00.txt~6$", flags=TestGrep._reflags) | ||
2957 | 1838 | self.assertContainsRe(out, "^dir0/file01.txt~6$", flags=TestGrep._reflags) | ||
2958 | 1839 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2959 | 1840 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2960 | 1841 | self.assertEqual(len(out.splitlines()), 5) | ||
2961 | 1842 | |||
2962 | 1843 | # fixed-string | ||
2963 | 1844 | out, err = self.run_bzr(['grep', '-r', '-1', '-L', 'HELLO']) | ||
2964 | 1845 | |||
2965 | 1846 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2966 | 1847 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2967 | 1848 | self.assertEqual(len(out.splitlines()), 2) | ||
2968 | 1849 | |||
2969 | 1850 | # regex | ||
2970 | 1851 | out, err = self.run_bzr(['grep', '-r', '-1', '-L', 'H.LLO']) | ||
2971 | 1852 | |||
2972 | 1853 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2973 | 1854 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2974 | 1855 | self.assertEqual(len(out.splitlines()), 2) | ||
2975 | 1856 | |||
2976 | 1857 | # fixed-string | ||
2977 | 1858 | out, err = self.run_bzr(['grep', '-L', 'HELLO', '-r', '-1', | ||
2978 | 1859 | 'dir0', 'file1.txt']) | ||
2979 | 1860 | |||
2980 | 1861 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2981 | 1862 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2982 | 1863 | self.assertEqual(len(out.splitlines()), 2) | ||
2983 | 1864 | |||
2984 | 1865 | # regex | ||
2985 | 1866 | out, err = self.run_bzr(['grep', '-L', 'H.LLO', '-r', '-1', | ||
2986 | 1867 | 'dir0', 'file1.txt']) | ||
2987 | 1868 | |||
2988 | 1869 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
2989 | 1870 | self.assertContainsRe(out, "^dir0/file01.txt~7$", flags=TestGrep._reflags) | ||
2990 | 1871 | self.assertEqual(len(out.splitlines()), 2) | ||
2991 | 1872 | |||
2992 | 1873 | # fixed-string | ||
2993 | 1874 | out, err = self.run_bzr(['grep', '-L', 'HELLO', | ||
2994 | 1875 | '-r', '-2', 'file1.txt']) | ||
2995 | 1876 | |||
2996 | 1877 | self.assertContainsRe(out, "^file1.txt~6$", flags=TestGrep._reflags) | ||
2997 | 1878 | self.assertEqual(len(out.splitlines()), 1) | ||
2998 | 1879 | |||
2999 | 1880 | # regex | ||
3000 | 1881 | out, err = self.run_bzr(['grep', '-L', 'HE.LO', | ||
3001 | 1882 | '-r', '-2', 'file1.txt']) | ||
3002 | 1883 | |||
3003 | 1884 | self.assertContainsRe(out, "^file1.txt~6$", flags=TestGrep._reflags) | ||
3004 | 1885 | self.assertEqual(len(out.splitlines()), 1) | ||
3005 | 1886 | |||
3006 | 1887 | # fixed-string | ||
3007 | 1888 | out, err = self.run_bzr(['grep', '--no-recursive', '-r', '-1', | ||
3008 | 1889 | '-L', 'HELLO']) | ||
3009 | 1890 | |||
3010 | 1891 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
3011 | 1892 | self.assertEqual(len(out.splitlines()), 1) | ||
3012 | 1893 | |||
3013 | 1894 | # regex | ||
3014 | 1895 | out, err = self.run_bzr(['grep', '--no-recursive', '-r', '-1', | ||
3015 | 1896 | '-L', '.ELLO']) | ||
3016 | 1897 | |||
3017 | 1898 | self.assertContainsRe(out, "^file1.txt~7$", flags=TestGrep._reflags) | ||
3018 | 1899 | self.assertEqual(len(out.splitlines()), 1) | ||
3019 | 1900 | |||
3020 | 1901 | def test_no_tree(self): | ||
3021 | 1902 | """Ensure grep works without working tree. | ||
3022 | 1903 | """ | ||
3023 | 1904 | wd0 = 'foobar0' | ||
3024 | 1905 | wd1 = 'foobar1' | ||
3025 | 1906 | self.make_branch_and_tree(wd0) | ||
3026 | 1907 | os.chdir(wd0) | ||
3027 | 1908 | self._mk_versioned_file('file0.txt') | ||
3028 | 1909 | os.chdir('..') | ||
3029 | 1910 | out, err = self.run_bzr(['branch', '--no-tree', wd0, wd1]) | ||
3030 | 1911 | os.chdir(wd1) | ||
3031 | 1912 | |||
3032 | 1913 | out, err = self.run_bzr(['grep', 'line1'], 3) | ||
3033 | 1914 | self.assertContainsRe(err, "Cannot search working tree", flags=TestGrep._reflags) | ||
3034 | 1915 | self.assertEqual(out, '') | ||
3035 | 1916 | |||
3036 | 1917 | out, err = self.run_bzr(['grep', '-r', '1', 'line1']) | ||
3037 | 1918 | self.assertContainsRe(out, "file0.txt~1:line1", flags=TestGrep._reflags) | ||
3038 | 1919 | self.assertEqual(len(out.splitlines()), 2) # finds line1 and line10 | ||
3039 | 1920 | |||
3040 | 1921 | |||
3041 | 1922 | class TestNonAscii(GrepTestBase): | ||
3042 | 1923 | """Tests for non-ascii filenames and file contents""" | ||
3043 | 1924 | |||
3044 | 1925 | _test_needs_features = [UnicodeFilenameFeature] | ||
3045 | 1926 | |||
3046 | 1927 | def test_unicode_only_file(self): | ||
3047 | 1928 | """Test filename and contents that requires a unicode encoding""" | ||
3048 | 1929 | tree = self.make_branch_and_tree(".") | ||
3049 | 1930 | contents = [u"\u1234"] | ||
3050 | 1931 | self.build_tree(contents) | ||
3051 | 1932 | tree.add(contents) | ||
3052 | 1933 | tree.commit("Initial commit") | ||
3053 | 1934 | as_utf8 = u"\u1234".encode("UTF-8") | ||
3054 | 1935 | |||
3055 | 1936 | # GZ 2010-06-07: Note we can't actually grep for \u1234 as the pattern | ||
3056 | 1937 | # is mangled according to the user encoding. | ||
3057 | 1938 | streams = self.run_bzr(["grep", "--files-with-matches", | ||
3058 | 1939 | u"contents"], encoding="UTF-8") | ||
3059 | 1940 | self.assertEqual(streams, (as_utf8 + "\n", "")) | ||
3060 | 1941 | |||
3061 | 1942 | streams = self.run_bzr(["grep", "-r", "1", "--files-with-matches", | ||
3062 | 1943 | u"contents"], encoding="UTF-8") | ||
3063 | 1944 | self.assertEqual(streams, (as_utf8 + "~1\n", "")) | ||
3064 | 1945 | |||
3065 | 1946 | fileencoding = osutils.get_user_encoding() | ||
3066 | 1947 | as_mangled = as_utf8.decode(fileencoding, "replace").encode("UTF-8") | ||
3067 | 1948 | |||
3068 | 1949 | streams = self.run_bzr(["grep", "-n", | ||
3069 | 1950 | u"contents"], encoding="UTF-8") | ||
3070 | 1951 | self.assertEqual(streams, ("%s:1:contents of %s\n" % | ||
3071 | 1952 | (as_utf8, as_mangled), "")) | ||
3072 | 1953 | |||
3073 | 1954 | streams = self.run_bzr(["grep", "-n", "-r", "1", | ||
3074 | 1955 | u"contents"], encoding="UTF-8") | ||
3075 | 1956 | self.assertEqual(streams, ("%s~1:1:contents of %s\n" % | ||
3076 | 1957 | (as_utf8, as_mangled), "")) | ||
3077 | 1958 | |||
3078 | 1959 | |||
3079 | 1960 | class TestColorGrep(GrepTestBase): | ||
3080 | 1961 | """Tests for the --color option.""" | ||
3081 | 1962 | |||
3082 | 1963 | # GZ 2010-06-05: Does this really require the feature? Nothing prints. | ||
3083 | 1964 | _test_needs_features = [ColorFeature] | ||
3084 | 1965 | |||
3085 | 1966 | _rev_sep = color_string('~', fg=FG.BOLD_YELLOW) | ||
3086 | 1967 | _sep = color_string(':', fg=FG.BOLD_CYAN) | ||
3087 | 1968 | |||
3088 | 1969 | def test_color_option(self): | ||
3089 | 1970 | """Ensure options for color are valid. | ||
3090 | 1971 | """ | ||
3091 | 1972 | out, err = self.run_bzr(['grep', '--color', 'foo', 'bar'], 3) | ||
3092 | 1973 | self.assertEqual(out, '') | ||
3093 | 1974 | self.assertContainsRe(err, 'Valid values for --color are', flags=TestGrep._reflags) | ||
3094 | 1975 | |||
3095 | 1976 | def test_ver_matching_files(self): | ||
3096 | 1977 | """(versioned) Search for matches or no matches only""" | ||
3097 | 1978 | tree = self.make_branch_and_tree(".") | ||
3098 | 1979 | contents = ["d/", "d/aaa", "bbb"] | ||
3099 | 1980 | self.build_tree(contents) | ||
3100 | 1981 | tree.add(contents) | ||
3101 | 1982 | tree.commit("Initial commit") | ||
3102 | 1983 | |||
3103 | 1984 | # GZ 2010-06-05: Maybe modify the working tree here | ||
3104 | 1985 | |||
3105 | 1986 | streams = self.run_bzr(["grep", "--color", "always", "-r", "1", | ||
3106 | 1987 | "--files-with-matches", "aaa"]) | ||
3107 | 1988 | self.assertEqual(streams, ("".join([ | ||
3108 | 1989 | FG.MAGENTA, "d/aaa", self._rev_sep, "1", "\n" | ||
3109 | 1990 | ]), "")) | ||
3110 | 1991 | |||
3111 | 1992 | streams = self.run_bzr(["grep", "--color", "always", "-r", "1", | ||
3112 | 1993 | "--files-without-match", "aaa"]) | ||
3113 | 1994 | self.assertEqual(streams, ("".join([ | ||
3114 | 1995 | FG.MAGENTA, "bbb", self._rev_sep, "1", "\n" | ||
3115 | 1996 | ]), "")) | ||
3116 | 1997 | |||
3117 | 1998 | def test_wtree_matching_files(self): | ||
3118 | 1999 | """(wtree) Search for matches or no matches only""" | ||
3119 | 2000 | tree = self.make_branch_and_tree(".") | ||
3120 | 2001 | contents = ["d/", "d/aaa", "bbb"] | ||
3121 | 2002 | self.build_tree(contents) | ||
3122 | 2003 | tree.add(contents) | ||
3123 | 2004 | tree.commit("Initial commit") | ||
3124 | 2005 | |||
3125 | 2006 | # GZ 2010-06-05: Maybe modify the working tree here | ||
3126 | 2007 | |||
3127 | 2008 | streams = self.run_bzr(["grep", "--color", "always", | ||
3128 | 2009 | "--files-with-matches", "aaa"]) | ||
3129 | 2010 | self.assertEqual(streams, ("".join([ | ||
3130 | 2011 | FG.MAGENTA, "d/aaa", FG.NONE, "\n" | ||
3131 | 2012 | ]), "")) | ||
3132 | 2013 | |||
3133 | 2014 | streams = self.run_bzr(["grep", "--color", "always", | ||
3134 | 2015 | "--files-without-match", "aaa"]) | ||
3135 | 2016 | self.assertEqual(streams, ("".join([ | ||
3136 | 2017 | FG.MAGENTA, "bbb", FG.NONE, "\n" | ||
3137 | 2018 | ]), "")) | ||
3138 | 2019 | |||
3139 | 2020 | def test_ver_basic_file(self): | ||
3140 | 2021 | """(versioned) Search for pattern in specfic file. | ||
3141 | 2022 | """ | ||
3142 | 2023 | wd = 'foobar0' | ||
3143 | 2024 | self.make_branch_and_tree(wd) | ||
3144 | 2025 | os.chdir(wd) | ||
3145 | 2026 | lp = 'foo is foobar' | ||
3146 | 2027 | self._mk_versioned_file('file0.txt', line_prefix=lp, total_lines=1) | ||
3147 | 2028 | |||
3148 | 2029 | # prepare colored result | ||
3149 | 2030 | foo = color_string('foo', fg=FG.BOLD_RED) | ||
3150 | 2031 | res = (FG.MAGENTA + 'file0.txt' | ||
3151 | 2032 | + self._rev_sep + '1' + self._sep | ||
3152 | 2033 | + foo + ' is ' + foo + 'bar1' + '\n') | ||
3153 | 2034 | txt_res = 'file0.txt~1:foo is foobar1\n' | ||
3154 | 2035 | |||
3155 | 2036 | nres = (FG.MAGENTA + 'file0.txt' | ||
3156 | 2037 | + self._rev_sep + '1' + self._sep + '1' + self._sep | ||
3157 | 2038 | + foo + ' is ' + foo + 'bar1' + '\n') | ||
3158 | 2039 | |||
3159 | 2040 | out, err = self.run_bzr(['grep', '--color', | ||
3160 | 2041 | 'always', '-r', '1', 'foo']) | ||
3161 | 2042 | self.assertEqual(out, res) | ||
3162 | 2043 | self.assertEqual(len(out.splitlines()), 1) | ||
3163 | 2044 | |||
3164 | 2045 | # auto should produce plain text result | ||
3165 | 2046 | # as stdout is redireched here. | ||
3166 | 2047 | out, err = self.run_bzr(['grep', '--color', | ||
3167 | 2048 | 'auto', '-r', '1', 'foo']) | ||
3168 | 2049 | self.assertEqual(out, txt_res) | ||
3169 | 2050 | self.assertEqual(len(out.splitlines()), 1) | ||
3170 | 2051 | |||
3171 | 2052 | out, err = self.run_bzr(['grep', '-i', '--color', | ||
3172 | 2053 | 'always', '-r', '1', 'FOO']) | ||
3173 | 2054 | self.assertEqual(out, res) | ||
3174 | 2055 | self.assertEqual(len(out.splitlines()), 1) | ||
3175 | 2056 | |||
3176 | 2057 | out, err = self.run_bzr(['grep', '--color', | ||
3177 | 2058 | 'always', '-r', '1', 'f.o']) | ||
3178 | 2059 | self.assertEqual(out, res) | ||
3179 | 2060 | self.assertEqual(len(out.splitlines()), 1) | ||
3180 | 2061 | |||
3181 | 2062 | out, err = self.run_bzr(['grep', '-i', '--color', | ||
3182 | 2063 | 'always', '-r', '1', 'F.O']) | ||
3183 | 2064 | self.assertEqual(out, res) | ||
3184 | 2065 | self.assertEqual(len(out.splitlines()), 1) | ||
3185 | 2066 | |||
3186 | 2067 | out, err = self.run_bzr(['grep', '-n', '--color', | ||
3187 | 2068 | 'always', '-r', '1', 'foo']) | ||
3188 | 2069 | self.assertEqual(out, nres) | ||
3189 | 2070 | self.assertEqual(len(out.splitlines()), 1) | ||
3190 | 2071 | |||
3191 | 2072 | out, err = self.run_bzr(['grep', '-n', '-i', '--color', | ||
3192 | 2073 | 'always', '-r', '1', 'FOO']) | ||
3193 | 2074 | self.assertEqual(out, nres) | ||
3194 | 2075 | self.assertEqual(len(out.splitlines()), 1) | ||
3195 | 2076 | |||
3196 | 2077 | out, err = self.run_bzr(['grep', '-n', '--color', | ||
3197 | 2078 | 'always', '-r', '1', 'f.o']) | ||
3198 | 2079 | self.assertEqual(out, nres) | ||
3199 | 2080 | self.assertEqual(len(out.splitlines()), 1) | ||
3200 | 2081 | |||
3201 | 2082 | out, err = self.run_bzr(['grep', '-n', '-i', '--color', | ||
3202 | 2083 | 'always', '-r', '1', 'F.O']) | ||
3203 | 2084 | self.assertEqual(out, nres) | ||
3204 | 2085 | self.assertEqual(len(out.splitlines()), 1) | ||
3205 | 2086 | |||
3206 | 2087 | def test_wtree_basic_file(self): | ||
3207 | 2088 | """(wtree) Search for pattern in specfic file. | ||
3208 | 2089 | """ | ||
3209 | 2090 | wd = 'foobar0' | ||
3210 | 2091 | self.make_branch_and_tree(wd) | ||
3211 | 2092 | os.chdir(wd) | ||
3212 | 2093 | lp = 'foo is foobar' | ||
3213 | 2094 | self._mk_versioned_file('file0.txt', line_prefix=lp, total_lines=1) | ||
3214 | 2095 | |||
3215 | 2096 | # prepare colored result | ||
3216 | 2097 | foo = color_string('foo', fg=FG.BOLD_RED) | ||
3217 | 2098 | res = (FG.MAGENTA + 'file0.txt' | ||
3218 | 2099 | + self._sep + foo + ' is ' + foo + 'bar1' + '\n') | ||
3219 | 2100 | |||
3220 | 2101 | nres = (FG.MAGENTA + 'file0.txt' | ||
3221 | 2102 | + self._sep + '1' + self._sep | ||
3222 | 2103 | + foo + ' is ' + foo + 'bar1' + '\n') | ||
3223 | 2104 | |||
3224 | 2105 | out, err = self.run_bzr(['grep', '--color', | ||
3225 | 2106 | 'always', 'foo']) | ||
3226 | 2107 | self.assertEqual(out, res) | ||
3227 | 2108 | self.assertEqual(len(out.splitlines()), 1) | ||
3228 | 2109 | |||
3229 | 2110 | out, err = self.run_bzr(['grep', '-i', '--color', | ||
3230 | 2111 | 'always', 'FOO']) | ||
3231 | 2112 | self.assertEqual(out, res) | ||
3232 | 2113 | self.assertEqual(len(out.splitlines()), 1) | ||
3233 | 2114 | |||
3234 | 2115 | out, err = self.run_bzr(['grep', '--color', | ||
3235 | 2116 | 'always', 'f.o']) | ||
3236 | 2117 | self.assertEqual(out, res) | ||
3237 | 2118 | self.assertEqual(len(out.splitlines()), 1) | ||
3238 | 2119 | |||
3239 | 2120 | out, err = self.run_bzr(['grep', '-i', '--color', | ||
3240 | 2121 | 'always', 'F.O']) | ||
3241 | 2122 | self.assertEqual(out, res) | ||
3242 | 2123 | self.assertEqual(len(out.splitlines()), 1) | ||
3243 | 2124 | |||
3244 | 2125 | out, err = self.run_bzr(['grep', '-n', '--color', | ||
3245 | 2126 | 'always', 'foo']) | ||
3246 | 2127 | self.assertEqual(out, nres) | ||
3247 | 2128 | self.assertEqual(len(out.splitlines()), 1) | ||
3248 | 2129 | |||
3249 | 2130 | out, err = self.run_bzr(['grep', '-n', '-i', '--color', | ||
3250 | 2131 | 'always', 'FOO']) | ||
3251 | 2132 | self.assertEqual(out, nres) | ||
3252 | 2133 | self.assertEqual(len(out.splitlines()), 1) | ||
3253 | 2134 | |||
3254 | 2135 | out, err = self.run_bzr(['grep', '-n', '--color', | ||
3255 | 2136 | 'always', 'f.o']) | ||
3256 | 2137 | self.assertEqual(out, nres) | ||
3257 | 2138 | self.assertEqual(len(out.splitlines()), 1) | ||
3258 | 2139 | |||
3259 | 2140 | out, err = self.run_bzr(['grep', '-n', '-i', '--color', | ||
3260 | 2141 | 'always', 'F.O']) | ||
3261 | 2142 | self.assertEqual(out, nres) | ||
3262 | 2143 | self.assertEqual(len(out.splitlines()), 1) | ||
3263 | 2144 | |||
3264 | 2145 | |||
3265 | 2146 | # copied from bzrlib.tests.blackbox.test_diff | ||
3266 | 2147 | def subst_dates(string): | ||
3267 | 2148 | """Replace date strings with constant values.""" | ||
3268 | 2149 | return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}', | ||
3269 | 2150 | 'YYYY-MM-DD HH:MM:SS +ZZZZ', string) | ||
3270 | 2151 | |||
3271 | 2152 | |||
3272 | 2153 | class TestGrepDiff(tests.TestCaseWithTransport): | ||
3273 | 2154 | |||
3274 | 2155 | def make_example_branch(self): | ||
3275 | 2156 | tree = self.make_branch_and_tree('.') | ||
3276 | 2157 | self.build_tree_contents([ | ||
3277 | 2158 | ('hello', 'foo\n'), | ||
3278 | 2159 | ('goodbye', 'baz\n')]) | ||
3279 | 2160 | tree.add(['hello']) | ||
3280 | 2161 | tree.commit('setup') | ||
3281 | 2162 | tree.add(['goodbye']) | ||
3282 | 2163 | tree.commit('setup') | ||
3283 | 2164 | return tree | ||
3284 | 2165 | |||
3285 | 2166 | def test_grep_diff_basic(self): | ||
3286 | 2167 | """grep -p basic test.""" | ||
3287 | 2168 | tree = self.make_example_branch() | ||
3288 | 2169 | self.build_tree_contents([('hello', 'hello world!\n')]) | ||
3289 | 2170 | tree.commit('updated hello') | ||
3290 | 2171 | out, err = self.run_bzr(['grep', '-p', 'hello']) | ||
3291 | 2172 | self.assertEquals(err, '') | ||
3292 | 2173 | self.assertEqualDiff(subst_dates(out), '''\ | ||
3293 | 2174 | === revno:3 === | ||
3294 | 2175 | === modified file 'hello' | ||
3295 | 2176 | --- hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3296 | 2177 | +++ hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3297 | 2178 | +hello world! | ||
3298 | 2179 | === revno:1 === | ||
3299 | 2180 | === added file 'hello' | ||
3300 | 2181 | --- hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3301 | 2182 | +++ hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3302 | 2183 | ''') | ||
3303 | 2184 | |||
3304 | 2185 | def test_grep_diff_revision(self): | ||
3305 | 2186 | """grep -p specific revision.""" | ||
3306 | 2187 | tree = self.make_example_branch() | ||
3307 | 2188 | self.build_tree_contents([('hello', 'hello world!\n')]) | ||
3308 | 2189 | tree.commit('updated hello') | ||
3309 | 2190 | out, err = self.run_bzr(['grep', '-p', '-r', '3', 'hello']) | ||
3310 | 2191 | self.assertEquals(err, '') | ||
3311 | 2192 | self.assertEqualDiff(subst_dates(out), '''\ | ||
3312 | 2193 | === revno:3 === | ||
3313 | 2194 | === modified file 'hello' | ||
3314 | 2195 | --- hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3315 | 2196 | +++ hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3316 | 2197 | +hello world! | ||
3317 | 2198 | ''') | ||
3318 | 2199 | |||
3319 | 2200 | def test_grep_diff_revision_range(self): | ||
3320 | 2201 | """grep -p revision range.""" | ||
3321 | 2202 | tree = self.make_example_branch() | ||
3322 | 2203 | self.build_tree_contents([('hello', 'hello world!1\n')]) # rev 3 | ||
3323 | 2204 | tree.commit('rev3') | ||
3324 | 2205 | self.build_tree_contents([('blah', 'hello world!2\n')]) # rev 4 | ||
3325 | 2206 | tree.add('blah') | ||
3326 | 2207 | tree.commit('rev4') | ||
3327 | 2208 | open('hello', 'a').write('hello world!3\n') | ||
3328 | 2209 | #self.build_tree_contents([('hello', 'hello world!3\n')]) # rev 5 | ||
3329 | 2210 | tree.commit('rev5') | ||
3330 | 2211 | out, err = self.run_bzr(['grep', '-p', '-r', '2..5', 'hello']) | ||
3331 | 2212 | self.assertEquals(err, '') | ||
3332 | 2213 | self.assertEqualDiff(subst_dates(out), '''\ | ||
3333 | 2214 | === revno:5 === | ||
3334 | 2215 | === modified file 'hello' | ||
3335 | 2216 | --- hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3336 | 2217 | +++ hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3337 | 2218 | +hello world!3 | ||
3338 | 2219 | === revno:4 === | ||
3339 | 2220 | === added file 'blah' | ||
3340 | 2221 | +hello world!2 | ||
3341 | 2222 | === revno:3 === | ||
3342 | 2223 | === modified file 'hello' | ||
3343 | 2224 | --- hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3344 | 2225 | +++ hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3345 | 2226 | +hello world!1 | ||
3346 | 2227 | ''') | ||
3347 | 2228 | |||
3348 | 2229 | def test_grep_diff_color(self): | ||
3349 | 2230 | """grep -p color test.""" | ||
3350 | 2231 | tree = self.make_example_branch() | ||
3351 | 2232 | self.build_tree_contents([('hello', 'hello world!\n')]) | ||
3352 | 2233 | tree.commit('updated hello') | ||
3353 | 2234 | out, err = self.run_bzr(['grep', '--diff', '-r', '3', | ||
3354 | 2235 | '--color', 'always', 'hello']) | ||
3355 | 2236 | self.assertEquals(err, '') | ||
3356 | 2237 | revno = color_string('=== revno:3 ===', fg=FG.BOLD_BLUE) + '\n' | ||
3357 | 2238 | filename = color_string(" === modified file 'hello'", fg=FG.BOLD_MAGENTA) + '\n' | ||
3358 | 2239 | redhello = color_string('hello', fg=FG.BOLD_RED) | ||
3359 | 2240 | diffstr = '''\ | ||
3360 | 2241 | --- hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3361 | 2242 | +++ hello YYYY-MM-DD HH:MM:SS +ZZZZ | ||
3362 | 2243 | +hello world! | ||
3363 | 2244 | ''' | ||
3364 | 2245 | diffstr = diffstr.replace('hello', redhello) | ||
3365 | 2246 | self.assertEqualDiff(subst_dates(out), revno + filename + diffstr) | ||
3366 | 2247 | |||
3367 | 2248 | def test_grep_norevs(self): | ||
3368 | 2249 | """grep -p with zero revisions.""" | ||
3369 | 2250 | out, err = self.run_bzr(['init']) | ||
3370 | 2251 | out, err = self.run_bzr(['grep', '--diff', 'foo'], 3) | ||
3371 | 2252 | self.assertEquals(out, '') | ||
3372 | 2253 | self.assertContainsRe(err, "ERROR:.*revision.* does not exist in branch") | ||
3373 | 2254 | |||
3374 | 0 | 2255 | ||
3375 | === added file 'bzrlib/termcolor.py' | |||
3376 | --- bzrlib/termcolor.py 1970-01-01 00:00:00 +0000 | |||
3377 | +++ bzrlib/termcolor.py 2012-08-03 11:45:28 +0000 | |||
3378 | @@ -0,0 +1,78 @@ | |||
3379 | 1 | # Copyright (C) 2010 Canonical Ltd | ||
3380 | 2 | # | ||
3381 | 3 | # This program is free software; you can redistribute it and/or modify | ||
3382 | 4 | # it under the terms of the GNU General Public License as published by | ||
3383 | 5 | # the Free Software Foundation; either version 2 of the License, or | ||
3384 | 6 | # (at your option) any later version. | ||
3385 | 7 | # | ||
3386 | 8 | # This program is distributed in the hope that it will be useful, | ||
3387 | 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
3388 | 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
3389 | 11 | # GNU General Public License for more details. | ||
3390 | 12 | # | ||
3391 | 13 | # You should have received a copy of the GNU General Public License | ||
3392 | 14 | # along with this program; if not, write to the Free Software | ||
3393 | 15 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
3394 | 16 | |||
3395 | 17 | from __future__ import absolute_import | ||
3396 | 18 | |||
3397 | 19 | import os | ||
3398 | 20 | import sys | ||
3399 | 21 | |||
3400 | 22 | |||
3401 | 23 | class FG(object): | ||
3402 | 24 | """Unix terminal foreground color codes (16-color).""" | ||
3403 | 25 | RED = '\033[31m' | ||
3404 | 26 | GREEN = '\033[32m' | ||
3405 | 27 | YELLOW = '\033[33m' | ||
3406 | 28 | BLUE = '\033[34m' | ||
3407 | 29 | MAGENTA = '\033[35m' | ||
3408 | 30 | CYAN = '\033[36m' | ||
3409 | 31 | WHITE = '\033[37m' | ||
3410 | 32 | |||
3411 | 33 | # Bold Foreground | ||
3412 | 34 | BOLD_RED = '\033[1;31m' | ||
3413 | 35 | BOLD_GREEN = '\033[1;32m' | ||
3414 | 36 | BOLD_YELLOW = '\033[1;33m' | ||
3415 | 37 | BOLD_BLUE = '\033[1;34m' | ||
3416 | 38 | BOLD_MAGENTA = '\033[1;35m' | ||
3417 | 39 | BOLD_CYAN = '\033[1;36m' | ||
3418 | 40 | BOLD_WHITE = '\033[1;37m' | ||
3419 | 41 | |||
3420 | 42 | NONE = '\033[0m' | ||
3421 | 43 | |||
3422 | 44 | |||
3423 | 45 | class BG(object): | ||
3424 | 46 | """Unix terminal background color codes (16-color).""" | ||
3425 | 47 | BLACK = '\033[40m' | ||
3426 | 48 | RED = '\033[41m' | ||
3427 | 49 | GREEN = '\033[42m' | ||
3428 | 50 | YELLOW = '\033[43m' | ||
3429 | 51 | BLUE = '\033[44m' | ||
3430 | 52 | MAGENTA = '\033[45m' | ||
3431 | 53 | CYAN = '\033[46m' | ||
3432 | 54 | WHITE = '\033[47m' | ||
3433 | 55 | |||
3434 | 56 | NONE = '\033[0m' | ||
3435 | 57 | |||
3436 | 58 | |||
3437 | 59 | def color_string(s, fg, bg=''): | ||
3438 | 60 | return fg + bg + s + FG.NONE | ||
3439 | 61 | |||
3440 | 62 | |||
3441 | 63 | def re_color_string(compiled_pattern, s, fg): | ||
3442 | 64 | return compiled_pattern.sub(fg + r'\1' + FG.NONE, s) | ||
3443 | 65 | |||
3444 | 66 | |||
3445 | 67 | def allow_color(): | ||
3446 | 68 | if os.name != 'posix': | ||
3447 | 69 | return False | ||
3448 | 70 | if not sys.stdout.isatty(): | ||
3449 | 71 | return False | ||
3450 | 72 | try: | ||
3451 | 73 | import curses | ||
3452 | 74 | curses.setupterm() | ||
3453 | 75 | return curses.tigetnum('colors') > 2 | ||
3454 | 76 | except curses.error: | ||
3455 | 77 | return False | ||
3456 | 78 | |||
3457 | 0 | 79 | ||
3458 | === modified file 'bzrlib/tests/features.py' | |||
3459 | --- bzrlib/tests/features.py 2012-03-09 16:48:55 +0000 | |||
3460 | +++ bzrlib/tests/features.py 2012-08-03 11:45:28 +0000 | |||
3461 | @@ -492,3 +492,15 @@ | |||
3462 | 492 | 492 | ||
3463 | 493 | 493 | ||
3464 | 494 | win32_feature = Win32Feature() | 494 | win32_feature = Win32Feature() |
3465 | 495 | |||
3466 | 496 | |||
3467 | 497 | class _ColorFeature(Feature): | ||
3468 | 498 | |||
3469 | 499 | def _probe(self): | ||
3470 | 500 | from bzrlib.termcolor import allow_color | ||
3471 | 501 | return allow_color() | ||
3472 | 502 | |||
3473 | 503 | def feature_name(self): | ||
3474 | 504 | return "Terminal supports color." | ||
3475 | 505 | |||
3476 | 506 | ColorFeature = _ColorFeature() | ||
3477 | 495 | 507 | ||
3478 | === modified file 'doc/en/release-notes/bzr-2.6.txt' | |||
3479 | --- doc/en/release-notes/bzr-2.6.txt 2012-07-28 20:20:38 +0000 | |||
3480 | +++ doc/en/release-notes/bzr-2.6.txt 2012-08-03 11:45:28 +0000 | |||
3481 | @@ -102,6 +102,8 @@ | |||
3482 | 102 | * New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``. | 102 | * New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``. |
3483 | 103 | (Jelmer Vernooij, #681792) | 103 | (Jelmer Vernooij, #681792) |
3484 | 104 | 104 | ||
3485 | 105 | * The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij) | ||
3486 | 106 | |||
3487 | 105 | Improvements | 107 | Improvements |
3488 | 106 | ************ | 108 | ************ |
3489 | 107 | 109 |
Let's do this.