git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
db22171714426287ee7894a901ecd983a85b2a77 blob 2622 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
105
106
107
 
#include "diff-merges.h"

#include "revision.h"

static void suppress(struct rev_info *revs) {
	revs->separate_merges = 0;
	revs->first_parent_merges = 0;
	revs->combine_merges = 0;
	revs->dense_combined_merges = 0;
	revs->combined_all_paths = 0;
}

static void set_separate(struct rev_info *revs) {
	suppress(revs);
	revs->separate_merges = 1;
}

static void set_m(struct rev_info *revs) {
	/*
	 * To "diff-index", "-m" means "match missing", and to the "log"
	 * family of commands, it means "show full diff for merges". Set
	 * both fields appropriately.
	 */
	set_separate(revs);
	revs->match_missing = 1;
}

static void set_combined(struct rev_info *revs) {
	suppress(revs);
	revs->combine_merges = 1;
	revs->dense_combined_merges = 0;
}

static void set_dense_combined(struct rev_info *revs) {
	suppress(revs);
	revs->combine_merges = 1;
	revs->dense_combined_merges = 1;
}

static void set_diff_merges(struct rev_info *revs, const char *optarg) {
	if (!strcmp(optarg, "off")) {
		suppress(revs);
	} else {
		die(_("unknown value for --diff-merges: %s"), optarg);
	}
}

/*
 * Public functions. They are in the order they are called.
 */

int diff_merges_parse_opts(struct rev_info *revs, const char **argv) {
	int argcount;
	const char *optarg;
	const char *arg = argv[0];

	if (!strcmp(arg, "-m"))
		set_m(revs);
	else if (!strcmp(arg, "-c"))
		set_combined(revs);
	else if (!strcmp(arg, "--cc"))
		set_dense_combined(revs);
	else if (!strcmp(arg, "--no-diff-merges"))
		suppress(revs);
	else if (!strcmp(arg, "--combined-all-paths"))
		revs->combined_all_paths = 1;
	else if ((argcount = parse_long_opt("diff-merges", argv, &optarg)))
		set_diff_merges(revs, optarg);
	else
		return 0;

	revs->explicit_diff_merges = 1;
	return 1;
}

void diff_merges_suppress(struct rev_info *revs) {
	suppress(revs);
}

void diff_merges_default_to_first_parent(struct rev_info *revs) {
	if (!revs->explicit_diff_merges)
		revs->separate_merges = 1;
	if (revs->separate_merges)
		revs->first_parent_merges = 1;
}

void diff_merges_default_to_dense_combined(struct rev_info *revs) {
	if (!revs->explicit_diff_merges)
		set_dense_combined(revs);
}

void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) {
	if (!revs->combine_merges)
		set_dense_combined(revs);
}

void diff_merges_setup_revs(struct rev_info *revs)
{
	if (revs->combine_merges == 0)
		revs->dense_combined_merges = 0;
	if (revs->separate_merges == 0)
		revs->first_parent_merges = 0;
	if (revs->combined_all_paths && !revs->combine_merges)
		die("--combined-all-paths makes no sense without -c or --cc");
	if (revs->combine_merges)
		revs->diff = 1;
}
debug log:

solving db2217171442 ...
found db2217171442 in https://public-inbox.org/git/20201101193330.24775-22-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-22-sorganov@gmail.com/
found 8c22b447f106 in https://public-inbox.org/git/20201101193330.24775-21-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-21-sorganov@gmail.com/
found 29818abcc00e in https://public-inbox.org/git/20201101193330.24775-20-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-20-sorganov@gmail.com/
found 19cdad1aa4a1 in https://public-inbox.org/git/20201101193330.24775-18-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-18-sorganov@gmail.com/
found f2b9ed789ca8 in https://public-inbox.org/git/20201101193330.24775-17-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-17-sorganov@gmail.com/
found a30c730a457f in https://public-inbox.org/git/20201101193330.24775-14-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-14-sorganov@gmail.com/
found 63912ddedc76 in https://public-inbox.org/git/20201101193330.24775-13-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-13-sorganov@gmail.com/
found 691aabadbb32 in https://public-inbox.org/git/20201101193330.24775-12-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-12-sorganov@gmail.com/
found 25bd9b12e667 in https://public-inbox.org/git/20201101193330.24775-11-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-11-sorganov@gmail.com/
found 8536941e0b56 in https://public-inbox.org/git/20201101193330.24775-10-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-10-sorganov@gmail.com/
found bb08a92e3b36 in https://public-inbox.org/git/20201101193330.24775-9-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-9-sorganov@gmail.com/
found 9dd472803d15 in https://public-inbox.org/git/20201101193330.24775-8-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-8-sorganov@gmail.com/
found 85bf0b6d1d1d in https://public-inbox.org/git/20201101193330.24775-7-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-7-sorganov@gmail.com/
found 8b9dd4ad5625 in https://public-inbox.org/git/20201101193330.24775-6-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-6-sorganov@gmail.com/

