Linus Torvalds | 8bc9a0c | 2005-04-07 15:16:10 -0700 | [diff] [blame] | 1 | /* |
| 2 | * GIT - The information manager from hell |
| 3 | * |
| 4 | * Copyright (C) Linus Torvalds, 2005 |
| 5 | */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 6 | #include "cache.h" |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 7 | #include "diff.h" |
Linus Torvalds | 9153983 | 2006-04-17 11:59:32 -0700 | [diff] [blame] | 8 | #include "commit.h" |
| 9 | #include "revision.h" |
Peter Eriksen | e8cc9cd | 2006-05-23 14:15:36 +0200 | [diff] [blame] | 10 | #include "builtin.h" |
Jens Lehmann | 302ad7a | 2010-08-06 00:40:48 +0200 | [diff] [blame] | 11 | #include "submodule.h" |
Christopher Li | c0fb976 | 2005-04-12 02:04:44 -0700 | [diff] [blame] | 12 | |
Petr Baudis | 4d1f119 | 2005-07-29 11:01:26 +0200 | [diff] [blame] | 13 | static const char diff_files_usage[] = |
Alex Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 14 | "git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]" |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 15 | COMMON_DIFF_OPTIONS_HELP; |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 16 | |
Linus Torvalds | a633fca | 2006-07-28 22:44:25 -0700 | [diff] [blame] | 17 | int cmd_diff_files(int argc, const char **argv, const char *prefix) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 18 | { |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 19 | struct rev_info rev; |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 20 | int result; |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 21 | unsigned options = 0; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 22 | |
Linus Torvalds | a633fca | 2006-07-28 22:44:25 -0700 | [diff] [blame] | 23 | init_revisions(&rev, prefix); |
Jens Lehmann | 302ad7a | 2010-08-06 00:40:48 +0200 | [diff] [blame] | 24 | gitmodules_config(); |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 25 | git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 26 | rev.abbrev = 0; |
Alexander Rinass | 90a78b8 | 2016-05-13 22:41:02 +0200 | [diff] [blame] | 27 | precompose_argv(argc, argv); |
Junio C Hamano | 6973dca | 2006-04-21 23:57:45 -0700 | [diff] [blame] | 28 | |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 29 | argc = setup_revisions(argc, argv, &rev, NULL); |
| 30 | while (1 < argc && argv[1][0] == '-') { |
| 31 | if (!strcmp(argv[1], "--base")) |
| 32 | rev.max_count = 1; |
| 33 | else if (!strcmp(argv[1], "--ours")) |
| 34 | rev.max_count = 2; |
| 35 | else if (!strcmp(argv[1], "--theirs")) |
| 36 | rev.max_count = 3; |
| 37 | else if (!strcmp(argv[1], "-q")) |
| 38 | options |= DIFF_SILENT_ON_REMOVED; |
| 39 | else |
| 40 | usage(diff_files_usage); |
| 41 | argv++; argc--; |
| 42 | } |
Timo Hirvonen | c9b5ef9 | 2006-06-24 20:24:14 +0300 | [diff] [blame] | 43 | if (!rev.diffopt.output_format) |
| 44 | rev.diffopt.output_format = DIFF_FORMAT_RAW; |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 45 | |
| 46 | /* |
| 47 | * Make sure there are NO revision (i.e. pending object) parameter, |
| 48 | * rev.max_count is reasonable (0 <= n <= 3), and |
| 49 | * there is no other revision filtering parameters. |
| 50 | */ |
| 51 | if (rev.pending.nr || |
| 52 | rev.min_age != -1 || rev.max_age != -1 || |
| 53 | 3 < rev.max_count) |
| 54 | usage(diff_files_usage); |
| 55 | |
Junio C Hamano | 903e09a | 2008-09-18 00:32:37 -0700 | [diff] [blame] | 56 | /* |
| 57 | * "diff-files --base -p" should not combine merges because it |
| 58 | * was not asked to. "diff-files -c -p" should not densify |
| 59 | * (the user should ask with "diff-files --cc" explicitly). |
| 60 | */ |
| 61 | if (rev.max_count == -1 && !rev.combine_merges && |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 62 | (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) |
| 63 | rev.combine_merges = rev.dense_combined_merges = 1; |
| 64 | |
Nguyễn Thái Ngọc Duy | 5ab2a2d | 2013-07-14 15:35:49 +0700 | [diff] [blame] | 65 | if (read_cache_preload(&rev.diffopt.pathspec) < 0) { |
Linus Torvalds | 671c9b7 | 2008-11-13 16:36:30 -0800 | [diff] [blame] | 66 | perror("read_cache_preload"); |
Junio C Hamano | 6304c29 | 2008-05-23 18:15:03 -0700 | [diff] [blame] | 67 | return -1; |
| 68 | } |
| 69 | result = run_diff_files(&rev, options); |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 70 | return diff_result_code(&rev.diffopt, result); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 71 | } |