1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
|
# Copyright (C) 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
import codecs
import cStringIO
from fnmatch import fnmatch
import os
import re
from bzrlib import bzrdir
from bzrlib.workingtree import WorkingTree
from bzrlib.revisionspec import RevisionSpec, RevisionSpec_revid, RevisionSpec_revno
from bzrlib import (
errors,
lazy_regex,
osutils,
textfile,
trace,
)
""")
_terminal_encoding = osutils.get_terminal_encoding()
_user_encoding = osutils.get_user_encoding()
class _RevisionNotLinear(Exception):
"""Raised when a revision is not on left-hand history."""
def _rev_on_mainline(rev_tuple):
"""returns True is rev tuple is on mainline"""
if len(rev_tuple) == 1:
return True
return rev_tuple[1] == 0 and rev_tuple[2] == 0
# NOTE: _linear_view_revisions is basided on
# bzrlib.log._linear_view_revisions.
# This should probably be a common public API
def _linear_view_revisions(branch, start_rev_id, end_rev_id):
# requires that start is older than end
repo = branch.repository
for revision_id in repo.iter_reverse_revision_history(end_rev_id):
revno = branch.revision_id_to_dotted_revno(revision_id)
revno_str = '.'.join(str(n) for n in revno)
if revision_id == start_rev_id:
yield revision_id, revno_str, 0
break
yield revision_id, revno_str, 0
# NOTE: _graph_view_revisions is copied from
# bzrlib.log._graph_view_revisions.
# This should probably be a common public API
def _graph_view_revisions(branch, start_rev_id, end_rev_id,
rebase_initial_depths=True):
"""Calculate revisions to view including merges, newest to oldest.
:param branch: the branch
:param start_rev_id: the lower revision-id
:param end_rev_id: the upper revision-id
:param rebase_initial_depth: should depths be rebased until a mainline
revision is found?
:return: An iterator of (revision_id, dotted_revno, merge_depth) tuples.
"""
# requires that start is older than end
view_revisions = branch.iter_merge_sorted_revisions(
start_revision_id=end_rev_id, stop_revision_id=start_rev_id,
stop_rule="with-merges")
if not rebase_initial_depths:
for (rev_id, merge_depth, revno, end_of_merge
) in view_revisions:
yield rev_id, '.'.join(map(str, revno)), merge_depth
else:
# We're following a development line starting at a merged revision.
# We need to adjust depths down by the initial depth until we find
# a depth less than it. Then we use that depth as the adjustment.
# If and when we reach the mainline, depth adjustment ends.
depth_adjustment = None
for (rev_id, merge_depth, revno, end_of_merge
) in view_revisions:
if depth_adjustment is None:
depth_adjustment = merge_depth
if depth_adjustment:
if merge_depth < depth_adjustment:
# From now on we reduce the depth adjustement, this can be
# surprising for users. The alternative requires two passes
# which breaks the fast display of the first revision
# though.
depth_adjustment = merge_depth
merge_depth -= depth_adjustment
yield rev_id, '.'.join(map(str, revno)), merge_depth
def compile_pattern(pattern, flags=0):
patternc = None
try:
# use python's re.compile as we need to catch re.error in case of bad pattern
lazy_regex.reset_compile()
patternc = re.compile(pattern, flags)
except re.error, e:
raise errors.BzrError("Invalid pattern: '%s'" % pattern)
return patternc
def is_fixed_string(s):
if re.match("^([A-Za-z0-9_]|\s)*$", s):
return True
return False
def versioned_grep(revision, pattern, compiled_pattern, path_list, recursive,
line_number, from_root, eol_marker, print_revno, levels,
include, exclude, verbose, fixed_string, ignore_case, outf):
wt, relpath = WorkingTree.open_containing('.')
wt.lock_read()
try:
# res_cache is used to cache results for dir grep based on fid.
# If the fid is does not change between results, it means that
# the result will be the same apart from revno. In such a case
# we avoid getting file chunks from repo and grepping. The result
# is just printed by replacing old revno with new one.
res_cache = {}
start_rev = revision[0]
start_revid = start_rev.as_revision_id(wt.branch)
if start_revid == None:
start_rev = RevisionSpec_revno.from_string("revno:1")
start_revid = start_rev.as_revision_id(wt.branch)
srevno_tuple = wt.branch.revision_id_to_dotted_revno(start_revid)
if len(revision) == 2:
end_rev = revision[1]
end_revid = end_rev.as_revision_id(wt.branch)
if end_revid == None:
end_revno, end_revid = wt.branch.last_revision_info()
erevno_tuple = wt.branch.revision_id_to_dotted_revno(end_revid)
grep_mainline = (_rev_on_mainline(srevno_tuple) and
_rev_on_mainline(erevno_tuple))
# ensure that we go in reverse order
if srevno_tuple > erevno_tuple:
srevno_tuple, erevno_tuple = erevno_tuple, srevno_tuple
start_revid, end_revid = end_revid, start_revid
# Optimization: Traversing the mainline in reverse order is much
# faster when we don't want to look at merged revs. We try this
# with _linear_view_revisions. If all revs are to be grepped we
# use the slower _graph_view_revisions
if levels==1 and grep_mainline:
given_revs = _linear_view_revisions(wt.branch, start_revid, end_revid)
else:
given_revs = _graph_view_revisions(wt.branch, start_revid, end_revid)
else:
# We do an optimization below. For grepping a specific revison
# We don't need to call _graph_view_revisions which is slow.
# We create the start_rev_tuple for only that specific revision.
# _graph_view_revisions is used only for revision range.
start_revno = '.'.join(map(str, srevno_tuple))
start_rev_tuple = (start_revid, start_revno, 0)
given_revs = [start_rev_tuple]
for revid, revno, merge_depth in given_revs:
if levels == 1 and merge_depth != 0:
# with level=1 show only top level
continue
rev = RevisionSpec_revid.from_string("revid:"+revid)
tree = rev.as_tree(wt.branch)
for path in path_list:
path_for_id = osutils.pathjoin(relpath, path)
id = tree.path2id(path_for_id)
if not id:
trace.warning("Skipped unknown file '%s'." % path)
continue
if osutils.isdir(path):
path_prefix = path
res_cache = dir_grep(tree, path, relpath, recursive,
line_number, pattern, compiled_pattern,
from_root, eol_marker, revno, print_revno,
include, exclude, verbose, fixed_string,
ignore_case, outf, path_prefix, res_cache)
else:
versioned_file_grep(tree, id, '.', path,
pattern, compiled_pattern, eol_marker, line_number,
revno, print_revno, include, exclude, verbose,
fixed_string, ignore_case, outf)
finally:
wt.unlock()
def workingtree_grep(pattern, compiled_pattern, path_list, recursive,
line_number, from_root, eol_marker, include, exclude, verbose,
fixed_string, ignore_case, outf):
revno = print_revno = None # for working tree set revno to None
tree, branch, relpath = \
bzrdir.BzrDir.open_containing_tree_or_branch('.')
tree.lock_read()
try:
for path in path_list:
if osutils.isdir(path):
path_prefix = path
dir_grep(tree, path, relpath, recursive, line_number,
pattern, compiled_pattern, from_root, eol_marker, revno,
print_revno, include, exclude, verbose, fixed_string,
ignore_case, outf, path_prefix)
else:
_file_grep(open(path).read(), '.', path, pattern,
compiled_pattern, eol_marker, line_number, revno,
print_revno, include, exclude, verbose,
fixed_string, ignore_case, outf)
finally:
tree.unlock()
def _skip_file(include, exclude, path):
if include and not _path_in_glob_list(path, include):
return True
if exclude and _path_in_glob_list(path, exclude):
return True
return False
def dir_grep(tree, path, relpath, recursive, line_number, pattern,
compiled_pattern, from_root, eol_marker, revno, print_revno,
include, exclude, verbose, fixed_string, ignore_case, outf,
path_prefix, res_cache={}):
_revno_pattern = re.compile("\~[0-9.]+:")
dir_res = {}
# setup relpath to open files relative to cwd
rpath = relpath
if relpath:
rpath = osutils.pathjoin('..',relpath)
from_dir = osutils.pathjoin(relpath, path)
if from_root:
# start searching recursively from root
from_dir=None
recursive=True
to_grep = []
to_grep_append = to_grep.append
outf_write = outf.write
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
from_dir=from_dir, recursive=recursive):
if _skip_file(include, exclude, fp):
continue
if fc == 'V' and fkind == 'file':
if revno != None:
# If old result is valid, print results immediately.
# Otherwise, add file info to to_grep so that the
# loop later will get chunks and grep them
file_rev = tree.inventory[fid].revision
old_res = res_cache.get(file_rev)
if old_res != None:
res = []
res_append = res.append
new_rev = ('~%s:' % (revno,))
for line in old_res:
s = _revno_pattern.sub(new_rev, line)
res_append(s)
outf_write(s)
dir_res[file_rev] = res
else:
to_grep_append((fid, (fp, fid)))
else:
# we are grepping working tree.
if from_dir == None:
from_dir = '.'
path_for_file = osutils.pathjoin(tree.basedir, from_dir, fp)
file_text = codecs.open(path_for_file, 'r').read()
_file_grep(file_text, rpath, fp,
pattern, compiled_pattern, eol_marker, line_number, revno,
print_revno, include, exclude, verbose, fixed_string,
ignore_case, outf, path_prefix)
if revno != None: # grep versioned files
for (path, fid), chunks in tree.iter_files_bytes(to_grep):
path = _make_display_path(relpath, path)
res = _file_grep(chunks[0], rpath, path, pattern,
compiled_pattern, eol_marker, line_number, revno,
print_revno, include, exclude, verbose, fixed_string,
ignore_case, outf, path_prefix)
file_rev = tree.inventory[fid].revision
dir_res[file_rev] = res
return dir_res
def _make_display_path(relpath, path):
"""Return path string relative to user cwd.
Take tree's 'relpath' and user supplied 'path', and return path
that can be displayed to the user.
"""
if relpath:
# update path so to display it w.r.t cwd
# handle windows slash separator
path = osutils.normpath(osutils.pathjoin(relpath, path))
path = path.replace('\\', '/')
path = path.replace(relpath + '/', '', 1)
return path
def versioned_file_grep(tree, id, relpath, path, pattern, patternc,
eol_marker, line_number, revno, print_revno, include, exclude,
verbose, fixed_string, ignore_case, outf, path_prefix = None):
"""Create a file object for the specified id and pass it on to _file_grep.
"""
path = _make_display_path(relpath, path)
file_text = tree.get_file_text(id)
_file_grep(file_text, relpath, path, pattern, patternc, eol_marker,
line_number, revno, print_revno, include, exclude, verbose,
fixed_string, ignore_case, outf, path_prefix)
def _path_in_glob_list(path, glob_list):
present = False
for glob in glob_list:
if fnmatch(path, glob):
present = True
break
return present
def _file_grep(file_text, relpath, path, pattern, patternc, eol_marker,
line_number, revno, print_revno, include, exclude, verbose,
fixed_string, ignore_case, outf, path_prefix=None):
res = []
_te = _terminal_encoding
_ue = _user_encoding
pattern = pattern.encode(_ue, 'replace')
if fixed_string and ignore_case:
pattern = pattern.lower()
# test and skip binary files
if '\x00' in file_text[:1024]:
if verbose:
trace.warning("Binary file '%s' skipped." % path)
return res
if path_prefix and path_prefix != '.':
# user has passed a dir arg, show that as result prefix
path = osutils.pathjoin(path_prefix, path)
path = path.encode(_te, 'replace')
# for better performance we moved formatting conditionals out
# of the core loop. hence, the core loop is somewhat duplicated
# for various combinations of formatting options.
if print_revno and line_number:
pfmt = "~%s:%d:%s".encode(_te)
if fixed_string:
for index, line in enumerate(file_text.splitlines()):
if ignore_case:
line = line.lower()
if pattern in line:
line = line.decode(_te, 'replace')
s = path + (pfmt % (revno, index+1, line)) + eol_marker
res.append(s)
outf.write(s)
else:
for index, line in enumerate(file_text.splitlines()):
if patternc.search(line):
line = line.decode(_te, 'replace')
s = path + (pfmt % (revno, index+1, line)) + eol_marker
res.append(s)
outf.write(s)
elif print_revno and not line_number:
pfmt = "~%s:%s".encode(_te, 'replace')
if fixed_string:
for line in file_text.splitlines():
if ignore_case:
line = line.lower()
if pattern in line:
line = line.decode(_te, 'replace')
s = path + (pfmt % (revno, line)) + eol_marker
res.append(s)
outf.write(s)
else:
for line in file_text.splitlines():
if patternc.search(line):
line = line.decode(_te, 'replace')
s = path + (pfmt % (revno, line)) + eol_marker
res.append(s)
outf.write(s)
elif not print_revno and line_number:
pfmt = ":%d:%s".encode(_te)
if fixed_string:
for index, line in enumerate(file_text.splitlines()):
if ignore_case:
line = line.lower()
if pattern in line:
line = line.decode(_te, 'replace')
s = path + (pfmt % (index+1, line)) + eol_marker
res.append(s)
outf.write(s)
else:
for index, line in enumerate(file_text.splitlines()):
if patternc.search(line):
line = line.decode(_te, 'replace')
s = path + (pfmt % (index+1, line)) + eol_marker
res.append(s)
outf.write(s)
else:
pfmt = ":%s".encode(_te)
if fixed_string:
for line in file_text.splitlines():
if ignore_case:
line = line.lower()
if pattern in line:
line = line.decode(_te, 'replace')
s = path + (pfmt % (line,)) + eol_marker
res.append(s)
outf.write(s)
else:
for line in file_text.splitlines():
if patternc.search(line):
line = line.decode(_te, 'replace')
s = path + (pfmt % (line,)) + eol_marker
res.append(s)
outf.write(s)
return res
|