]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
e83c5163 | 6 | #include "cache.h" |
b2141fc1 | 7 | #include "config.h" |
4a6bf9e1 | 8 | #include "diff.h" |
3b6c17b5 | 9 | #include "diff-merges.h" |
91539833 | 10 | #include "commit.h" |
fbffdfb1 | 11 | #include "preload-index.h" |
91539833 | 12 | #include "revision.h" |
e8cc9cd9 | 13 | #include "builtin.h" |
302ad7a9 | 14 | #include "submodule.h" |
c0fb976a | 15 | |
4d1f1190 | 16 | static const char diff_files_usage[] = |
9c9b4f2f | 17 | "git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]" |
acf7828e | 18 | "\n" |
dda2d79a | 19 | COMMON_DIFF_OPTIONS_HELP; |
b8f80925 | 20 | |
a633fca0 | 21 | int cmd_diff_files(int argc, const char **argv, const char *prefix) |
e83c5163 | 22 | { |
6973dcae | 23 | struct rev_info rev; |
41bbf9d5 | 24 | int result; |
6304c29d | 25 | unsigned options = 0; |
e83c5163 | 26 | |
5a88f97c JH |
27 | if (argc == 2 && !strcmp(argv[1], "-h")) |
28 | usage(diff_files_usage); | |
29 | ||
37590ce3 | 30 | git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ |
8c30be91 SL |
31 | |
32 | prepare_repo_settings(the_repository); | |
33 | the_repository->settings.command_requires_full_index = 0; | |
34 | ||
2abf3503 | 35 | repo_init_revisions(the_repository, &rev, prefix); |
6973dcae | 36 | rev.abbrev = 0; |
feea6946 SK |
37 | |
38 | /* | |
39 | * Consider "intent-to-add" files as new by default, unless | |
40 | * explicitly specified in the command line or anywhere else. | |
41 | */ | |
42 | rev.diffopt.ita_invisible_in_index = 1; | |
43 | ||
5c327502 | 44 | prefix = precompose_argv_prefix(argc, argv, prefix); |
6973dcae | 45 | |
6304c29d JH |
46 | argc = setup_revisions(argc, argv, &rev, NULL); |
47 | while (1 < argc && argv[1][0] == '-') { | |
48 | if (!strcmp(argv[1], "--base")) | |
49 | rev.max_count = 1; | |
50 | else if (!strcmp(argv[1], "--ours")) | |
51 | rev.max_count = 2; | |
52 | else if (!strcmp(argv[1], "--theirs")) | |
53 | rev.max_count = 3; | |
54 | else if (!strcmp(argv[1], "-q")) | |
55 | options |= DIFF_SILENT_ON_REMOVED; | |
56 | else | |
57 | usage(diff_files_usage); | |
58 | argv++; argc--; | |
59 | } | |
c9b5ef99 TH |
60 | if (!rev.diffopt.output_format) |
61 | rev.diffopt.output_format = DIFF_FORMAT_RAW; | |
1eb4136a | 62 | rev.diffopt.rotate_to_strict = 1; |
6304c29d JH |
63 | |
64 | /* | |
65 | * Make sure there are NO revision (i.e. pending object) parameter, | |
66 | * rev.max_count is reasonable (0 <= n <= 3), and | |
67 | * there is no other revision filtering parameters. | |
68 | */ | |
69 | if (rev.pending.nr || | |
70 | rev.min_age != -1 || rev.max_age != -1 || | |
71 | 3 < rev.max_count) | |
72 | usage(diff_files_usage); | |
73 | ||
903e09a3 JH |
74 | /* |
75 | * "diff-files --base -p" should not combine merges because it | |
76 | * was not asked to. "diff-files -c -p" should not densify | |
77 | * (the user should ask with "diff-files --cc" explicitly). | |
78 | */ | |
3b6c17b5 | 79 | if (rev.max_count == -1 && |
6304c29d | 80 | (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) |
3b6c17b5 | 81 | diff_merges_set_dense_combined_if_unset(&rev); |
6304c29d | 82 | |
07047d68 ÆAB |
83 | if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0) { |
84 | perror("repo_read_index_preload"); | |
0139c58a ÆAB |
85 | result = -1; |
86 | goto cleanup; | |
6304c29d JH |
87 | } |
88 | result = run_diff_files(&rev, options); | |
0139c58a | 89 | result = diff_result_code(&rev.diffopt, result); |
04393ae7 | 90 | cleanup: |
0139c58a ÆAB |
91 | release_revisions(&rev); |
92 | return result; | |
e83c5163 | 93 | } |