]>
Commit | Line | Data |
---|---|---|
5010cb5f JH |
1 | /* |
2 | * Builtin "git grep" | |
3 | * | |
4 | * Copyright (c) 2006 Junio C Hamano | |
5 | */ | |
6 | #include "cache.h" | |
627d9342 | 7 | #include "repository.h" |
b2141fc1 | 8 | #include "config.h" |
5010cb5f JH |
9 | #include "blob.h" |
10 | #include "tree.h" | |
11 | #include "commit.h" | |
12 | #include "tag.h" | |
1362671f | 13 | #include "tree-walk.h" |
5010cb5f | 14 | #include "builtin.h" |
3e230fa1 | 15 | #include "parse-options.h" |
678e484b JS |
16 | #include "string-list.h" |
17 | #include "run-command.h" | |
60ecac98 | 18 | #include "userdiff.h" |
83b5d2f5 | 19 | #include "grep.h" |
493b7a08 | 20 | #include "quote.h" |
59332d13 | 21 | #include "dir.h" |
64acde94 | 22 | #include "pathspec.h" |
0281e487 | 23 | #include "submodule.h" |
74ed4371 | 24 | #include "submodule-config.h" |
90c62155 | 25 | #include "object-store.h" |
5b594f45 | 26 | |
3e230fa1 | 27 | static char const * const grep_usage[] = { |
9c9b4f2f | 28 | N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"), |
3e230fa1 RS |
29 | NULL |
30 | }; | |
31 | ||
0281e487 | 32 | static int recurse_submodules; |
0281e487 | 33 | |
89f09dd3 VL |
34 | #define GREP_NUM_THREADS_DEFAULT 8 |
35 | static int num_threads; | |
5b594f45 FK |
36 | |
37 | #ifndef NO_PTHREADS | |
89f09dd3 | 38 | static pthread_t *threads; |
5b594f45 | 39 | |
5b594f45 FK |
40 | /* We use one producer thread and THREADS consumer |
41 | * threads. The producer adds struct work_items to 'todo' and the | |
42 | * consumers pick work items from the same array. | |
43 | */ | |
9cba13ca | 44 | struct work_item { |
8f24a632 | 45 | struct grep_source source; |
5b594f45 FK |
46 | char done; |
47 | struct strbuf out; | |
48 | }; | |
49 | ||
50 | /* In the range [todo_done, todo_start) in 'todo' we have work_items | |
51 | * that have been or are processed by a consumer thread. We haven't | |
52 | * written the result for these to stdout yet. | |
53 | * | |
54 | * The work_items in [todo_start, todo_end) are waiting to be picked | |
55 | * up by a consumer thread. | |
56 | * | |
57 | * The ranges are modulo TODO_SIZE. | |
58 | */ | |
59 | #define TODO_SIZE 128 | |
60 | static struct work_item todo[TODO_SIZE]; | |
61 | static int todo_start; | |
62 | static int todo_end; | |
63 | static int todo_done; | |
64 | ||
65 | /* Has all work items been added? */ | |
66 | static int all_work_added; | |
67 | ||
68 | /* This lock protects all the variables above. */ | |
69 | static pthread_mutex_t grep_mutex; | |
70 | ||
1487a12b JH |
71 | static inline void grep_lock(void) |
72 | { | |
8df4c295 ÆAB |
73 | assert(num_threads); |
74 | pthread_mutex_lock(&grep_mutex); | |
1487a12b JH |
75 | } |
76 | ||
77 | static inline void grep_unlock(void) | |
78 | { | |
8df4c295 ÆAB |
79 | assert(num_threads); |
80 | pthread_mutex_unlock(&grep_mutex); | |
1487a12b JH |
81 | } |
82 | ||
5b594f45 FK |
83 | /* Signalled when a new work_item is added to todo. */ |
84 | static pthread_cond_t cond_add; | |
85 | ||
86 | /* Signalled when the result from one work_item is written to | |
87 | * stdout. | |
88 | */ | |
89 | static pthread_cond_t cond_write; | |
90 | ||
91 | /* Signalled when we are finished with everything. */ | |
92 | static pthread_cond_t cond_result; | |
93 | ||
08303c36 | 94 | static int skip_first_line; |
431d6e7b | 95 | |
e2e05d61 | 96 | static void add_work(struct grep_opt *opt, const struct grep_source *gs) |
5b594f45 FK |
97 | { |
98 | grep_lock(); | |
99 | ||
100 | while ((todo_end+1) % ARRAY_SIZE(todo) == todo_done) { | |
101 | pthread_cond_wait(&cond_write, &grep_mutex); | |
102 | } | |
103 | ||
e2e05d61 | 104 | todo[todo_end].source = *gs; |
9dd5245c JK |
105 | if (opt->binary != GREP_BINARY_TEXT) |
106 | grep_source_load_driver(&todo[todo_end].source); | |
5b594f45 FK |
107 | todo[todo_end].done = 0; |
108 | strbuf_reset(&todo[todo_end].out); | |
109 | todo_end = (todo_end + 1) % ARRAY_SIZE(todo); | |
110 | ||
111 | pthread_cond_signal(&cond_add); | |
112 | grep_unlock(); | |
113 | } | |
114 | ||
115 | static struct work_item *get_work(void) | |
116 | { | |
117 | struct work_item *ret; | |
118 | ||
119 | grep_lock(); | |
120 | while (todo_start == todo_end && !all_work_added) { | |
121 | pthread_cond_wait(&cond_add, &grep_mutex); | |
122 | } | |
123 | ||
124 | if (todo_start == todo_end && all_work_added) { | |
125 | ret = NULL; | |
126 | } else { | |
127 | ret = &todo[todo_start]; | |
128 | todo_start = (todo_start + 1) % ARRAY_SIZE(todo); | |
129 | } | |
130 | grep_unlock(); | |
131 | return ret; | |
132 | } | |
133 | ||
5b594f45 FK |
134 | static void work_done(struct work_item *w) |
135 | { | |
136 | int old_done; | |
137 | ||
138 | grep_lock(); | |
139 | w->done = 1; | |
140 | old_done = todo_done; | |
141 | for(; todo[todo_done].done && todo_done != todo_start; | |
142 | todo_done = (todo_done+1) % ARRAY_SIZE(todo)) { | |
143 | w = &todo[todo_done]; | |
431d6e7b | 144 | if (w->out.len) { |
08303c36 RS |
145 | const char *p = w->out.buf; |
146 | size_t len = w->out.len; | |
147 | ||
148 | /* Skip the leading hunk mark of the first file. */ | |
149 | if (skip_first_line) { | |
150 | while (len) { | |
151 | len--; | |
152 | if (*p++ == '\n') | |
153 | break; | |
154 | } | |
155 | skip_first_line = 0; | |
156 | } | |
157 | ||
158 | write_or_die(1, p, len); | |
431d6e7b | 159 | } |
8f24a632 | 160 | grep_source_clear(&w->source); |
5b594f45 FK |
161 | } |
162 | ||
163 | if (old_done != todo_done) | |
164 | pthread_cond_signal(&cond_write); | |
165 | ||
166 | if (all_work_added && todo_done == todo_end) | |
167 | pthread_cond_signal(&cond_result); | |
168 | ||
169 | grep_unlock(); | |
170 | } | |
171 | ||
172 | static void *run(void *arg) | |
173 | { | |
174 | int hit = 0; | |
175 | struct grep_opt *opt = arg; | |
176 | ||
177 | while (1) { | |
178 | struct work_item *w = get_work(); | |
179 | if (!w) | |
180 | break; | |
181 | ||
182 | opt->output_priv = w; | |
f9ee2fcd | 183 | hit |= grep_source(opt, &w->source); |
8f24a632 | 184 | grep_source_clear_data(&w->source); |
5b594f45 FK |
185 | work_done(w); |
186 | } | |
bfac23d9 DM |
187 | free_grep_patterns(arg); |
188 | free(arg); | |
5b594f45 FK |
189 | |
190 | return (void*) (intptr_t) hit; | |
191 | } | |
192 | ||
193 | static void strbuf_out(struct grep_opt *opt, const void *buf, size_t size) | |
194 | { | |
195 | struct work_item *w = opt->output_priv; | |
196 | strbuf_add(&w->out, buf, size); | |
197 | } | |
198 | ||
199 | static void start_threads(struct grep_opt *opt) | |
200 | { | |
201 | int i; | |
202 | ||
203 | pthread_mutex_init(&grep_mutex, NULL); | |
b3aeb285 | 204 | pthread_mutex_init(&grep_read_mutex, NULL); |
0579f91d | 205 | pthread_mutex_init(&grep_attr_mutex, NULL); |
5b594f45 FK |
206 | pthread_cond_init(&cond_add, NULL); |
207 | pthread_cond_init(&cond_write, NULL); | |
208 | pthread_cond_init(&cond_result, NULL); | |
78db6ea9 | 209 | grep_use_locks = 1; |
5b594f45 FK |
210 | |
211 | for (i = 0; i < ARRAY_SIZE(todo); i++) { | |
212 | strbuf_init(&todo[i].out, 0); | |
213 | } | |
214 | ||
89f09dd3 VL |
215 | threads = xcalloc(num_threads, sizeof(*threads)); |
216 | for (i = 0; i < num_threads; i++) { | |
5b594f45 FK |
217 | int err; |
218 | struct grep_opt *o = grep_opt_dup(opt); | |
219 | o->output = strbuf_out; | |
6d423dd5 ÆAB |
220 | if (i) |
221 | o->debug = 0; | |
5b594f45 FK |
222 | compile_grep_patterns(o); |
223 | err = pthread_create(&threads[i], NULL, run, o); | |
224 | ||
225 | if (err) | |
2fc5f9f1 | 226 | die(_("grep: failed to create thread: %s"), |
5b594f45 FK |
227 | strerror(err)); |
228 | } | |
229 | } | |
230 | ||
231 | static int wait_all(void) | |
232 | { | |
233 | int hit = 0; | |
234 | int i; | |
235 | ||
236 | grep_lock(); | |
237 | all_work_added = 1; | |
238 | ||
239 | /* Wait until all work is done. */ | |
240 | while (todo_done != todo_end) | |
241 | pthread_cond_wait(&cond_result, &grep_mutex); | |
242 | ||
243 | /* Wake up all the consumer threads so they can see that there | |
244 | * is no more work to do. | |
245 | */ | |
246 | pthread_cond_broadcast(&cond_add); | |
247 | grep_unlock(); | |
248 | ||
89f09dd3 | 249 | for (i = 0; i < num_threads; i++) { |
5b594f45 FK |
250 | void *h; |
251 | pthread_join(threads[i], &h); | |
252 | hit |= (int) (intptr_t) h; | |
253 | } | |
254 | ||
89f09dd3 VL |
255 | free(threads); |
256 | ||
5b594f45 | 257 | pthread_mutex_destroy(&grep_mutex); |
b3aeb285 | 258 | pthread_mutex_destroy(&grep_read_mutex); |
0579f91d | 259 | pthread_mutex_destroy(&grep_attr_mutex); |
5b594f45 FK |
260 | pthread_cond_destroy(&cond_add); |
261 | pthread_cond_destroy(&cond_write); | |
262 | pthread_cond_destroy(&cond_result); | |
78db6ea9 | 263 | grep_use_locks = 0; |
5b594f45 FK |
264 | |
265 | return hit; | |
266 | } | |
267 | #else /* !NO_PTHREADS */ | |
5b594f45 FK |
268 | |
269 | static int wait_all(void) | |
270 | { | |
271 | return 0; | |
272 | } | |
273 | #endif | |
274 | ||
15fabd1b JH |
275 | static int grep_cmd_config(const char *var, const char *value, void *cb) |
276 | { | |
277 | int st = grep_config(var, value, cb); | |
33c643bb | 278 | if (git_color_default_config(var, value, cb) < 0) |
15fabd1b | 279 | st = -1; |
89f09dd3 VL |
280 | |
281 | if (!strcmp(var, "grep.threads")) { | |
282 | num_threads = git_config_int(var, value); | |
283 | if (num_threads < 0) | |
284 | die(_("invalid number of threads specified (%d) for %s"), | |
285 | num_threads, var); | |
d1edee4a ÆAB |
286 | #ifdef NO_PTHREADS |
287 | else if (num_threads && num_threads != 1) { | |
288 | /* | |
289 | * TRANSLATORS: %s is the configuration | |
290 | * variable for tweaking threads, currently | |
291 | * grep.threads | |
292 | */ | |
293 | warning(_("no threads support, ignoring %s"), var); | |
294 | num_threads = 0; | |
295 | } | |
296 | #endif | |
89f09dd3 VL |
297 | } |
298 | ||
9071c078 SB |
299 | if (!strcmp(var, "submodule.recurse")) |
300 | recurse_submodules = git_config_bool(var, value); | |
301 | ||
15fabd1b JH |
302 | return st; |
303 | } | |
304 | ||
1db11086 | 305 | static void *lock_and_read_oid_file(const struct object_id *oid, enum object_type *type, unsigned long *size) |
5f02d315 JH |
306 | { |
307 | void *data; | |
308 | ||
b3aeb285 | 309 | grep_read_lock(); |
b4f5aca4 | 310 | data = read_object_file(oid, type, size); |
b3aeb285 | 311 | grep_read_unlock(); |
5b594f45 FK |
312 | return data; |
313 | } | |
314 | ||
1db11086 | 315 | static int grep_oid(struct grep_opt *opt, const struct object_id *oid, |
55c61688 NTND |
316 | const char *filename, int tree_name_len, |
317 | const char *path) | |
5b594f45 FK |
318 | { |
319 | struct strbuf pathbuf = STRBUF_INIT; | |
e2e05d61 | 320 | struct grep_source gs; |
5b594f45 | 321 | |
f9ee2fcd BW |
322 | if (opt->relative && opt->prefix_length) { |
323 | quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf); | |
324 | strbuf_insert(&pathbuf, 0, filename, tree_name_len); | |
5b594f45 FK |
325 | } else { |
326 | strbuf_addstr(&pathbuf, filename); | |
327 | } | |
328 | ||
e2e05d61 | 329 | grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid); |
38ef24dc | 330 | strbuf_release(&pathbuf); |
e2e05d61 | 331 | |
5b594f45 | 332 | #ifndef NO_PTHREADS |
89f09dd3 | 333 | if (num_threads) { |
e2e05d61 RV |
334 | /* |
335 | * add_work() copies gs and thus assumes ownership of | |
336 | * its fields, so do not call grep_source_clear() | |
337 | */ | |
338 | add_work(opt, &gs); | |
5b594f45 FK |
339 | return 0; |
340 | } else | |
341 | #endif | |
342 | { | |
343 | int hit; | |
5010cb5f | 344 | |
8f24a632 | 345 | hit = grep_source(opt, &gs); |
dc49cd76 | 346 | |
8f24a632 JK |
347 | grep_source_clear(&gs); |
348 | return hit; | |
5010cb5f | 349 | } |
5b594f45 FK |
350 | } |
351 | ||
352 | static int grep_file(struct grep_opt *opt, const char *filename) | |
353 | { | |
354 | struct strbuf buf = STRBUF_INIT; | |
e2e05d61 | 355 | struct grep_source gs; |
5b594f45 | 356 | |
f9ee2fcd BW |
357 | if (opt->relative && opt->prefix_length) |
358 | quote_path_relative(filename, opt->prefix, &buf); | |
359 | else | |
360 | strbuf_addstr(&buf, filename); | |
5b594f45 | 361 | |
e2e05d61 | 362 | grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename); |
38ef24dc | 363 | strbuf_release(&buf); |
e2e05d61 | 364 | |
5b594f45 | 365 | #ifndef NO_PTHREADS |
89f09dd3 | 366 | if (num_threads) { |
e2e05d61 RV |
367 | /* |
368 | * add_work() copies gs and thus assumes ownership of | |
369 | * its fields, so do not call grep_source_clear() | |
370 | */ | |
371 | add_work(opt, &gs); | |
5b594f45 FK |
372 | return 0; |
373 | } else | |
374 | #endif | |
375 | { | |
376 | int hit; | |
5b594f45 | 377 | |
8f24a632 JK |
378 | hit = grep_source(opt, &gs); |
379 | ||
380 | grep_source_clear(&gs); | |
5b594f45 FK |
381 | return hit; |
382 | } | |
5010cb5f JH |
383 | } |
384 | ||
678e484b JS |
385 | static void append_path(struct grep_opt *opt, const void *data, size_t len) |
386 | { | |
387 | struct string_list *path_list = opt->output_priv; | |
388 | ||
389 | if (len == 1 && *(const char *)data == '\0') | |
390 | return; | |
0c72cead | 391 | string_list_append(path_list, xstrndup(data, len)); |
678e484b JS |
392 | } |
393 | ||
394 | static void run_pager(struct grep_opt *opt, const char *prefix) | |
395 | { | |
396 | struct string_list *path_list = opt->output_priv; | |
850d2fec | 397 | struct child_process child = CHILD_PROCESS_INIT; |
678e484b JS |
398 | int i, status; |
399 | ||
400 | for (i = 0; i < path_list->nr; i++) | |
850d2fec JK |
401 | argv_array_push(&child.args, path_list->items[i].string); |
402 | child.dir = prefix; | |
403 | child.use_shell = 1; | |
678e484b | 404 | |
850d2fec | 405 | status = run_command(&child); |
678e484b JS |
406 | if (status) |
407 | exit(status); | |
678e484b JS |
408 | } |
409 | ||
f9ee2fcd BW |
410 | static int grep_cache(struct grep_opt *opt, struct repository *repo, |
411 | const struct pathspec *pathspec, int cached); | |
412 | static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, | |
413 | struct tree_desc *tree, struct strbuf *base, int tn_len, | |
414 | int check_attr, struct repository *repo); | |
0281e487 | 415 | |
f9ee2fcd BW |
416 | static int grep_submodule(struct grep_opt *opt, struct repository *superproject, |
417 | const struct pathspec *pathspec, | |
418 | const struct object_id *oid, | |
419 | const char *filename, const char *path) | |
0281e487 | 420 | { |
f9ee2fcd BW |
421 | struct repository submodule; |
422 | int hit; | |
74ed4371 | 423 | |
f9ee2fcd BW |
424 | if (!is_submodule_active(superproject, path)) |
425 | return 0; | |
0281e487 | 426 | |
f9ee2fcd BW |
427 | if (repo_submodule_init(&submodule, superproject, path)) |
428 | return 0; | |
be80a239 | 429 | |
f9ee2fcd | 430 | repo_read_gitmodules(&submodule); |
0281e487 | 431 | |
74ed4371 | 432 | /* |
f9ee2fcd BW |
433 | * NEEDSWORK: This adds the submodule's object directory to the list of |
434 | * alternates for the single in-memory object store. This has some bad | |
435 | * consequences for memory (processed objects will never be freed) and | |
436 | * performance (this increases the number of pack files git has to pay | |
437 | * attention to, to the sum of the number of pack files in all the | |
438 | * repositories processed so far). This can be removed once the object | |
439 | * store is no longer global and instead is a member of the repository | |
440 | * object. | |
74ed4371 | 441 | */ |
9560e624 | 442 | grep_read_lock(); |
90c62155 | 443 | add_to_alternates_memory(submodule.objects->objectdir); |
9560e624 | 444 | grep_read_unlock(); |
74ed4371 | 445 | |
f9ee2fcd BW |
446 | if (oid) { |
447 | struct object *object; | |
448 | struct tree_desc tree; | |
449 | void *data; | |
450 | unsigned long size; | |
451 | struct strbuf base = STRBUF_INIT; | |
74ed4371 | 452 | |
f9ee2fcd | 453 | object = parse_object_or_die(oid, oid_to_hex(oid)); |
0281e487 | 454 | |
f9ee2fcd | 455 | grep_read_lock(); |
02f0547e | 456 | data = read_object_with_reference(&object->oid, tree_type, |
f9ee2fcd BW |
457 | &size, NULL); |
458 | grep_read_unlock(); | |
0281e487 | 459 | |
f9ee2fcd BW |
460 | if (!data) |
461 | die(_("unable to read tree (%s)"), oid_to_hex(&object->oid)); | |
0281e487 | 462 | |
f9ee2fcd BW |
463 | strbuf_addstr(&base, filename); |
464 | strbuf_addch(&base, '/'); | |
0281e487 | 465 | |
f9ee2fcd BW |
466 | init_tree_desc(&tree, data, size); |
467 | hit = grep_tree(opt, pathspec, &tree, &base, base.len, | |
468 | object->type == OBJ_COMMIT, &submodule); | |
469 | strbuf_release(&base); | |
470 | free(data); | |
471 | } else { | |
472 | hit = grep_cache(opt, &submodule, pathspec, 1); | |
e6fac7f3 | 473 | } |
0281e487 | 474 | |
f9ee2fcd BW |
475 | repo_clear(&submodule); |
476 | return hit; | |
0281e487 BW |
477 | } |
478 | ||
f9ee2fcd BW |
479 | static int grep_cache(struct grep_opt *opt, struct repository *repo, |
480 | const struct pathspec *pathspec, int cached) | |
5010cb5f JH |
481 | { |
482 | int hit = 0; | |
483 | int nr; | |
0281e487 BW |
484 | struct strbuf name = STRBUF_INIT; |
485 | int name_base_len = 0; | |
f9ee2fcd BW |
486 | if (repo->submodule_prefix) { |
487 | name_base_len = strlen(repo->submodule_prefix); | |
488 | strbuf_addstr(&name, repo->submodule_prefix); | |
0281e487 BW |
489 | } |
490 | ||
f9ee2fcd | 491 | repo_read_index(repo); |
5010cb5f | 492 | |
f9ee2fcd BW |
493 | for (nr = 0; nr < repo->index->cache_nr; nr++) { |
494 | const struct cache_entry *ce = repo->index->cache[nr]; | |
0281e487 BW |
495 | strbuf_setlen(&name, name_base_len); |
496 | strbuf_addstr(&name, ce->name); | |
497 | ||
498 | if (S_ISREG(ce->ce_mode) && | |
499 | match_pathspec(pathspec, name.buf, name.len, 0, NULL, | |
500 | S_ISDIR(ce->ce_mode) || | |
501 | S_ISGITLINK(ce->ce_mode))) { | |
502 | /* | |
503 | * If CE_VALID is on, we assume worktree file and its | |
504 | * cache entry are identical, even if worktree file has | |
505 | * been modified, so use cache version instead | |
506 | */ | |
507 | if (cached || (ce->ce_flags & CE_VALID) || | |
508 | ce_skip_worktree(ce)) { | |
509 | if (ce_stage(ce) || ce_intent_to_add(ce)) | |
510 | continue; | |
f9ee2fcd BW |
511 | hit |= grep_oid(opt, &ce->oid, name.buf, |
512 | 0, name.buf); | |
0281e487 | 513 | } else { |
f9ee2fcd | 514 | hit |= grep_file(opt, name.buf); |
0281e487 BW |
515 | } |
516 | } else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) && | |
517 | submodule_path_match(pathspec, name.buf, NULL)) { | |
f9ee2fcd | 518 | hit |= grep_submodule(opt, repo, pathspec, NULL, ce->name, ce->name); |
0281e487 | 519 | } else { |
5010cb5f | 520 | continue; |
36f2587f | 521 | } |
0281e487 | 522 | |
36f2587f JH |
523 | if (ce_stage(ce)) { |
524 | do { | |
525 | nr++; | |
f9ee2fcd BW |
526 | } while (nr < repo->index->cache_nr && |
527 | !strcmp(ce->name, repo->index->cache[nr]->name)); | |
36f2587f JH |
528 | nr--; /* compensate for loop control */ |
529 | } | |
c8610a2e JH |
530 | if (hit && opt->status_only) |
531 | break; | |
5010cb5f | 532 | } |
0281e487 BW |
533 | |
534 | strbuf_release(&name); | |
5010cb5f JH |
535 | return hit; |
536 | } | |
537 | ||
f34bbc15 | 538 | static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, |
55c61688 | 539 | struct tree_desc *tree, struct strbuf *base, int tn_len, |
f9ee2fcd | 540 | int check_attr, struct repository *repo) |
5010cb5f | 541 | { |
d688cf07 NTND |
542 | int hit = 0; |
543 | enum interesting match = entry_not_interesting; | |
4c068a98 | 544 | struct name_entry entry; |
e5e062b6 | 545 | int old_baselen = base->len; |
74ed4371 BW |
546 | struct strbuf name = STRBUF_INIT; |
547 | int name_base_len = 0; | |
f9ee2fcd BW |
548 | if (repo->submodule_prefix) { |
549 | strbuf_addstr(&name, repo->submodule_prefix); | |
74ed4371 BW |
550 | name_base_len = name.len; |
551 | } | |
5010cb5f | 552 | |
4c068a98 | 553 | while (tree_entry(tree, &entry)) { |
0de16337 | 554 | int te_len = tree_entry_len(&entry); |
e5e062b6 | 555 | |
d688cf07 | 556 | if (match != all_entries_interesting) { |
74ed4371 BW |
557 | strbuf_addstr(&name, base->buf + tn_len); |
558 | match = tree_entry_interesting(&entry, &name, | |
559 | 0, pathspec); | |
560 | strbuf_setlen(&name, name_base_len); | |
561 | ||
d688cf07 | 562 | if (match == all_entries_not_interesting) |
97d0b74a | 563 | break; |
d688cf07 | 564 | if (match == entry_not_interesting) |
1376e507 NTND |
565 | continue; |
566 | } | |
5010cb5f | 567 | |
1376e507 | 568 | strbuf_add(base, entry.path, te_len); |
e0eb889f | 569 | |
1376e507 | 570 | if (S_ISREG(entry.mode)) { |
1db11086 | 571 | hit |= grep_oid(opt, entry.oid, base->buf, tn_len, |
55c61688 | 572 | check_attr ? base->buf + tn_len : NULL); |
74ed4371 | 573 | } else if (S_ISDIR(entry.mode)) { |
21666f1a | 574 | enum object_type type; |
5010cb5f JH |
575 | struct tree_desc sub; |
576 | void *data; | |
6fda5e51 LT |
577 | unsigned long size; |
578 | ||
1db11086 | 579 | data = lock_and_read_oid_file(entry.oid, &type, &size); |
5010cb5f | 580 | if (!data) |
2fc5f9f1 | 581 | die(_("unable to read tree (%s)"), |
7d924c91 | 582 | oid_to_hex(entry.oid)); |
1376e507 NTND |
583 | |
584 | strbuf_addch(base, '/'); | |
6fda5e51 | 585 | init_tree_desc(&sub, data, size); |
55c61688 | 586 | hit |= grep_tree(opt, pathspec, &sub, base, tn_len, |
f9ee2fcd | 587 | check_attr, repo); |
5010cb5f | 588 | free(data); |
74ed4371 | 589 | } else if (recurse_submodules && S_ISGITLINK(entry.mode)) { |
f9ee2fcd BW |
590 | hit |= grep_submodule(opt, repo, pathspec, entry.oid, |
591 | base->buf, base->buf + tn_len); | |
5010cb5f | 592 | } |
74ed4371 | 593 | |
e5e062b6 NTND |
594 | strbuf_setlen(base, old_baselen); |
595 | ||
c8610a2e JH |
596 | if (hit && opt->status_only) |
597 | break; | |
5010cb5f | 598 | } |
74ed4371 BW |
599 | |
600 | strbuf_release(&name); | |
5010cb5f JH |
601 | return hit; |
602 | } | |
603 | ||
f34bbc15 | 604 | static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, |
6856077a | 605 | struct object *obj, const char *name, const char *path) |
5010cb5f | 606 | { |
1974632c | 607 | if (obj->type == OBJ_BLOB) |
1db11086 | 608 | return grep_oid(opt, &obj->oid, name, 0, path); |
1974632c | 609 | if (obj->type == OBJ_COMMIT || obj->type == OBJ_TREE) { |
5010cb5f JH |
610 | struct tree_desc tree; |
611 | void *data; | |
6fda5e51 | 612 | unsigned long size; |
e5e062b6 NTND |
613 | struct strbuf base; |
614 | int hit, len; | |
615 | ||
b3aeb285 | 616 | grep_read_lock(); |
02f0547e | 617 | data = read_object_with_reference(&obj->oid, tree_type, |
6fda5e51 | 618 | &size, NULL); |
b3aeb285 | 619 | grep_read_unlock(); |
8cb5775b | 620 | |
5010cb5f | 621 | if (!data) |
f2fd0760 | 622 | die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid)); |
e5e062b6 NTND |
623 | |
624 | len = name ? strlen(name) : 0; | |
625 | strbuf_init(&base, PATH_MAX + len + 1); | |
626 | if (len) { | |
627 | strbuf_add(&base, name, len); | |
628 | strbuf_addch(&base, ':'); | |
629 | } | |
6fda5e51 | 630 | init_tree_desc(&tree, data, size); |
55c61688 | 631 | hit = grep_tree(opt, pathspec, &tree, &base, base.len, |
6856077a | 632 | obj->type == OBJ_COMMIT, the_repository); |
e5e062b6 | 633 | strbuf_release(&base); |
5010cb5f JH |
634 | free(data); |
635 | return hit; | |
636 | } | |
debca9d2 | 637 | die(_("unable to grep from object of type %s"), type_name(obj->type)); |
5010cb5f JH |
638 | } |
639 | ||
f34bbc15 | 640 | static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, |
30d00c39 JN |
641 | const struct object_array *list) |
642 | { | |
643 | unsigned int i; | |
644 | int hit = 0; | |
645 | const unsigned int nr = list->nr; | |
646 | ||
647 | for (i = 0; i < nr; i++) { | |
648 | struct object *real_obj; | |
649 | real_obj = deref_tag(list->objects[i].item, NULL, 0); | |
74ed4371 BW |
650 | |
651 | /* load the gitmodules file for this rev */ | |
652 | if (recurse_submodules) { | |
f793b895 | 653 | submodule_free(the_repository); |
cd73de47 | 654 | gitmodules_config_oid(&real_obj->oid); |
74ed4371 | 655 | } |
6856077a JT |
656 | if (grep_object(opt, pathspec, real_obj, list->objects[i].name, |
657 | list->objects[i].path)) { | |
30d00c39 JN |
658 | hit = 1; |
659 | if (opt->status_only) | |
660 | break; | |
661 | } | |
662 | } | |
663 | return hit; | |
664 | } | |
665 | ||
dbfae86a | 666 | static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec, |
85975c0c | 667 | int exc_std, int use_index) |
59332d13 JH |
668 | { |
669 | struct dir_struct dir; | |
670 | int i, hit = 0; | |
671 | ||
672 | memset(&dir, 0, sizeof(dir)); | |
85975c0c JK |
673 | if (!use_index) |
674 | dir.flags |= DIR_NO_GITLINKS; | |
0a93fb8a JH |
675 | if (exc_std) |
676 | setup_standard_excludes(&dir); | |
59332d13 | 677 | |
0d32c183 | 678 | fill_directory(&dir, &the_index, pathspec); |
59332d13 | 679 | for (i = 0; i < dir.nr; i++) { |
ebb32893 | 680 | if (!dir_path_match(dir.entries[i], pathspec, 0, NULL)) |
9d8b831b | 681 | continue; |
59332d13 JH |
682 | hit |= grep_file(opt, dir.entries[i]->name); |
683 | if (hit && opt->status_only) | |
684 | break; | |
685 | } | |
59332d13 JH |
686 | return hit; |
687 | } | |
688 | ||
ff3c7f9a RS |
689 | static int context_callback(const struct option *opt, const char *arg, |
690 | int unset) | |
3e230fa1 RS |
691 | { |
692 | struct grep_opt *grep_opt = opt->value; | |
693 | int value; | |
694 | const char *endp; | |
695 | ||
696 | if (unset) { | |
697 | grep_opt->pre_context = grep_opt->post_context = 0; | |
698 | return 0; | |
699 | } | |
700 | value = strtol(arg, (char **)&endp, 10); | |
701 | if (*endp) { | |
2fc5f9f1 | 702 | return error(_("switch `%c' expects a numerical value"), |
3e230fa1 RS |
703 | opt->short_name); |
704 | } | |
705 | grep_opt->pre_context = grep_opt->post_context = value; | |
706 | return 0; | |
707 | } | |
708 | ||
ff3c7f9a | 709 | static int file_callback(const struct option *opt, const char *arg, int unset) |
3e230fa1 RS |
710 | { |
711 | struct grep_opt *grep_opt = opt->value; | |
c41dd2fd | 712 | int from_stdin = !strcmp(arg, "-"); |
3e230fa1 RS |
713 | FILE *patterns; |
714 | int lno = 0; | |
cfe370c6 | 715 | struct strbuf sb = STRBUF_INIT; |
3e230fa1 | 716 | |
c41dd2fd | 717 | patterns = from_stdin ? stdin : fopen(arg, "r"); |
3e230fa1 | 718 | if (!patterns) |
2fc5f9f1 | 719 | die_errno(_("cannot open '%s'"), arg); |
a5518431 | 720 | while (strbuf_getline(&sb, patterns) == 0) { |
3e230fa1 RS |
721 | /* ignore empty line like grep does */ |
722 | if (sb.len == 0) | |
723 | continue; | |
ed40a095 | 724 | |
ec830611 RS |
725 | append_grep_pat(grep_opt, sb.buf, sb.len, arg, ++lno, |
726 | GREP_PATTERN); | |
3e230fa1 | 727 | } |
c41dd2fd RS |
728 | if (!from_stdin) |
729 | fclose(patterns); | |
3e230fa1 RS |
730 | strbuf_release(&sb); |
731 | return 0; | |
732 | } | |
733 | ||
ff3c7f9a | 734 | static int not_callback(const struct option *opt, const char *arg, int unset) |
3e230fa1 RS |
735 | { |
736 | struct grep_opt *grep_opt = opt->value; | |
737 | append_grep_pattern(grep_opt, "--not", "command line", 0, GREP_NOT); | |
738 | return 0; | |
739 | } | |
740 | ||
ff3c7f9a | 741 | static int and_callback(const struct option *opt, const char *arg, int unset) |
3e230fa1 RS |
742 | { |
743 | struct grep_opt *grep_opt = opt->value; | |
744 | append_grep_pattern(grep_opt, "--and", "command line", 0, GREP_AND); | |
745 | return 0; | |
746 | } | |
747 | ||
ff3c7f9a | 748 | static int open_callback(const struct option *opt, const char *arg, int unset) |
3e230fa1 RS |
749 | { |
750 | struct grep_opt *grep_opt = opt->value; | |
751 | append_grep_pattern(grep_opt, "(", "command line", 0, GREP_OPEN_PAREN); | |
752 | return 0; | |
753 | } | |
754 | ||
ff3c7f9a | 755 | static int close_callback(const struct option *opt, const char *arg, int unset) |
3e230fa1 RS |
756 | { |
757 | struct grep_opt *grep_opt = opt->value; | |
758 | append_grep_pattern(grep_opt, ")", "command line", 0, GREP_CLOSE_PAREN); | |
759 | return 0; | |
760 | } | |
761 | ||
ff3c7f9a RS |
762 | static int pattern_callback(const struct option *opt, const char *arg, |
763 | int unset) | |
3e230fa1 RS |
764 | { |
765 | struct grep_opt *grep_opt = opt->value; | |
766 | append_grep_pattern(grep_opt, arg, "-e option", 0, GREP_PATTERN); | |
767 | return 0; | |
768 | } | |
5010cb5f | 769 | |
a633fca0 | 770 | int cmd_grep(int argc, const char **argv, const char *prefix) |
5010cb5f | 771 | { |
5010cb5f | 772 | int hit = 0; |
0a93fb8a | 773 | int cached = 0, untracked = 0, opt_exclude = -1; |
5acd64ed | 774 | int seen_dashdash = 0; |
bbc09c22 | 775 | int external_grep_allowed__ignored; |
0af88c15 | 776 | const char *show_in_pager = NULL, *default_pager = "dummy"; |
5010cb5f | 777 | struct grep_opt opt; |
3cd47459 | 778 | struct object_array list = OBJECT_ARRAY_INIT; |
f34bbc15 | 779 | struct pathspec pathspec; |
183113a5 | 780 | struct string_list path_list = STRING_LIST_INIT_NODUP; |
5acd64ed | 781 | int i; |
3e230fa1 | 782 | int dummy; |
ff38d1a9 | 783 | int use_index = 1; |
84befcd0 | 784 | int pattern_type_arg = GREP_PATTERN_TYPE_UNSPECIFIED; |
131f3c96 | 785 | int allow_revs; |
cca2c172 | 786 | |
3e230fa1 | 787 | struct option options[] = { |
d5d09d47 | 788 | OPT_BOOL(0, "cached", &cached, |
4b407bc5 | 789 | N_("search in index instead of in the work tree")), |
cbb08c2e | 790 | OPT_NEGBIT(0, "no-index", &use_index, |
f63cf8c9 | 791 | N_("find in contents not managed by git"), 1), |
d5d09d47 | 792 | OPT_BOOL(0, "untracked", &untracked, |
4b407bc5 | 793 | N_("search in both tracked and untracked files")), |
0a93fb8a | 794 | OPT_SET_INT(0, "exclude-standard", &opt_exclude, |
77fdb8a8 | 795 | N_("ignore files specified via '.gitignore'"), 1), |
0281e487 | 796 | OPT_BOOL(0, "recurse-submodules", &recurse_submodules, |
4fb1c6aa | 797 | N_("recursively search in each submodule")), |
3e230fa1 | 798 | OPT_GROUP(""), |
d5d09d47 | 799 | OPT_BOOL('v', "invert-match", &opt.invert, |
4b407bc5 | 800 | N_("show non-matching lines")), |
d5d09d47 | 801 | OPT_BOOL('i', "ignore-case", &opt.ignore_case, |
4b407bc5 | 802 | N_("case insensitive matching")), |
d5d09d47 | 803 | OPT_BOOL('w', "word-regexp", &opt.word_regexp, |
4b407bc5 | 804 | N_("match patterns only at word boundaries")), |
3e230fa1 | 805 | OPT_SET_INT('a', "text", &opt.binary, |
4b407bc5 | 806 | N_("process binary files as text"), GREP_BINARY_TEXT), |
3e230fa1 | 807 | OPT_SET_INT('I', NULL, &opt.binary, |
4b407bc5 | 808 | N_("don't match patterns in binary files"), |
3e230fa1 | 809 | GREP_BINARY_NOMATCH), |
335ec3bf JK |
810 | OPT_BOOL(0, "textconv", &opt.allow_textconv, |
811 | N_("process binary files with textconv filters")), | |
4b407bc5 NTND |
812 | { OPTION_INTEGER, 0, "max-depth", &opt.max_depth, N_("depth"), |
813 | N_("descend at most <depth> levels"), PARSE_OPT_NONEG, | |
a91f453f | 814 | NULL, 1 }, |
3e230fa1 | 815 | OPT_GROUP(""), |
84befcd0 | 816 | OPT_SET_INT('E', "extended-regexp", &pattern_type_arg, |
4b407bc5 | 817 | N_("use extended POSIX regular expressions"), |
84befcd0 S |
818 | GREP_PATTERN_TYPE_ERE), |
819 | OPT_SET_INT('G', "basic-regexp", &pattern_type_arg, | |
4b407bc5 | 820 | N_("use basic POSIX regular expressions (default)"), |
84befcd0 S |
821 | GREP_PATTERN_TYPE_BRE), |
822 | OPT_SET_INT('F', "fixed-strings", &pattern_type_arg, | |
4b407bc5 | 823 | N_("interpret patterns as fixed strings"), |
84befcd0 S |
824 | GREP_PATTERN_TYPE_FIXED), |
825 | OPT_SET_INT('P', "perl-regexp", &pattern_type_arg, | |
4b407bc5 | 826 | N_("use Perl-compatible regular expressions"), |
84befcd0 | 827 | GREP_PATTERN_TYPE_PCRE), |
3e230fa1 | 828 | OPT_GROUP(""), |
d5d09d47 | 829 | OPT_BOOL('n', "line-number", &opt.linenum, N_("show line numbers")), |
4b407bc5 NTND |
830 | OPT_NEGBIT('h', NULL, &opt.pathname, N_("don't show filenames"), 1), |
831 | OPT_BIT('H', NULL, &opt.pathname, N_("show filenames"), 1), | |
3e230fa1 | 832 | OPT_NEGBIT(0, "full-name", &opt.relative, |
4b407bc5 | 833 | N_("show filenames relative to top directory"), 1), |
d5d09d47 | 834 | OPT_BOOL('l', "files-with-matches", &opt.name_only, |
4b407bc5 | 835 | N_("show only filenames instead of matching lines")), |
d5d09d47 | 836 | OPT_BOOL(0, "name-only", &opt.name_only, |
4b407bc5 | 837 | N_("synonym for --files-with-matches")), |
d5d09d47 | 838 | OPT_BOOL('L', "files-without-match", |
3e230fa1 | 839 | &opt.unmatch_name_only, |
4b407bc5 | 840 | N_("show only the names of files without match")), |
caf2de33 NTND |
841 | OPT_BOOL_F('z', "null", &opt.null_following_name, |
842 | N_("print NUL after filenames"), | |
843 | PARSE_OPT_NOCOMPLETE), | |
d5d09d47 | 844 | OPT_BOOL('c', "count", &opt.count, |
4b407bc5 NTND |
845 | N_("show the number of matches instead of matching lines")), |
846 | OPT__COLOR(&opt.color, N_("highlight matches")), | |
d5d09d47 | 847 | OPT_BOOL(0, "break", &opt.file_break, |
4b407bc5 | 848 | N_("print empty line between matches from different files")), |
d5d09d47 | 849 | OPT_BOOL(0, "heading", &opt.heading, |
4b407bc5 | 850 | N_("show filename only once above matches from same file")), |
3e230fa1 | 851 | OPT_GROUP(""), |
4b407bc5 NTND |
852 | OPT_CALLBACK('C', "context", &opt, N_("n"), |
853 | N_("show <n> context lines before and after matches"), | |
3e230fa1 | 854 | context_callback), |
317f63c2 | 855 | OPT_INTEGER('B', "before-context", &opt.pre_context, |
4b407bc5 | 856 | N_("show <n> context lines before matches")), |
317f63c2 | 857 | OPT_INTEGER('A', "after-context", &opt.post_context, |
4b407bc5 | 858 | N_("show <n> context lines after matches")), |
89f09dd3 VL |
859 | OPT_INTEGER(0, "threads", &num_threads, |
860 | N_("use <n> worker threads")), | |
4b407bc5 | 861 | OPT_NUMBER_CALLBACK(&opt, N_("shortcut for -C NUM"), |
3e230fa1 | 862 | context_callback), |
d5d09d47 | 863 | OPT_BOOL('p', "show-function", &opt.funcname, |
4b407bc5 | 864 | N_("show a line with the function name before matches")), |
d5d09d47 | 865 | OPT_BOOL('W', "function-context", &opt.funcbody, |
4b407bc5 | 866 | N_("show the surrounding function")), |
3e230fa1 | 867 | OPT_GROUP(""), |
4b407bc5 NTND |
868 | OPT_CALLBACK('f', NULL, &opt, N_("file"), |
869 | N_("read patterns from file"), file_callback), | |
870 | { OPTION_CALLBACK, 'e', NULL, &opt, N_("pattern"), | |
871 | N_("match <pattern>"), PARSE_OPT_NONEG, pattern_callback }, | |
3e230fa1 | 872 | { OPTION_CALLBACK, 0, "and", &opt, NULL, |
4b407bc5 | 873 | N_("combine patterns specified with -e"), |
3e230fa1 | 874 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback }, |
d5d09d47 | 875 | OPT_BOOL(0, "or", &dummy, ""), |
3e230fa1 RS |
876 | { OPTION_CALLBACK, 0, "not", &opt, NULL, "", |
877 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback }, | |
878 | { OPTION_CALLBACK, '(', NULL, &opt, NULL, "", | |
879 | PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, | |
880 | open_callback }, | |
881 | { OPTION_CALLBACK, ')', NULL, &opt, NULL, "", | |
882 | PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, | |
883 | close_callback }, | |
d52ee6e6 | 884 | OPT__QUIET(&opt.status_only, |
4b407bc5 | 885 | N_("indicate hit with exit status without output")), |
d5d09d47 | 886 | OPT_BOOL(0, "all-match", &opt.all_match, |
4b407bc5 | 887 | N_("show only matches from files that match all patterns")), |
17bf35a3 | 888 | { OPTION_SET_INT, 0, "debug", &opt.debug, NULL, |
3d7535e4 | 889 | N_("show parse tree for grep expression"), |
17bf35a3 | 890 | PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1 }, |
3e230fa1 | 891 | OPT_GROUP(""), |
0af88c15 | 892 | { OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager, |
4b407bc5 | 893 | N_("pager"), N_("show matching files in the pager"), |
caf2de33 NTND |
894 | PARSE_OPT_OPTARG | PARSE_OPT_NOCOMPLETE, |
895 | NULL, (intptr_t)default_pager }, | |
896 | OPT_BOOL_F(0, "ext-grep", &external_grep_allowed__ignored, | |
897 | N_("allow calling of grep(1) (ignored by this build)"), | |
898 | PARSE_OPT_NOCOMPLETE), | |
3e230fa1 RS |
899 | OPT_END() |
900 | }; | |
5010cb5f | 901 | |
15fabd1b JH |
902 | init_grep_defaults(); |
903 | git_config(grep_cmd_config, NULL); | |
904 | grep_init(&opt, prefix); | |
7e8f59d5 | 905 | |
5010cb5f | 906 | /* |
5acd64ed JH |
907 | * If there is no -- then the paths must exist in the working |
908 | * tree. If there is no explicit pattern specified with -e or | |
909 | * -f, we take the first unrecognized non option to be the | |
910 | * pattern, but then what follows it must be zero or more | |
911 | * valid refs up to the -- (if exists), and then existing | |
912 | * paths. If there is an explicit pattern, then the first | |
82e5a82f | 913 | * unrecognized non option is the beginning of the refs list |
5acd64ed | 914 | * that continues up to the -- (if exists), and then paths. |
5010cb5f | 915 | */ |
37782920 | 916 | argc = parse_options(argc, argv, prefix, options, grep_usage, |
3e230fa1 | 917 | PARSE_OPT_KEEP_DASHDASH | |
44415499 | 918 | PARSE_OPT_STOP_AT_NON_OPTION); |
c5c31d33 | 919 | grep_commit_pattern_type(pattern_type_arg, &opt); |
3e230fa1 | 920 | |
ecd9ba61 TG |
921 | if (use_index && !startup_info->have_repository) { |
922 | int fallback = 0; | |
923 | git_config_get_bool("grep.fallbacktonoindex", &fallback); | |
924 | if (fallback) | |
925 | use_index = 0; | |
926 | else | |
927 | /* die the same way as if we did it at the beginning */ | |
928 | setup_git_directory(); | |
929 | } | |
59332d13 | 930 | |
1123c67c JK |
931 | /* |
932 | * skip a -- separator; we know it cannot be | |
933 | * separating revisions from pathnames if | |
934 | * we haven't even had any patterns yet | |
935 | */ | |
936 | if (argc > 0 && !opt.pattern_list && !strcmp(argv[0], "--")) { | |
937 | argv++; | |
938 | argc--; | |
939 | } | |
940 | ||
3e230fa1 RS |
941 | /* First unrecognized non-option token */ |
942 | if (argc > 0 && !opt.pattern_list) { | |
943 | append_grep_pattern(&opt, argv[0], "command line", 0, | |
944 | GREP_PATTERN); | |
945 | argv++; | |
946 | argc--; | |
5010cb5f | 947 | } |
5acd64ed | 948 | |
0af88c15 JS |
949 | if (show_in_pager == default_pager) |
950 | show_in_pager = git_pager(1); | |
678e484b | 951 | if (show_in_pager) { |
e7b082a4 | 952 | opt.color = 0; |
0af88c15 JS |
953 | opt.name_only = 1; |
954 | opt.null_following_name = 1; | |
955 | opt.output_priv = &path_list; | |
956 | opt.output = append_path; | |
0c72cead | 957 | string_list_append(&path_list, show_in_pager); |
678e484b JS |
958 | } |
959 | ||
f9b9faf6 | 960 | if (!opt.pattern_list) |
2fc5f9f1 | 961 | die(_("no pattern given.")); |
5b594f45 | 962 | |
b5b81136 JK |
963 | /* |
964 | * We have to find "--" in a separate pass, because its presence | |
965 | * influences how we will parse arguments that come before it. | |
966 | */ | |
967 | for (i = 0; i < argc; i++) { | |
968 | if (!strcmp(argv[i], "--")) { | |
969 | seen_dashdash = 1; | |
970 | break; | |
971 | } | |
972 | } | |
973 | ||
974 | /* | |
975 | * Resolve any rev arguments. If we have a dashdash, then everything up | |
976 | * to it must resolve as a rev. If not, then we stop at the first | |
977 | * non-rev and assume everything else is a path. | |
978 | */ | |
131f3c96 | 979 | allow_revs = use_index && !untracked; |
3e230fa1 | 980 | for (i = 0; i < argc; i++) { |
5acd64ed | 981 | const char *arg = argv[i]; |
1db11086 | 982 | struct object_id oid; |
afa15f3c | 983 | struct object_context oc; |
20d6421c JK |
984 | struct object *object; |
985 | ||
dca3b5f5 JT |
986 | if (!strcmp(arg, "--")) { |
987 | i++; | |
dca3b5f5 JT |
988 | break; |
989 | } | |
20d6421c | 990 | |
131f3c96 | 991 | if (!allow_revs) { |
d0ffc069 | 992 | if (seen_dashdash) |
131f3c96 | 993 | die(_("--no-index or --untracked cannot be used with revs")); |
d0ffc069 JK |
994 | break; |
995 | } | |
996 | ||
321c89bf | 997 | if (get_oid_with_context(arg, GET_OID_RECORD_PATH, |
e82caf38 | 998 | &oid, &oc)) { |
b5b81136 JK |
999 | if (seen_dashdash) |
1000 | die(_("unable to resolve revision: %s"), arg); | |
20d6421c | 1001 | break; |
b5b81136 | 1002 | } |
20d6421c | 1003 | |
c251c83d | 1004 | object = parse_object_or_die(&oid, arg); |
20d6421c JK |
1005 | if (!seen_dashdash) |
1006 | verify_non_filename(prefix, arg); | |
1007 | add_object_array_with_path(object, arg, &list, oc.mode, oc.path); | |
dc944b65 | 1008 | free(oc.path); |
1362671f | 1009 | } |
5acd64ed | 1010 | |
b5b81136 JK |
1011 | /* |
1012 | * Anything left over is presumed to be a path. But in the non-dashdash | |
1013 | * "do what I mean" case, we verify and complain when that isn't true. | |
1014 | */ | |
a0fe2b0d JK |
1015 | if (!seen_dashdash) { |
1016 | int j; | |
1017 | for (j = i; j < argc; j++) | |
131f3c96 | 1018 | verify_filename(prefix, argv[j], j == i && allow_revs); |
a0fe2b0d JK |
1019 | } |
1020 | ||
1021 | parse_pathspec(&pathspec, 0, | |
1022 | PATHSPEC_PREFER_CWD | | |
1023 | (opt.max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0), | |
1024 | prefix, argv + i); | |
1025 | pathspec.max_depth = opt.max_depth; | |
1026 | pathspec.recursive = 1; | |
eef3df5a | 1027 | pathspec.recurse_submodules = !!recurse_submodules; |
a0fe2b0d | 1028 | |
53b8d931 | 1029 | #ifndef NO_PTHREADS |
044b1f3c | 1030 | if (list.nr || cached || show_in_pager) |
89f09dd3 VL |
1031 | num_threads = 0; |
1032 | else if (num_threads == 0) | |
1033 | num_threads = GREP_NUM_THREADS_DEFAULT; | |
1034 | else if (num_threads < 0) | |
1035 | die(_("invalid number of threads specified (%d)"), num_threads); | |
9ec726a4 ÆAB |
1036 | if (num_threads == 1) |
1037 | num_threads = 0; | |
53b8d931 | 1038 | #else |
d1edee4a ÆAB |
1039 | if (num_threads) |
1040 | warning(_("no threads support, ignoring --threads")); | |
89f09dd3 | 1041 | num_threads = 0; |
53b8d931 TR |
1042 | #endif |
1043 | ||
6d423dd5 ÆAB |
1044 | if (!num_threads) |
1045 | /* | |
1046 | * The compiled patterns on the main path are only | |
1047 | * used when not using threading. Otherwise | |
1048 | * start_threads() below calls compile_grep_patterns() | |
1049 | * for each thread. | |
1050 | */ | |
1051 | compile_grep_patterns(&opt); | |
1052 | ||
53b8d931 | 1053 | #ifndef NO_PTHREADS |
89f09dd3 | 1054 | if (num_threads) { |
50dd0f2f AY |
1055 | if (!(opt.name_only || opt.unmatch_name_only || opt.count) |
1056 | && (opt.pre_context || opt.post_context || | |
1057 | opt.file_break || opt.funcbody)) | |
53b8d931 TR |
1058 | skip_first_line = 1; |
1059 | start_threads(&opt); | |
1060 | } | |
1061 | #endif | |
1062 | ||
678e484b | 1063 | if (show_in_pager && (cached || list.nr)) |
e4fe4ba5 | 1064 | die(_("--open-files-in-pager only works on the worktree")); |
678e484b JS |
1065 | |
1066 | if (show_in_pager && opt.pattern_list && !opt.pattern_list->next) { | |
1067 | const char *pager = path_list.items[0].string; | |
1068 | int len = strlen(pager); | |
1069 | ||
1070 | if (len > 4 && is_dir_sep(pager[len - 5])) | |
1071 | pager += len - 4; | |
1072 | ||
f7febbea JS |
1073 | if (opt.ignore_case && !strcmp("less", pager)) |
1074 | string_list_append(&path_list, "-I"); | |
1075 | ||
678e484b JS |
1076 | if (!strcmp("less", pager) || !strcmp("vi", pager)) { |
1077 | struct strbuf buf = STRBUF_INIT; | |
1078 | strbuf_addf(&buf, "+/%s%s", | |
1079 | strcmp("less", pager) ? "" : "*", | |
1080 | opt.pattern_list->pattern); | |
0c72cead | 1081 | string_list_append(&path_list, buf.buf); |
678e484b JS |
1082 | strbuf_detach(&buf, NULL); |
1083 | } | |
1084 | } | |
1085 | ||
74ed4371 | 1086 | if (recurse_submodules && (!use_index || untracked)) |
0281e487 BW |
1087 | die(_("option not supported with --recurse-submodules.")); |
1088 | ||
c2048f0b | 1089 | if (!show_in_pager && !opt.status_only) |
678e484b JS |
1090 | setup_pager(); |
1091 | ||
0a93fb8a | 1092 | if (!use_index && (untracked || cached)) |
dbfae86a | 1093 | die(_("--cached or --untracked cannot be used with --no-index.")); |
678e484b | 1094 | |
0a93fb8a | 1095 | if (!use_index || untracked) { |
0a93fb8a | 1096 | int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude; |
85975c0c | 1097 | hit = grep_directory(&opt, &pathspec, use_exclude, use_index); |
dbfae86a | 1098 | } else if (0 <= opt_exclude) { |
9fddaf78 | 1099 | die(_("--[no-]exclude-standard cannot be used for tracked contents.")); |
685359cf | 1100 | } else if (!list.nr) { |
6577f542 NTND |
1101 | if (!cached) |
1102 | setup_work_tree(); | |
5b594f45 | 1103 | |
f9ee2fcd | 1104 | hit = grep_cache(&opt, the_repository, &pathspec, cached); |
685359cf JS |
1105 | } else { |
1106 | if (cached) | |
2fc5f9f1 | 1107 | die(_("both --cached and trees are given.")); |
f9ee2fcd | 1108 | |
6856077a | 1109 | hit = grep_objects(&opt, &pathspec, &list); |
5010cb5f | 1110 | } |
5b594f45 | 1111 | |
89f09dd3 | 1112 | if (num_threads) |
5b594f45 | 1113 | hit |= wait_all(); |
678e484b JS |
1114 | if (hit && show_in_pager) |
1115 | run_pager(&opt, prefix); | |
7861fa07 | 1116 | clear_pathspec(&pathspec); |
b48fb5b6 | 1117 | free_grep_patterns(&opt); |
5010cb5f JH |
1118 | return !hit; |
1119 | } |