X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=0c3f80046b51abd3c44da61a71dce7da3a712518;hb=abb7c7b31c0896bd838bbb6437b310db5a42227a;hp=39dd54f80a7e81f7e67faf13ba79a0a8c9e077e7;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git diff --git a/diff-files.c b/diff-files.c index 39dd54f8..0c3f8004 100644 --- a/diff-files.c +++ b/diff-files.c @@ -6,99 +6,96 @@ #include "cache.h" #include "diff.h" -static const char *diff_files_usage = -"git-diff-files [-q] " -"[] [...]" +static const char diff_files_usage[] = +"git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [] [...]" COMMON_DIFF_OPTIONS_HELP; -static int diff_output_format = DIFF_FORMAT_RAW; -static int diff_line_termination = '\n'; -static int detect_rename = 0; -static int find_copies_harder = 0; -static int diff_setup_opt = 0; -static int diff_score_opt = 0; -static const char *pickaxe = NULL; -static int pickaxe_opts = 0; -static int diff_break_opt = -1; -static const char *orderfile = NULL; -static const char *diff_filter = NULL; +static struct diff_options diff_options; static int silent = 0; +static int diff_unmerged_stage = 2; +static int combine_merges = 0; +static int dense_combined_merges = 0; static void show_unmerge(const char *path) { - diff_unmerge(path); + diff_unmerge(&diff_options, path); } static void show_file(int pfx, struct cache_entry *ce) { - diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL); + diff_addremove(&diff_options, pfx, ntohl(ce->ce_mode), + ce->sha1, ce->name, NULL); } static void show_modified(int oldmode, int mode, const unsigned char *old_sha1, const unsigned char *sha1, char *path) { - diff_change(oldmode, mode, old_sha1, sha1, path, NULL); + diff_change(&diff_options, oldmode, mode, old_sha1, sha1, path, NULL); } int main(int argc, const char **argv) { - static const unsigned char null_sha1[20] = { 0, }; const char **pathspec; - int entries = read_cache(); - int i; + const char *prefix = setup_git_directory(); + int entries, i; + git_config(git_diff_config); + diff_setup(&diff_options); while (1 < argc && argv[1][0] == '-') { - if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u")) - diff_output_format = DIFF_FORMAT_PATCH; + if (!strcmp(argv[1], "--")) { + argv++; + argc--; + break; + } + if (!strcmp(argv[1], "-0")) + diff_unmerged_stage = 0; + else if (!strcmp(argv[1], "-1")) + diff_unmerged_stage = 1; + else if (!strcmp(argv[1], "-2")) + diff_unmerged_stage = 2; + else if (!strcmp(argv[1], "-3")) + diff_unmerged_stage = 3; + else if (!strcmp(argv[1], "--base")) + diff_unmerged_stage = 1; + else if (!strcmp(argv[1], "--ours")) + diff_unmerged_stage = 2; + else if (!strcmp(argv[1], "--theirs")) + diff_unmerged_stage = 3; else if (!strcmp(argv[1], "-q")) silent = 1; else if (!strcmp(argv[1], "-r")) ; /* no-op */ else if (!strcmp(argv[1], "-s")) ; /* no-op */ - else if (!strcmp(argv[1], "-z")) - diff_line_termination = 0; - else if (!strcmp(argv[1], "--name-only")) - diff_output_format = DIFF_FORMAT_NAME; - else if (!strcmp(argv[1], "-R")) - diff_setup_opt |= DIFF_SETUP_REVERSE; - else if (!strncmp(argv[1], "-S", 2)) - pickaxe = argv[1] + 2; - else if (!strncmp(argv[1], "-O", 2)) - orderfile = argv[1] + 2; - else if (!strncmp(argv[1], "--diff-filter=", 14)) - diff_filter = argv[1] + 14; - else if (!strcmp(argv[1], "--pickaxe-all")) - pickaxe_opts = DIFF_PICKAXE_ALL; - else if (!strncmp(argv[1], "-B", 2)) { - if ((diff_break_opt = - diff_scoreopt_parse(argv[1])) == -1) - usage(diff_files_usage); - } - else if (!strncmp(argv[1], "-M", 2)) { - if ((diff_score_opt = - diff_scoreopt_parse(argv[1])) == -1) + else if (!strcmp(argv[1], "-c")) + combine_merges = 1; + else if (!strcmp(argv[1], "--cc")) + dense_combined_merges = combine_merges = 1; + else { + int diff_opt_cnt; + diff_opt_cnt = diff_opt_parse(&diff_options, + argv+1, argc-1); + if (diff_opt_cnt < 0) usage(diff_files_usage); - detect_rename = DIFF_DETECT_RENAME; - } - else if (!strncmp(argv[1], "-C", 2)) { - if ((diff_score_opt = - diff_scoreopt_parse(argv[1])) == -1) + else if (diff_opt_cnt) { + argv += diff_opt_cnt; + argc -= diff_opt_cnt; + continue; + } + else usage(diff_files_usage); - detect_rename = DIFF_DETECT_COPY; } - else if (!strcmp(argv[1], "--find-copies-harder")) - find_copies_harder = 1; - else - usage(diff_files_usage); argv++; argc--; } + if (dense_combined_merges) + diff_options.output_format = DIFF_FORMAT_PATCH; - /* Do we have a pathspec? */ - pathspec = (argc > 1) ? argv + 1 : NULL; + /* Find the directory, and set up the pathspec */ + pathspec = get_pathspec(prefix, argv + 1); + entries = read_cache(); - if (find_copies_harder && detect_rename != DIFF_DETECT_COPY) + if (diff_setup_done(&diff_options) < 0) usage(diff_files_usage); /* At this point, if argc == 1, then we are doing everything. @@ -109,11 +106,9 @@ int main(int argc, const char **argv) exit(1); } - diff_setup(diff_setup_opt); - for (i = 0; i < entries; i++) { struct stat st; - unsigned int oldmode; + unsigned int oldmode, newmode; struct cache_entry *ce = active_cache[i]; int changed; @@ -121,12 +116,71 @@ int main(int argc, const char **argv) continue; if (ce_stage(ce)) { - show_unmerge(ce->name); - while (i < entries && - !strcmp(ce->name, active_cache[i]->name)) + struct { + struct combine_diff_path p; + struct combine_diff_parent filler[5]; + } combine; + int num_compare_stages = 0; + + combine.p.next = NULL; + combine.p.len = ce_namelen(ce); + combine.p.path = xmalloc(combine.p.len + 1); + memcpy(combine.p.path, ce->name, combine.p.len); + combine.p.path[combine.p.len] = 0; + combine.p.mode = 0; + memset(combine.p.sha1, 0, 20); + memset(&combine.p.parent[0], 0, + sizeof(combine.filler)); + + while (i < entries) { + struct cache_entry *nce = active_cache[i]; + int stage; + + if (strcmp(ce->name, nce->name)) + break; + + /* Stage #2 (ours) is the first parent, + * stage #3 (theirs) is the second. + */ + stage = ce_stage(nce); + if (2 <= stage) { + int mode = ntohl(nce->ce_mode); + num_compare_stages++; + memcpy(combine.p.parent[stage-2].sha1, + nce->sha1, 20); + combine.p.parent[stage-2].mode = + DIFF_FILE_CANON_MODE(mode); + combine.p.parent[stage-2].status = + DIFF_STATUS_MODIFIED; + } + + /* diff against the proper unmerged stage */ + if (stage == diff_unmerged_stage) + ce = nce; i++; - i--; /* compensate for loop control increments */ - continue; + } + /* + * Compensate for loop update + */ + i--; + + if (combine_merges && num_compare_stages == 2) { + show_combined_diff(&combine.p, 2, + dense_combined_merges, + NULL, + &diff_options); + free(combine.p.path); + continue; + } + free(combine.p.path); + + /* + * Show the diff for the 'ce' if we found the one + * from the desired stage. + */ + show_unmerge(ce->name); + if (ce_stage(ce) != diff_unmerged_stage) + continue; } if (lstat(ce->name, &st) < 0) { @@ -140,18 +194,20 @@ int main(int argc, const char **argv) continue; } changed = ce_match_stat(ce, &st); - if (!changed && !find_copies_harder) + if (!changed && !diff_options.find_copies_harder) continue; oldmode = ntohl(ce->ce_mode); - show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode), + + newmode = DIFF_FILE_CANON_MODE(st.st_mode); + if (!trust_executable_bit && + S_ISREG(newmode) && S_ISREG(oldmode) && + ((newmode ^ oldmode) == 0111)) + newmode = oldmode; + show_modified(oldmode, newmode, ce->sha1, (changed ? null_sha1 : ce->sha1), ce->name); } - diffcore_std(pathspec, - detect_rename, diff_score_opt, - pickaxe, pickaxe_opts, - diff_break_opt, - orderfile, diff_filter); - diff_flush(diff_output_format, diff_line_termination); + diffcore_std(&diff_options); + diff_flush(&diff_options); return 0; }