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 | |
Petr Baudis | 4d1f119 | 2005-07-29 11:01:26 +0200 | [diff] [blame] | 9 | static const char diff_files_usage[] = |
Junio C Hamano | dda2d79 | 2005-07-13 12:52:35 -0700 | [diff] [blame] | 10 | "git-diff-files [-q] " |
| 11 | "[<common diff options>] [<path>...]" |
| 12 | COMMON_DIFF_OPTIONS_HELP; |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 13 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 14 | static struct diff_options diff_options; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 15 | static int silent = 0; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 16 | |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 17 | static void show_unmerge(const char *path) |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 18 | { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 19 | diff_unmerge(&diff_options, path); |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 20 | } |
| 21 | |
| 22 | static void show_file(int pfx, struct cache_entry *ce) |
| 23 | { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 24 | diff_addremove(&diff_options, pfx, ntohl(ce->ce_mode), |
| 25 | ce->sha1, ce->name, NULL); |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 26 | } |
| 27 | |
| 28 | static void show_modified(int oldmode, int mode, |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 29 | const unsigned char *old_sha1, const unsigned char *sha1, |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 30 | char *path) |
| 31 | { |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 32 | diff_change(&diff_options, oldmode, mode, old_sha1, sha1, path, NULL); |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 33 | } |
| 34 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 35 | int main(int argc, const char **argv) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 36 | { |
Linus Torvalds | c0fd1f5 | 2005-07-14 16:55:06 -0700 | [diff] [blame] | 37 | const char **pathspec; |
Linus Torvalds | d288a70 | 2005-08-16 18:06:34 -0700 | [diff] [blame] | 38 | const char *prefix = setup_git_directory(); |
| 39 | int entries, i; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 40 | |
Linus Torvalds | 1771299 | 2005-10-10 16:31:08 -0700 | [diff] [blame] | 41 | git_config(git_default_config); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 42 | diff_setup(&diff_options); |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 43 | while (1 < argc && argv[1][0] == '-') { |
Linus Torvalds | ea51d41 | 2005-10-18 00:16:45 -0700 | [diff] [blame] | 44 | if (!strcmp(argv[1], "--")) { |
| 45 | argv++; |
| 46 | argc--; |
| 47 | break; |
| 48 | } |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 49 | if (!strcmp(argv[1], "-q")) |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 50 | silent = 1; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 51 | else if (!strcmp(argv[1], "-r")) |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 52 | ; /* no-op */ |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 53 | else if (!strcmp(argv[1], "-s")) |
| 54 | ; /* no-op */ |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 55 | else { |
| 56 | int diff_opt_cnt; |
| 57 | diff_opt_cnt = diff_opt_parse(&diff_options, |
| 58 | argv+1, argc-1); |
| 59 | if (diff_opt_cnt < 0) |
| 60 | usage(diff_files_usage); |
| 61 | else if (diff_opt_cnt) { |
| 62 | argv += diff_opt_cnt; |
| 63 | argc -= diff_opt_cnt; |
| 64 | continue; |
| 65 | } |
| 66 | else |
Junio C Hamano | 0e3994f | 2005-06-03 01:37:54 -0700 | [diff] [blame] | 67 | usage(diff_files_usage); |
| 68 | } |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 69 | argv++; argc--; |
Petr Baudis | e2e5e98 | 2005-04-13 01:40:09 -0700 | [diff] [blame] | 70 | } |
| 71 | |
Linus Torvalds | d288a70 | 2005-08-16 18:06:34 -0700 | [diff] [blame] | 72 | /* Find the directory, and set up the pathspec */ |
| 73 | pathspec = get_pathspec(prefix, argv + 1); |
| 74 | entries = read_cache(); |
Linus Torvalds | c0fd1f5 | 2005-07-14 16:55:06 -0700 | [diff] [blame] | 75 | |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 76 | if (diff_setup_done(&diff_options) < 0) |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 77 | usage(diff_files_usage); |
| 78 | |
Junio C Hamano | b8f8092 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 79 | /* At this point, if argc == 1, then we are doing everything. |
| 80 | * Otherwise argv[1] .. argv[argc-1] have the explicit paths. |
| 81 | */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 82 | if (entries < 0) { |
| 83 | perror("read_cache"); |
| 84 | exit(1); |
| 85 | } |
Junio C Hamano | be3cfa8 | 2005-04-26 09:25:05 -0700 | [diff] [blame] | 86 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 87 | for (i = 0; i < entries; i++) { |
| 88 | struct stat st; |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 89 | unsigned int oldmode, newmode; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 90 | struct cache_entry *ce = active_cache[i]; |
Junio C Hamano | d94c612 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 91 | int changed; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 92 | |
Linus Torvalds | c0fd1f5 | 2005-07-14 16:55:06 -0700 | [diff] [blame] | 93 | if (!ce_path_match(ce, pathspec)) |
| 94 | continue; |
| 95 | |
Junio C Hamano | 9fec8b2 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 96 | if (ce_stage(ce)) { |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 97 | show_unmerge(ce->name); |
Junio C Hamano | 9fec8b2 | 2005-04-16 21:29:45 -0700 | [diff] [blame] | 98 | while (i < entries && |
| 99 | !strcmp(ce->name, active_cache[i]->name)) |
| 100 | i++; |
| 101 | i--; /* compensate for loop control increments */ |
| 102 | continue; |
| 103 | } |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 104 | |
Kay Sievers | ffbe1ad | 2005-05-06 15:45:01 +0200 | [diff] [blame] | 105 | if (lstat(ce->name, &st) < 0) { |
Junio C Hamano | 4117469 | 2005-05-20 09:48:38 -0700 | [diff] [blame] | 106 | if (errno != ENOENT && errno != ENOTDIR) { |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 107 | perror(ce->name); |
Junio C Hamano | ca2a079 | 2005-04-15 15:08:09 -0700 | [diff] [blame] | 108 | continue; |
Junio C Hamano | 57fe64a | 2005-05-19 19:00:36 -0700 | [diff] [blame] | 109 | } |
Junio C Hamano | d15aa43 | 2005-04-27 15:22:02 -0700 | [diff] [blame] | 110 | if (silent) |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 111 | continue; |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 112 | show_file('-', ce); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 113 | continue; |
| 114 | } |
Brad Roberts | 5d728c8 | 2005-05-14 19:04:25 -0700 | [diff] [blame] | 115 | changed = ce_match_stat(ce, &st); |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 116 | if (!changed && !diff_options.find_copies_harder) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 117 | continue; |
Linus Torvalds | 0a7668e | 2005-04-26 17:17:36 -0700 | [diff] [blame] | 118 | oldmode = ntohl(ce->ce_mode); |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 119 | |
| 120 | newmode = DIFF_FILE_CANON_MODE(st.st_mode); |
| 121 | if (!trust_executable_bit && |
| 122 | S_ISREG(newmode) && S_ISREG(oldmode) && |
| 123 | ((newmode ^ oldmode) == 0111)) |
| 124 | newmode = oldmode; |
| 125 | show_modified(oldmode, newmode, |
Junio C Hamano | 4727f64 | 2005-06-19 13:14:05 -0700 | [diff] [blame] | 126 | ce->sha1, (changed ? null_sha1 : ce->sha1), |
Junio C Hamano | 4a6bf9e | 2005-04-27 09:21:00 -0700 | [diff] [blame] | 127 | ce->name); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 128 | } |
Junio C Hamano | 6b5ee13 | 2005-09-21 00:00:47 -0700 | [diff] [blame] | 129 | diffcore_std(&diff_options); |
| 130 | diff_flush(&diff_options); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 131 | return 0; |
| 132 | } |