Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Builtin "git diff" |
| 3 | * |
| 4 | * Copyright (c) 2006 Junio C Hamano |
| 5 | */ |
| 6 | #include "cache.h" |
Matthias Kestenholz | 6b2f2d9 | 2008-02-18 08:26:03 +0100 | [diff] [blame] | 7 | #include "color.h" |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 8 | #include "commit.h" |
| 9 | #include "blob.h" |
| 10 | #include "tag.h" |
| 11 | #include "diff.h" |
| 12 | #include "diffcore.h" |
| 13 | #include "revision.h" |
| 14 | #include "log-tree.h" |
| 15 | #include "builtin.h" |
| 16 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 17 | struct blobinfo { |
| 18 | unsigned char sha1[20]; |
| 19 | const char *name; |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 20 | unsigned mode; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 21 | }; |
| 22 | |
| 23 | static const char builtin_diff_usage[] = |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 24 | "git diff <options> <rev>{0,2} -- <path>*"; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 25 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 26 | static void stuff_change(struct diff_options *opt, |
| 27 | unsigned old_mode, unsigned new_mode, |
| 28 | const unsigned char *old_sha1, |
| 29 | const unsigned char *new_sha1, |
| 30 | const char *old_name, |
| 31 | const char *new_name) |
| 32 | { |
| 33 | struct diff_filespec *one, *two; |
| 34 | |
David Rientjes | 0bef57e | 2006-08-15 13:37:19 -0700 | [diff] [blame] | 35 | if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) && |
Junio C Hamano | 4334294 | 2007-04-22 23:56:22 -0700 | [diff] [blame] | 36 | !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode)) |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 37 | return; |
| 38 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 39 | if (DIFF_OPT_TST(opt, REVERSE_DIFF)) { |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 40 | unsigned tmp; |
Peter Hagervall | d92f1dc | 2006-05-07 16:50:47 +0200 | [diff] [blame] | 41 | const unsigned char *tmp_u; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 42 | const char *tmp_c; |
| 43 | tmp = old_mode; old_mode = new_mode; new_mode = tmp; |
| 44 | tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u; |
| 45 | tmp_c = old_name; old_name = new_name; new_name = tmp_c; |
| 46 | } |
Junio C Hamano | cd676a5 | 2008-02-12 14:26:02 -0800 | [diff] [blame] | 47 | |
| 48 | if (opt->prefix && |
| 49 | (strncmp(old_name, opt->prefix, opt->prefix_length) || |
| 50 | strncmp(new_name, opt->prefix, opt->prefix_length))) |
| 51 | return; |
| 52 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 53 | one = alloc_filespec(old_name); |
| 54 | two = alloc_filespec(new_name); |
| 55 | fill_filespec(one, old_sha1, old_mode); |
| 56 | fill_filespec(two, new_sha1, new_mode); |
| 57 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 58 | diff_queue(&diff_queued_diff, one, two); |
| 59 | } |
| 60 | |
| 61 | static int builtin_diff_b_f(struct rev_info *revs, |
| 62 | int argc, const char **argv, |
| 63 | struct blobinfo *blob, |
| 64 | const char *path) |
| 65 | { |
| 66 | /* Blob vs file in the working tree*/ |
| 67 | struct stat st; |
| 68 | |
Timo Hirvonen | a610786 | 2006-06-24 20:23:06 +0300 | [diff] [blame] | 69 | if (argc > 1) |
| 70 | usage(builtin_diff_usage); |
| 71 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 72 | if (lstat(path, &st)) |
| 73 | die("'%s': %s", path, strerror(errno)); |
| 74 | if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))) |
| 75 | die("'%s': not a regular file or symlink", path); |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 76 | |
Junio C Hamano | a5a818e | 2008-08-18 20:08:09 -0700 | [diff] [blame] | 77 | diff_set_mnemonic_prefix(&revs->diffopt, "o/", "w/"); |
| 78 | |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 79 | if (blob[0].mode == S_IFINVALID) |
| 80 | blob[0].mode = canon_mode(st.st_mode); |
| 81 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 82 | stuff_change(&revs->diffopt, |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 83 | blob[0].mode, canon_mode(st.st_mode), |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 84 | blob[0].sha1, null_sha1, |
Junio C Hamano | 065e0b1 | 2006-05-18 14:35:37 -0700 | [diff] [blame] | 85 | path, path); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 86 | diffcore_std(&revs->diffopt); |
| 87 | diff_flush(&revs->diffopt); |
| 88 | return 0; |
| 89 | } |
| 90 | |
| 91 | static int builtin_diff_blobs(struct rev_info *revs, |
| 92 | int argc, const char **argv, |
| 93 | struct blobinfo *blob) |
| 94 | { |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 95 | unsigned mode = canon_mode(S_IFREG | 0644); |
| 96 | |
Timo Hirvonen | a610786 | 2006-06-24 20:23:06 +0300 | [diff] [blame] | 97 | if (argc > 1) |
| 98 | usage(builtin_diff_usage); |
| 99 | |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 100 | if (blob[0].mode == S_IFINVALID) |
| 101 | blob[0].mode = mode; |
| 102 | |
| 103 | if (blob[1].mode == S_IFINVALID) |
| 104 | blob[1].mode = mode; |
| 105 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 106 | stuff_change(&revs->diffopt, |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 107 | blob[0].mode, blob[1].mode, |
Junio C Hamano | f82cd3c | 2006-08-03 11:50:10 -0700 | [diff] [blame] | 108 | blob[0].sha1, blob[1].sha1, |
Junio C Hamano | 53dd8a9 | 2006-08-03 11:57:11 -0700 | [diff] [blame] | 109 | blob[0].name, blob[1].name); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 110 | diffcore_std(&revs->diffopt); |
| 111 | diff_flush(&revs->diffopt); |
| 112 | return 0; |
| 113 | } |
| 114 | |
| 115 | static int builtin_diff_index(struct rev_info *revs, |
| 116 | int argc, const char **argv) |
| 117 | { |
| 118 | int cached = 0; |
| 119 | while (1 < argc) { |
| 120 | const char *arg = argv[1]; |
David Symonds | 2baf185 | 2008-10-29 09:15:36 -0700 | [diff] [blame] | 121 | if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged")) |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 122 | cached = 1; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 123 | else |
| 124 | usage(builtin_diff_usage); |
| 125 | argv++; argc--; |
| 126 | } |
Nguyễn Thái Ngọc Duy | 4f38f6b | 2008-08-28 20:02:12 +0700 | [diff] [blame] | 127 | if (!cached) |
| 128 | setup_work_tree(); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 129 | /* |
| 130 | * Make sure there is one revision (i.e. pending object), |
| 131 | * and there is no revision filtering parameters. |
| 132 | */ |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 133 | if (revs->pending.nr != 1 || |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 134 | revs->max_count != -1 || revs->min_age != -1 || |
| 135 | revs->max_age != -1) |
| 136 | usage(builtin_diff_usage); |
Linus Torvalds | 671c9b7 | 2008-11-13 16:36:30 -0800 | [diff] [blame] | 137 | if (read_cache_preload(revs->diffopt.paths) < 0) { |
| 138 | perror("read_cache_preload"); |
Junio C Hamano | b4e1e4a | 2007-02-09 18:51:40 -0800 | [diff] [blame] | 139 | return -1; |
| 140 | } |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 141 | return run_diff_index(revs, cached); |
| 142 | } |
| 143 | |
| 144 | static int builtin_diff_tree(struct rev_info *revs, |
| 145 | int argc, const char **argv, |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 146 | struct object_array_entry *ent) |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 147 | { |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 148 | const unsigned char *(sha1[2]); |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 149 | int swap = 0; |
Timo Hirvonen | a610786 | 2006-06-24 20:23:06 +0300 | [diff] [blame] | 150 | |
| 151 | if (argc > 1) |
| 152 | usage(builtin_diff_usage); |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 153 | |
| 154 | /* We saw two trees, ent[0] and ent[1]. |
Pavel Roskin | 82e5a82 | 2006-07-10 01:50:18 -0400 | [diff] [blame] | 155 | * if ent[1] is uninteresting, they are swapped |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 156 | */ |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 157 | if (ent[1].item->flags & UNINTERESTING) |
| 158 | swap = 1; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 159 | sha1[swap] = ent[0].item->sha1; |
| 160 | sha1[1-swap] = ent[1].item->sha1; |
| 161 | diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt); |
| 162 | log_tree_diff_flush(revs); |
| 163 | return 0; |
| 164 | } |
| 165 | |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 166 | static int builtin_diff_combined(struct rev_info *revs, |
| 167 | int argc, const char **argv, |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 168 | struct object_array_entry *ent, |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 169 | int ents) |
| 170 | { |
| 171 | const unsigned char (*parent)[20]; |
| 172 | int i; |
| 173 | |
Timo Hirvonen | a610786 | 2006-06-24 20:23:06 +0300 | [diff] [blame] | 174 | if (argc > 1) |
| 175 | usage(builtin_diff_usage); |
| 176 | |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 177 | if (!revs->dense_combined_merges && !revs->combine_merges) |
| 178 | revs->dense_combined_merges = revs->combine_merges = 1; |
| 179 | parent = xmalloc(ents * sizeof(*parent)); |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 180 | for (i = 0; i < ents; i++) |
Matt McCutchen | b75271d | 2008-10-10 21:56:15 -0400 | [diff] [blame] | 181 | hashcpy((unsigned char *)(parent + i), ent[i].item->sha1); |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 182 | diff_tree_combined(parent[0], parent + 1, ents - 1, |
| 183 | revs->dense_combined_merges, revs); |
| 184 | return 0; |
| 185 | } |
| 186 | |
Junio C Hamano | aecbf91 | 2007-08-31 13:13:42 -0700 | [diff] [blame] | 187 | static void refresh_index_quietly(void) |
| 188 | { |
| 189 | struct lock_file *lock_file; |
| 190 | int fd; |
| 191 | |
| 192 | lock_file = xcalloc(1, sizeof(struct lock_file)); |
| 193 | fd = hold_locked_index(lock_file, 0); |
| 194 | if (fd < 0) |
| 195 | return; |
| 196 | discard_cache(); |
| 197 | read_cache(); |
| 198 | refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED); |
Junio C Hamano | fbbdbfc | 2007-11-08 16:24:00 -0800 | [diff] [blame] | 199 | |
| 200 | if (active_cache_changed && |
Brandon Casey | 4ed7cd3 | 2008-01-16 13:12:46 -0600 | [diff] [blame] | 201 | !write_cache(fd, active_cache, active_nr)) |
Junio C Hamano | fbbdbfc | 2007-11-08 16:24:00 -0800 | [diff] [blame] | 202 | commit_locked_index(lock_file); |
| 203 | |
Junio C Hamano | aecbf91 | 2007-08-31 13:13:42 -0700 | [diff] [blame] | 204 | rollback_lock_file(lock_file); |
| 205 | } |
| 206 | |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 207 | static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv) |
| 208 | { |
| 209 | int result; |
| 210 | unsigned int options = 0; |
| 211 | |
| 212 | while (1 < argc && argv[1][0] == '-') { |
| 213 | if (!strcmp(argv[1], "--base")) |
| 214 | revs->max_count = 1; |
| 215 | else if (!strcmp(argv[1], "--ours")) |
| 216 | revs->max_count = 2; |
| 217 | else if (!strcmp(argv[1], "--theirs")) |
| 218 | revs->max_count = 3; |
| 219 | else if (!strcmp(argv[1], "-q")) |
| 220 | options |= DIFF_SILENT_ON_REMOVED; |
| 221 | else |
| 222 | return error("invalid option: %s", argv[1]); |
| 223 | argv++; argc--; |
| 224 | } |
| 225 | |
Junio C Hamano | 903e09a | 2008-09-18 00:32:37 -0700 | [diff] [blame] | 226 | /* |
| 227 | * "diff --base" should not combine merges because it was not |
| 228 | * asked to. "diff -c" should not densify (if the user wants |
| 229 | * dense one, --cc can be explicitly asked for, or just rely |
| 230 | * on the default). |
| 231 | */ |
| 232 | if (revs->max_count == -1 && !revs->combine_merges && |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 233 | (revs->diffopt.output_format & DIFF_FORMAT_PATCH)) |
| 234 | revs->combine_merges = revs->dense_combined_merges = 1; |
| 235 | |
Nguyễn Thái Ngọc Duy | 4f38f6b | 2008-08-28 20:02:12 +0700 | [diff] [blame] | 236 | setup_work_tree(); |
Linus Torvalds | 671c9b7 | 2008-11-13 16:36:30 -0800 | [diff] [blame] | 237 | if (read_cache_preload(revs->diffopt.paths) < 0) { |
| 238 | perror("read_cache_preload"); |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 239 | return -1; |
| 240 | } |
| 241 | result = run_diff_files(revs, options); |
| 242 | return diff_result_code(&revs->diffopt, result); |
| 243 | } |
| 244 | |
Linus Torvalds | a633fca | 2006-07-28 22:44:25 -0700 | [diff] [blame] | 245 | int cmd_diff(int argc, const char **argv, const char *prefix) |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 246 | { |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 247 | int i; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 248 | struct rev_info rev; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 249 | struct object_array_entry ent[100]; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 250 | int ents = 0, blobs = 0, paths = 0; |
Linus Torvalds | a633fca | 2006-07-28 22:44:25 -0700 | [diff] [blame] | 251 | const char *path = NULL; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 252 | struct blobinfo blob[2]; |
SZEDER Gábor | af05d67 | 2008-03-25 22:06:26 +0100 | [diff] [blame] | 253 | int nongit; |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 254 | int result = 0; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 255 | |
| 256 | /* |
| 257 | * We could get N tree-ish in the rev.pending_objects list. |
| 258 | * Also there could be M blobs there, and P pathspecs. |
| 259 | * |
| 260 | * N=0, M=0: |
| 261 | * cache vs files (diff-files) |
| 262 | * N=0, M=2: |
| 263 | * compare two random blobs. P must be zero. |
| 264 | * N=0, M=1, P=1: |
| 265 | * compare a blob with a working tree file. |
| 266 | * |
| 267 | * N=1, M=0: |
| 268 | * tree vs cache (diff-index --cached) |
| 269 | * |
| 270 | * N=2, M=0: |
| 271 | * tree vs tree (diff-tree) |
| 272 | * |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 273 | * N=0, M=0, P=2: |
| 274 | * compare two filesystem entities (aka --no-index). |
| 275 | * |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 276 | * Other cases are errors. |
| 277 | */ |
Junio C Hamano | 230f544 | 2006-05-03 23:54:34 -0700 | [diff] [blame] | 278 | |
Johannes Schindelin | d516c2d | 2007-02-22 21:50:10 +0100 | [diff] [blame] | 279 | prefix = setup_git_directory_gently(&nongit); |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 280 | git_config(git_diff_ui_config, NULL); |
Matthias Kestenholz | 6b2f2d9 | 2008-02-18 08:26:03 +0100 | [diff] [blame] | 281 | |
| 282 | if (diff_use_color_default == -1) |
| 283 | diff_use_color_default = git_use_color_default; |
| 284 | |
Linus Torvalds | db6296a | 2006-07-28 21:21:48 -0700 | [diff] [blame] | 285 | init_revisions(&rev, prefix); |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 286 | |
| 287 | /* If this is a no-index diff, just run it and exit there. */ |
| 288 | diff_no_index(&rev, argc, argv, nongit, prefix); |
| 289 | |
| 290 | /* Otherwise, we are doing the usual "git" diff */ |
Junio C Hamano | aecbf91 | 2007-08-31 13:13:42 -0700 | [diff] [blame] | 291 | rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 292 | |
Jeff King | 5ec11af | 2008-12-07 21:54:17 -0500 | [diff] [blame] | 293 | /* Default to let external and textconv be used */ |
Junio C Hamano | 61af494 | 2008-11-26 09:58:41 -0800 | [diff] [blame] | 294 | DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL); |
Jeff King | 5ec11af | 2008-12-07 21:54:17 -0500 | [diff] [blame] | 295 | DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV); |
Junio C Hamano | 61af494 | 2008-11-26 09:58:41 -0800 | [diff] [blame] | 296 | |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 297 | if (nongit) |
| 298 | die("Not a git repository"); |
| 299 | argc = setup_revisions(argc, argv, &rev, NULL); |
Junio C Hamano | 047fbe9 | 2006-07-01 22:15:40 -0700 | [diff] [blame] | 300 | if (!rev.diffopt.output_format) { |
Timo Hirvonen | c9b5ef9 | 2006-06-24 20:24:14 +0300 | [diff] [blame] | 301 | rev.diffopt.output_format = DIFF_FORMAT_PATCH; |
Junio C Hamano | 72ee96c | 2006-08-09 12:45:27 -0700 | [diff] [blame] | 302 | if (diff_setup_done(&rev.diffopt) < 0) |
| 303 | die("diff_setup_done failed"); |
Junio C Hamano | 047fbe9 | 2006-07-01 22:15:40 -0700 | [diff] [blame] | 304 | } |
Junio C Hamano | 61af494 | 2008-11-26 09:58:41 -0800 | [diff] [blame] | 305 | |
Pierre Habouzit | 8f67f8a | 2007-11-10 20:05:14 +0100 | [diff] [blame] | 306 | DIFF_OPT_SET(&rev.diffopt, RECURSIVE); |
Timo Hirvonen | c9b5ef9 | 2006-06-24 20:24:14 +0300 | [diff] [blame] | 307 | |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 308 | /* |
| 309 | * If the user asked for our exit code then don't start a |
René Scharfe | 89d07f7 | 2007-08-12 19:46:55 +0200 | [diff] [blame] | 310 | * pager or we would end up reporting its exit code instead. |
| 311 | */ |
Alex Riesen | 8f0359f | 2008-07-21 23:28:49 +0200 | [diff] [blame] | 312 | if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) && |
| 313 | check_pager_config("diff") != 0) |
René Scharfe | 89d07f7 | 2007-08-12 19:46:55 +0200 | [diff] [blame] | 314 | setup_pager(); |
| 315 | |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 316 | /* |
| 317 | * Do we have --cached and not have a pending object, then |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 318 | * default to HEAD by hand. Eek. |
| 319 | */ |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 320 | if (!rev.pending.nr) { |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 321 | int i; |
| 322 | for (i = 1; i < argc; i++) { |
| 323 | const char *arg = argv[i]; |
| 324 | if (!strcmp(arg, "--")) |
| 325 | break; |
David Symonds | 2baf185 | 2008-10-29 09:15:36 -0700 | [diff] [blame] | 326 | else if (!strcmp(arg, "--cached") || |
| 327 | !strcmp(arg, "--staged")) { |
Junio C Hamano | 3384a2d | 2007-12-11 10:09:04 -0800 | [diff] [blame] | 328 | add_head_to_pending(&rev); |
Junio C Hamano | 6c09c45 | 2007-02-24 22:26:33 -0800 | [diff] [blame] | 329 | if (!rev.pending.nr) |
| 330 | die("No HEAD commit to compare with (yet)"); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 331 | break; |
| 332 | } |
| 333 | } |
| 334 | } |
| 335 | |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 336 | for (i = 0; i < rev.pending.nr; i++) { |
| 337 | struct object_array_entry *list = rev.pending.objects+i; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 338 | struct object *obj = list->item; |
| 339 | const char *name = list->name; |
| 340 | int flags = (obj->flags & UNINTERESTING); |
| 341 | if (!obj->parsed) |
| 342 | obj = parse_object(obj->sha1); |
| 343 | obj = deref_tag(obj, NULL, 0); |
| 344 | if (!obj) |
| 345 | die("invalid object '%s' given.", name); |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 346 | if (obj->type == OBJ_COMMIT) |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 347 | obj = &((struct commit *)obj)->tree->object; |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 348 | if (obj->type == OBJ_TREE) { |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 349 | if (ARRAY_SIZE(ent) <= ents) |
| 350 | die("more than %d trees given: '%s'", |
Junio C Hamano | 334b506 | 2006-04-30 00:26:41 -0700 | [diff] [blame] | 351 | (int) ARRAY_SIZE(ent), name); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 352 | obj->flags |= flags; |
| 353 | ent[ents].item = obj; |
| 354 | ent[ents].name = name; |
| 355 | ents++; |
| 356 | continue; |
| 357 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 358 | if (obj->type == OBJ_BLOB) { |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 359 | if (2 <= blobs) |
| 360 | die("more than two blobs given: '%s'", name); |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 361 | hashcpy(blob[blobs].sha1, obj->sha1); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 362 | blob[blobs].name = name; |
Martin Koegler | 01618a3 | 2007-04-22 18:44:00 +0200 | [diff] [blame] | 363 | blob[blobs].mode = list->mode; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 364 | blobs++; |
| 365 | continue; |
Junio C Hamano | 230f544 | 2006-05-03 23:54:34 -0700 | [diff] [blame] | 366 | |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 367 | } |
| 368 | die("unhandled object '%s' given.", name); |
| 369 | } |
| 370 | if (rev.prune_data) { |
| 371 | const char **pathspec = rev.prune_data; |
| 372 | while (*pathspec) { |
| 373 | if (!path) |
| 374 | path = *pathspec; |
| 375 | paths++; |
| 376 | pathspec++; |
| 377 | } |
| 378 | } |
| 379 | |
| 380 | /* |
| 381 | * Now, do the arguments look reasonable? |
| 382 | */ |
| 383 | if (!ents) { |
| 384 | switch (blobs) { |
| 385 | case 0: |
Junio C Hamano | 0569e9b | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 386 | result = builtin_diff_files(&rev, argc, argv); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 387 | break; |
| 388 | case 1: |
| 389 | if (paths != 1) |
| 390 | usage(builtin_diff_usage); |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 391 | result = builtin_diff_b_f(&rev, argc, argv, blob, path); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 392 | break; |
| 393 | case 2: |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 394 | if (paths) |
| 395 | usage(builtin_diff_usage); |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 396 | result = builtin_diff_blobs(&rev, argc, argv, blob); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 397 | break; |
| 398 | default: |
| 399 | usage(builtin_diff_usage); |
| 400 | } |
| 401 | } |
| 402 | else if (blobs) |
| 403 | usage(builtin_diff_usage); |
| 404 | else if (ents == 1) |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 405 | result = builtin_diff_index(&rev, argc, argv); |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 406 | else if (ents == 2) |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 407 | result = builtin_diff_tree(&rev, argc, argv, ent); |
Junio C Hamano | 9919f41 | 2006-07-17 00:34:44 -0700 | [diff] [blame] | 408 | else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) { |
| 409 | /* diff A...B where there is one sane merge base between |
| 410 | * A and B. We have ent[0] == merge-base, ent[1] == A, |
| 411 | * and ent[2] == B. Show diff between the base and B. |
| 412 | */ |
Junio C Hamano | 306ea2d | 2006-08-10 00:50:15 -0700 | [diff] [blame] | 413 | ent[1] = ent[2]; |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 414 | result = builtin_diff_tree(&rev, argc, argv, ent); |
Junio C Hamano | 9919f41 | 2006-07-17 00:34:44 -0700 | [diff] [blame] | 415 | } |
Junio C Hamano | 0fe7c1d | 2006-04-29 01:24:49 -0700 | [diff] [blame] | 416 | else |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 417 | result = builtin_diff_combined(&rev, argc, argv, |
Junio C Hamano | 9919f41 | 2006-07-17 00:34:44 -0700 | [diff] [blame] | 418 | ent, ents); |
Junio C Hamano | da31b35 | 2007-12-13 23:40:27 -0800 | [diff] [blame] | 419 | result = diff_result_code(&rev.diffopt, result); |
Junio C Hamano | aecbf91 | 2007-08-31 13:13:42 -0700 | [diff] [blame] | 420 | if (1 < rev.diffopt.skip_stat_unmatch) |
| 421 | refresh_index_quietly(); |
Alex Riesen | 41bbf9d | 2007-03-14 01:17:04 +0100 | [diff] [blame] | 422 | return result; |
Junio C Hamano | 6505602 | 2006-04-28 23:20:52 -0700 | [diff] [blame] | 423 | } |