Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "builtin.h" |
| 3 | #include "parse-options.h" |
Johannes Schindelin | d9c66f0 | 2018-08-13 04:33:04 -0700 | [diff] [blame] | 4 | #include "range-diff.h" |
Johannes Schindelin | c8c5e43 | 2018-08-13 04:33:07 -0700 | [diff] [blame] | 5 | #include "config.h" |
Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 6 | |
| 7 | static const char * const builtin_range_diff_usage[] = { |
| 8 | N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"), |
| 9 | N_("git range-diff [<options>] <old-tip>...<new-tip>"), |
| 10 | N_("git range-diff [<options>] <base> <old-tip> <new-tip>"), |
| 11 | NULL |
| 12 | }; |
| 13 | |
| 14 | int cmd_range_diff(int argc, const char **argv, const char *prefix) |
| 15 | { |
Eric Sunshine | 2566865 | 2018-07-22 05:57:11 -0400 | [diff] [blame] | 16 | int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT; |
Johannes Schindelin | c8c5e43 | 2018-08-13 04:33:07 -0700 | [diff] [blame] | 17 | struct diff_options diffopt = { NULL }; |
Johannes Schindelin | 2752679 | 2018-08-13 04:33:30 -0700 | [diff] [blame] | 18 | int simple_color = -1; |
Nguyễn Thái Ngọc Duy | c380a48 | 2019-03-24 15:20:12 +0700 | [diff] [blame] | 19 | struct option range_diff_options[] = { |
Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 20 | OPT_INTEGER(0, "creation-factor", &creation_factor, |
| 21 | N_("Percentage by which creation is weighted")), |
Johannes Schindelin | 2752679 | 2018-08-13 04:33:30 -0700 | [diff] [blame] | 22 | OPT_BOOL(0, "no-dual-color", &simple_color, |
Kyle Meyer | 72f47be | 2018-08-23 17:57:48 -0400 | [diff] [blame] | 23 | N_("use simple diff colors")), |
Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 24 | OPT_END() |
| 25 | }; |
Nguyễn Thái Ngọc Duy | c380a48 | 2019-03-24 15:20:12 +0700 | [diff] [blame] | 26 | struct option *options; |
| 27 | int res = 0; |
Johannes Schindelin | d9c66f0 | 2018-08-13 04:33:04 -0700 | [diff] [blame] | 28 | struct strbuf range1 = STRBUF_INIT, range2 = STRBUF_INIT; |
Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 29 | |
Johannes Schindelin | c8c5e43 | 2018-08-13 04:33:07 -0700 | [diff] [blame] | 30 | git_config(git_diff_ui_config, NULL); |
| 31 | |
Nguyễn Thái Ngọc Duy | e675765 | 2018-09-21 17:57:24 +0200 | [diff] [blame] | 32 | repo_diff_setup(the_repository, &diffopt); |
Johannes Schindelin | c8c5e43 | 2018-08-13 04:33:07 -0700 | [diff] [blame] | 33 | |
Nguyễn Thái Ngọc Duy | c380a48 | 2019-03-24 15:20:12 +0700 | [diff] [blame] | 34 | options = parse_options_concat(range_diff_options, diffopt.parseopts); |
Jeff King | d64db5b | 2019-05-09 17:28:51 -0400 | [diff] [blame] | 35 | argc = parse_options(argc, argv, prefix, options, |
Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 36 | builtin_range_diff_usage, 0); |
| 37 | |
Nguyễn Thái Ngọc Duy | c380a48 | 2019-03-24 15:20:12 +0700 | [diff] [blame] | 38 | diff_setup_done(&diffopt); |
| 39 | |
Eric Sunshine | 73a834e | 2018-07-22 05:57:12 -0400 | [diff] [blame] | 40 | /* force color when --dual-color was used */ |
| 41 | if (!simple_color) |
| 42 | diffopt.use_color = 1; |
Johannes Schindelin | 31cf61a | 2018-08-13 04:33:22 -0700 | [diff] [blame] | 43 | |
Johannes Schindelin | d9c66f0 | 2018-08-13 04:33:04 -0700 | [diff] [blame] | 44 | if (argc == 2) { |
| 45 | if (!strstr(argv[0], "..")) |
| 46 | die(_("no .. in range: '%s'"), argv[0]); |
| 47 | strbuf_addstr(&range1, argv[0]); |
| 48 | |
| 49 | if (!strstr(argv[1], "..")) |
| 50 | die(_("no .. in range: '%s'"), argv[1]); |
| 51 | strbuf_addstr(&range2, argv[1]); |
| 52 | } else if (argc == 3) { |
| 53 | strbuf_addf(&range1, "%s..%s", argv[0], argv[1]); |
| 54 | strbuf_addf(&range2, "%s..%s", argv[0], argv[2]); |
| 55 | } else if (argc == 1) { |
| 56 | const char *b = strstr(argv[0], "..."), *a = argv[0]; |
| 57 | int a_len; |
| 58 | |
| 59 | if (!b) { |
| 60 | error(_("single arg format must be symmetric range")); |
| 61 | usage_with_options(builtin_range_diff_usage, options); |
| 62 | } |
| 63 | |
| 64 | a_len = (int)(b - a); |
| 65 | if (!a_len) { |
| 66 | a = "HEAD"; |
| 67 | a_len = strlen(a); |
| 68 | } |
| 69 | b += 3; |
| 70 | if (!*b) |
| 71 | b = "HEAD"; |
| 72 | strbuf_addf(&range1, "%s..%.*s", b, a_len, a); |
| 73 | strbuf_addf(&range2, "%.*s..%s", a_len, a, b); |
| 74 | } else { |
| 75 | error(_("need two commit ranges")); |
| 76 | usage_with_options(builtin_range_diff_usage, options); |
| 77 | } |
Nguyễn Thái Ngọc Duy | c380a48 | 2019-03-24 15:20:12 +0700 | [diff] [blame] | 78 | FREE_AND_NULL(options); |
Johannes Schindelin | d9c66f0 | 2018-08-13 04:33:04 -0700 | [diff] [blame] | 79 | |
Johannes Schindelin | c8c5e43 | 2018-08-13 04:33:07 -0700 | [diff] [blame] | 80 | res = show_range_diff(range1.buf, range2.buf, creation_factor, |
Eric Sunshine | 73a834e | 2018-07-22 05:57:12 -0400 | [diff] [blame] | 81 | simple_color < 1, &diffopt); |
Johannes Schindelin | d9c66f0 | 2018-08-13 04:33:04 -0700 | [diff] [blame] | 82 | |
| 83 | strbuf_release(&range1); |
| 84 | strbuf_release(&range2); |
| 85 | |
| 86 | return res; |
Johannes Schindelin | 348ae56 | 2018-08-13 04:33:02 -0700 | [diff] [blame] | 87 | } |