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" |
Christopher Li | c0fb976 | 2005-04-12 02:04:44 -0700 | [diff] [blame] | 8 | |
Nicolas Pitre | 1771039 | 2005-04-30 13:59:38 -0700 | [diff] [blame] | 9 | static const char *diff_files_usage = |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 10 | "git-diff-files [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]"; |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 11 | |
Junio C Hamano | 81e50ea | 2005-05-21 19:42:18 -0700 | [diff] [blame] | 12 | static int diff_output_format = DIFF_FORMAT_HUMAN; |
Junio C Hamano | 5c97558 | 2005-05-19 03:32:35 -0700 | [diff] [blame] | 13 | static int detect_rename = 0; |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 14 | static int find_copies_harder = 0; |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 15 | static int diff_setup_opt = 0; |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 16 | static int diff_score_opt = 0; |
Junio C Hamano | 057c7d3 | 2005-05-21 15:02:51 -0700 | [diff] [blame] | 17 | static const char *pickaxe = NULL; |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 18 | static int pickaxe_opts = 0; |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 19 | static int diff_break_opt = -1; |
Junio C Hamano | af5323e | 2005-05-30 00:09:07 -0700 | [diff] [blame] | 20 | static const char *orderfile = NULL; |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 21 | static const char *diff_filter = NULL; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 22 | static int silent = 0; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 23 | |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 24 | static void show_unmerge(const char *path) |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 25 | { |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 26 | diff_unmerge(path); |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 27 | } |
| 28 | |
| 29 | static void show_file(int pfx, struct cache_entry *ce) |
| 30 | { |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 31 | diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL); |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 32 | } |
| 33 | |
| 34 | static void show_modified(int oldmode, int mode, |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 35 | const unsigned char *old_sha1, const unsigned char *sha1, |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 36 | char *path) |
| 37 | { |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 38 | diff_change(oldmode, mode, old_sha1, sha1, path, NULL); |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 39 | } |
| 40 | |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 41 | int main(int argc, const char **argv) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 42 | { |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 43 | static const unsigned char null_sha1[20] = { 0, }; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 44 | int entries = read_cache(); |
| 45 | int i; |
| 46 | |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 47 | while (1 < argc && argv[1][0] == '-') { |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 48 | if (!strcmp(argv[1], "-p")) |
Junio C Hamano | 81e50ea | 2005-05-21 19:42:18 -0700 | [diff] [blame] | 49 | diff_output_format = DIFF_FORMAT_PATCH; |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 50 | else if (!strcmp(argv[1], "-q")) |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 51 | silent = 1; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 52 | else if (!strcmp(argv[1], "-r")) |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 53 | ; /* no-op */ |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 54 | else if (!strcmp(argv[1], "-s")) |
| 55 | ; /* no-op */ |
| 56 | else if (!strcmp(argv[1], "-z")) |
Junio C Hamano | 81e50ea | 2005-05-21 19:42:18 -0700 | [diff] [blame] | 57 | diff_output_format = DIFF_FORMAT_MACHINE; |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 58 | else if (!strcmp(argv[1], "-R")) |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 59 | diff_setup_opt |= DIFF_SETUP_REVERSE; |
Junio C Hamano | e25de75 | 2005-05-28 02:53:43 -0700 | [diff] [blame] | 60 | else if (!strncmp(argv[1], "-S", 2)) |
Junio C Hamano | 52e9578 | 2005-05-21 02:40:01 -0700 | [diff] [blame] | 61 | pickaxe = argv[1] + 2; |
Junio C Hamano | af5323e | 2005-05-30 00:09:07 -0700 | [diff] [blame] | 62 | else if (!strncmp(argv[1], "-O", 2)) |
| 63 | orderfile = argv[1] + 2; |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 64 | else if (!strncmp(argv[1], "--diff-filter=", 14)) |
| 65 | diff_filter = argv[1] + 14; |
Junio C Hamano | 367cec1 | 2005-05-27 15:55:28 -0700 | [diff] [blame] | 66 | else if (!strcmp(argv[1], "--pickaxe-all")) |
| 67 | pickaxe_opts = DIFF_PICKAXE_ALL; |
Junio C Hamano | 0e3994f | 2005-06-03 01:37:54 -0700 | [diff] [blame] | 68 | else if (!strncmp(argv[1], "-B", 2)) { |
| 69 | if ((diff_break_opt = |
| 70 | diff_scoreopt_parse(argv[1])) == -1) |
| 71 | usage(diff_files_usage); |
| 72 | } |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 73 | else if (!strncmp(argv[1], "-M", 2)) { |
Junio C Hamano | 0e3994f | 2005-06-03 01:37:54 -0700 | [diff] [blame] | 74 | if ((diff_score_opt = |
| 75 | diff_scoreopt_parse(argv[1])) == -1) |
| 76 | usage(diff_files_usage); |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 77 | detect_rename = DIFF_DETECT_RENAME; |
Junio C Hamano | 5c97558 | 2005-05-19 03:32:35 -0700 | [diff] [blame] | 78 | } |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 79 | else if (!strncmp(argv[1], "-C", 2)) { |
Junio C Hamano | 0e3994f | 2005-06-03 01:37:54 -0700 | [diff] [blame] | 80 | if ((diff_score_opt = |
| 81 | diff_scoreopt_parse(argv[1])) == -1) |
| 82 | usage(diff_files_usage); |
Junio C Hamano | 6b14d7f | 2005-05-22 10:04:37 -0700 | [diff] [blame] | 83 | detect_rename = DIFF_DETECT_COPY; |
Junio C Hamano | 427dcb4 | 2005-05-21 02:39:09 -0700 | [diff] [blame] | 84 | } |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 85 | else if (!strcmp(argv[1], "--find-copies-harder")) |
| 86 | find_copies_harder = 1; |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 87 | else |
Nicolas Pitre | 1771039 | 2005-04-30 13:59:38 -0700 | [diff] [blame] | 88 | usage(diff_files_usage); |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 89 | argv++; argc--; |
Petr Baudis | e2e5e98 | 2005-04-13 01:40:09 -0700 | [diff] [blame] | 90 | } |
| 91 | |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 92 | if (find_copies_harder && detect_rename != DIFF_DETECT_COPY) |
| 93 | usage(diff_files_usage); |
| 94 | |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 95 | /* At this point, if argc == 1, then we are doing everything. |
| 96 | * Otherwise argv[1] .. argv[argc-1] have the explicit paths. |
| 97 | */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 98 | if (entries < 0) { |
| 99 | perror("read_cache"); |
| 100 | exit(1); |
| 101 | } |
Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 102 | |
Junio C Hamano | 19feebc | 2005-05-27 15:54:37 -0700 | [diff] [blame] | 103 | diff_setup(diff_setup_opt); |
Junio C Hamano | 5c97558 | 2005-05-19 03:32:35 -0700 | [diff] [blame] | 104 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 105 | for (i = 0; i < entries; i++) { |
| 106 | struct stat st; |
Junio C Hamano | 67574c4 | 2005-06-01 11:38:07 -0700 | [diff] [blame] | 107 | unsigned int oldmode; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 108 | struct cache_entry *ce = active_cache[i]; |
Junio C Hamano | d94c612 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 109 | int changed; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 110 | |
Junio C Hamano | 9fec8b2 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 111 | if (ce_stage(ce)) { |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 112 | show_unmerge(ce->name); |
Junio C Hamano | 9fec8b2 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 113 | while (i < entries && |
| 114 | !strcmp(ce->name, active_cache[i]->name)) |
| 115 | i++; |
| 116 | i--; /* compensate for loop control increments */ |
| 117 | continue; |
| 118 | } |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 119 | |
Kay Sievers | ffbe1ad | 2005-05-06 15:45:01 +0200 | [diff] [blame] | 120 | if (lstat(ce->name, &st) < 0) { |
Junio C Hamano | 4117469 | 2005-05-20 09:48:38 -0700 | [diff] [blame] | 121 | if (errno != ENOENT && errno != ENOTDIR) { |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 122 | perror(ce->name); |
Junio C Hamano | ca2a079 | 2005-04-15 15:08:09 -0700 | [diff] [blame] | 123 | continue; |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 124 | } |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 125 | if (silent) |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 126 | continue; |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 127 | show_file('-', ce); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 128 | continue; |
| 129 | } |
Brad Roberts | 5d728c8 | 2005-05-14 19:04:25 -0700 | [diff] [blame] | 130 | changed = ce_match_stat(ce, &st); |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 131 | if (!changed && !find_copies_harder) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 132 | continue; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 133 | oldmode = ntohl(ce->ce_mode); |
Junio C Hamano | 67574c4 | 2005-06-01 11:38:07 -0700 | [diff] [blame] | 134 | show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode), |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 135 | ce->sha1, (changed ? null_sha1 : ce->sha1), |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 136 | ce->name); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 137 | } |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 138 | diffcore_std((1 < argc) ? argv + 1 : NULL, |
Junio C Hamano | befe863 | 2005-05-29 16:56:13 -0700 | [diff] [blame] | 139 | detect_rename, diff_score_opt, |
Junio C Hamano | f345b0a | 2005-05-30 00:08:37 -0700 | [diff] [blame] | 140 | pickaxe, pickaxe_opts, |
Junio C Hamano | af5323e | 2005-05-30 00:09:07 -0700 | [diff] [blame] | 141 | diff_break_opt, |
Junio C Hamano | f2ce9fd | 2005-06-11 20:57:13 -0700 | [diff] [blame] | 142 | orderfile, diff_filter); |
| 143 | diff_flush(diff_output_format); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 144 | return 0; |
| 145 | } |