git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
6cee0c73a6e43f23e156b155b150fd40d8c895f1 blob 2779 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
 
#include "cache.h"
#include "builtin.h"
#include "parse-options.h"
#include "range-diff.h"
#include "config.h"

static const char * const builtin_range_diff_usage[] = {
N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
N_("git range-diff [<options>] <old-tip>...<new-tip>"),
N_("git range-diff [<options>] <base> <old-tip> <new-tip>"),
NULL
};

static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
{
	return data;
}

int cmd_range_diff(int argc, const char **argv, const char *prefix)
{
	int creation_factor = 60;
	struct diff_options diffopt = { NULL };
	int simple_color = -1;
	struct option options[] = {
		OPT_INTEGER(0, "creation-factor", &creation_factor,
			    N_("Percentage by which creation is weighted")),
		OPT_BOOL(0, "no-dual-color", &simple_color,
			    N_("color both diff and diff-between-diffs")),
		OPT_END()
	};
	int i, j, res = 0;
	struct strbuf four_spaces = STRBUF_INIT;
	struct strbuf range1 = STRBUF_INIT, range2 = STRBUF_INIT;

	git_config(git_diff_ui_config, NULL);

	diff_setup(&diffopt);
	diffopt.output_format = DIFF_FORMAT_PATCH;
	diffopt.flags.suppress_diff_headers = 1;
	diffopt.output_prefix = output_prefix_cb;
	strbuf_addstr(&four_spaces, "    ");
	diffopt.output_prefix_data = &four_spaces;

	argc = parse_options(argc, argv, NULL, options,
			builtin_range_diff_usage, PARSE_OPT_KEEP_UNKNOWN);

	for (i = j = 0; i < argc; i++) {
		int c = diff_opt_parse(&diffopt, argv + i, argc - i, prefix);

		if (!c)
			argv[j++] = argv[i];
	}
	argc = j;
	diff_setup_done(&diffopt);

	if (simple_color < 1) {
		if (!simple_color)
			/* force color when --dual-color was used */
			diffopt.use_color = 1;
		diffopt.flags.dual_color_diffed_diffs = 1;
	}

	if (argc == 2) {
		if (!strstr(argv[0], ".."))
			warning(_("no .. in range: '%s'"), argv[0]);
		strbuf_addstr(&range1, argv[0]);

		if (!strstr(argv[1], ".."))
			warning(_("no .. in range: '%s'"), argv[1]);
		strbuf_addstr(&range2, argv[1]);
	} else if (argc == 3) {
		strbuf_addf(&range1, "%s..%s", argv[0], argv[1]);
		strbuf_addf(&range2, "%s..%s", argv[0], argv[2]);
	} else if (argc == 1) {
		const char *b = strstr(argv[0], "..."), *a = argv[0];
		int a_len;

		if (!b)
			die(_("single arg format requires a symmetric range"));

		a_len = (int)(b - a);
		if (!a_len) {
			a = "HEAD";
			a_len = strlen(a);
		}
		b += 3;
		if (!*b)
			b = "HEAD";
		strbuf_addf(&range1, "%s..%.*s", b, a_len, a);
		strbuf_addf(&range2, "%.*s..%s", a_len, a, b);
	} else {
		error(_("need two commit ranges"));
		usage_with_options(builtin_range_diff_usage, options);
	}

	res = show_range_diff(range1.buf, range2.buf, creation_factor,
			      &diffopt);

	strbuf_release(&range1);
	strbuf_release(&range2);
	strbuf_release(&four_spaces);

	return res;
}
debug log:

solving 6cee0c73a ...
found 6cee0c73a in https://public-inbox.org/git/4a68b95ce2a6463708c92d1bcc0208352c14f836.1530617166.git.gitgitgadget@gmail.com/
found e8f7fe452 in https://public-inbox.org/git/02e13c0c6836bb0d16e0241df5ae8907b6fb4c4d.1530617166.git.gitgitgadget@gmail.com/
found 7c0967220 in https://public-inbox.org/git/80622685f9bcc81bb93ad60d27b05c2d6c031e4b.1530617166.git.gitgitgadget@gmail.com/
found 660e1f961 in https://public-inbox.org/git/ca5282815fa3f733c298dd412a61a585e441f278.1530617166.git.gitgitgadget@gmail.com/
found 5f12bbfa9 in https://public-inbox.org/git/935cad180184787301975f18f56add409aa445f5.1530617166.git.gitgitgadget@gmail.com/
found c37a72100 in https://public-inbox.org/git/076e1192d15562d868a8a6014f36155f360da83d.1530617166.git.gitgitgadget@gmail.com/
found 36788ea4f in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100644 36788ea4f2b7a71e7714ff7345e03aff522a3aeb	builtin/range-diff.c

applying [1/6] https://public-inbox.org/git/076e1192d15562d868a8a6014f36155f360da83d.1530617166.git.gitgitgadget@gmail.com/
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 36788ea4f..c37a72100 100644


applying [2/6] https://public-inbox.org/git/935cad180184787301975f18f56add409aa445f5.1530617166.git.gitgitgadget@gmail.com/
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index c37a72100..5f12bbfa9 100644


applying [3/6] https://public-inbox.org/git/ca5282815fa3f733c298dd412a61a585e441f278.1530617166.git.gitgitgadget@gmail.com/
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 5f12bbfa9..660e1f961 100644


applying [4/6] https://public-inbox.org/git/80622685f9bcc81bb93ad60d27b05c2d6c031e4b.1530617166.git.gitgitgadget@gmail.com/
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 660e1f961..7c0967220 100644


applying [5/6] https://public-inbox.org/git/02e13c0c6836bb0d16e0241df5ae8907b6fb4c4d.1530617166.git.gitgitgadget@gmail.com/
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 7c0967220..e8f7fe452 100644


applying [6/6] https://public-inbox.org/git/4a68b95ce2a6463708c92d1bcc0208352c14f836.1530617166.git.gitgitgadget@gmail.com/
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index e8f7fe452..6cee0c73a 100644

Checking patch builtin/range-diff.c...
Applied patch builtin/range-diff.c cleanly.
Checking patch builtin/range-diff.c...
Applied patch builtin/range-diff.c cleanly.
Checking patch builtin/range-diff.c...
Applied patch builtin/range-diff.c cleanly.
Checking patch builtin/range-diff.c...
Applied patch builtin/range-diff.c cleanly.
Checking patch builtin/range-diff.c...
Applied patch builtin/range-diff.c cleanly.
Checking patch builtin/range-diff.c...
Applied patch builtin/range-diff.c cleanly.

index at:
100644 6cee0c73a6e43f23e156b155b150fd40d8c895f1	builtin/range-diff.c

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox