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