applying [1/28] https://public-inbox.org/git/20201101193330.24775-6-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
new file mode 100644
index 000000000000..8b9dd4ad5625

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-6-sorganov@gmail.com/ for 8b9dd4ad5625
index at:
100644 8b9dd4ad56256a6111d1e4cee168cbdc5bea2ad0	diff-merges.c

applying [2/28] https://public-inbox.org/git/20201101193330.24775-7-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 8b9dd4ad5625..85bf0b6d1d1d 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-7-sorganov@gmail.com/ for 85bf0b6d1d1d
index at:
100644 85bf0b6d1d1d33f4935b30ccd587ddf5455f5225	diff-merges.c

applying [3/28] https://public-inbox.org/git/20201101193330.24775-8-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 85bf0b6d1d1d..9dd472803d15 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-8-sorganov@gmail.com/ for 9dd472803d15
index at:
100644 9dd472803d15e15dc66d2c74437977d2a28cf012	diff-merges.c

applying [4/28] https://public-inbox.org/git/20201101193330.24775-9-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 9dd472803d15..bb08a92e3b36 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-9-sorganov@gmail.com/ for bb08a92e3b36
index at:
100644 bb08a92e3b366d249a5724540e7eed998fe5bfe6	diff-merges.c

applying [5/28] https://public-inbox.org/git/20201101193330.24775-10-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index bb08a92e3b36..8536941e0b56 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-10-sorganov@gmail.com/ for 8536941e0b56
index at:
100644 8536941e0b56598fa79c5067a8e7a1ab59f00821	diff-merges.c

applying [6/28] https://public-inbox.org/git/20201101193330.24775-11-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 8536941e0b56..25bd9b12e667 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-11-sorganov@gmail.com/ for 25bd9b12e667
index at:
100644 25bd9b12e66751141b87a3f44b104dce2c9155f1	diff-merges.c

applying [7/28] https://public-inbox.org/git/20201101193330.24775-12-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 25bd9b12e667..691aabadbb32 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-12-sorganov@gmail.com/ for 691aabadbb32
index at:
100644 691aabadbb32fddb09eed5362d5addc1e9cc6e2c	diff-merges.c

applying [8/28] https://public-inbox.org/git/20201101193330.24775-13-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 691aabadbb32..63912ddedc76 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-13-sorganov@gmail.com/ for 63912ddedc76
index at:
100644 63912ddedc7691549ed6bef22016ec26ea9009d8	diff-merges.c

applying [9/28] https://public-inbox.org/git/20201101193330.24775-14-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 63912ddedc76..a30c730a457f 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-14-sorganov@gmail.com/ for a30c730a457f
index at:
100644 a30c730a457f3a21a7b0b5b15495e0caa26af2b4	diff-merges.c

applying [10/28] https://public-inbox.org/git/20201101193330.24775-17-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index a30c730a457f..f2b9ed789ca8 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-17-sorganov@gmail.com/ for f2b9ed789ca8
index at:
100644 f2b9ed789ca81a3b2e16a067f25d429f6427ad95	diff-merges.c

applying [11/28] https://public-inbox.org/git/20201101193330.24775-18-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index f2b9ed789ca8..19cdad1aa4a1 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-18-sorganov@gmail.com/ for 19cdad1aa4a1
index at:
100644 19cdad1aa4a13fa5d8addee7936c9d481fb2d2a7	diff-merges.c

applying [12/28] https://public-inbox.org/git/20201101193330.24775-20-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 19cdad1aa4a1..29818abcc00e 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-20-sorganov@gmail.com/ for 29818abcc00e
index at:
100644 29818abcc00e8ef73fe7b13ffde75cc8b227cb44	diff-merges.c

applying [13/28] https://public-inbox.org/git/20201101193330.24775-21-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 29818abcc00e..8c22b447f106 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-21-sorganov@gmail.com/ for 8c22b447f106
index at:
100644 8c22b447f106bd45c0f22006016c667a2cf500e7	diff-merges.c

applying [14/28] https://public-inbox.org/git/20201101193330.24775-22-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 8c22b447f106..db2217171442 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-22-sorganov@gmail.com/ for db2217171442
index at:
100644 db22171714426287ee7894a901ecd983a85b2a77	diff-merges.c

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).