git/diff-merges.c, branch v2.32.2

diff-merges: introduce log.diffMerges config variable

2021-04-17T06:38:35Z

New log.diffMerges configuration variable sets the format that --diff-merges=on will be using. The default is "separate". t4013: add the following tests for log.diffMerges config: * Test that wrong values are denied. * Test that the value of log.diffMerges properly affects both --diff-merges=on and -m. t9902: fix completion tests for log.d* to match log.diffMerges. Added documentation for log.diffMerges. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: adapt -m to enable default diff format

2021-04-17T06:38:35Z

Let -m option (and --diff-merges=m) enable the default format instead of "separate", to be able to tune it with log.diffMerges option. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: refactor set_diff_merges()

2021-04-17T06:38:35Z

Split set_diff_merges() into separate parsing and execution functions, the former to be reused for parsing of configuration values later in the patch series. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: introduce --diff-merges=on

2021-04-17T06:38:35Z

Introduce the notion of default diff format for merges, and the option "on" to select it. The default format is "separate" and can't yet be changed, so effectively "on" is just a synonym for "separate" for now. Add corresponding test to t4013. This is in preparation for introducing log.diffMerges configuration option that will let --diff-merges=on to be configured to any supported format. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: add '--diff-merges=1' as synonym for 'first-parent'

2020-12-21T21:47:32Z

As we now have --diff-merges={m|c|cc}, add --diff-merges=1 as synonym for --diff-merges=first-parent, to have shorter mnemonics for it as well. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: add old mnemonic counterparts to --diff-merges

2020-12-21T21:47:32Z

This adds --diff-merges={m|c|cc} values that match mnemonics of old options, for those who are used to them. Note that, say, --diff-meres=cc behaves differently than --cc, as the latter implies -p and therefore enables diffs for all the commits, while the former enables output of diffs for merge commits only. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: let new options enable diff without -p

2020-12-21T21:47:32Z

New options don't have any visible effect unless -p is either given or implied, as unlike -c/-cc we don't imply -p with --diff-merges. To fix this, this patch adds new functionality by letting new options enable output of diffs for merge commits only. Add 'merges_need_diff' field and set it whenever diff output for merges is enabled by any of the new options. Extend diff output logic accordingly, to output diffs for merges when 'merges_need_diff' is set even when no -p has been provided. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: do not imply -p for new options

2020-12-21T21:47:32Z

Add 'combined_imply_patch' field and set it only for old --cc/-c options, then imply -p if this flag is set instead of implying -p whenever 'combined_merge' flag is set. We don't want new --diff-merge options to imply -p, to make it possible to enable output of diffs for merges independently from non-merge commits. At the same time we want to preserve behavior of old --c/-c/-m options and their interactions with --first-parent, to stay backward-compatible. This patch is first step in this direction: it separates old "--cc/-c imply -p" logic from the rest of the options. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: implement new values for --diff-merges

2020-12-21T21:47:32Z

We first implement new options as exact synonyms for their original counterparts, to get all the infrastructure right, and keep functional improvements for later commits. The following values are implemented: --diff-merges= old equivalent first|first-parent = --first-parent (only format implications) sep|separate = -m comb|combined = -c dense| dense-combined = --cc Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: make -m/-c/--cc explicitly mutually exclusive

2020-12-21T21:47:31Z

-c/--cc got precedence over -m only because of external logic where corresponding flags are checked before that for -m. This is too error-prone, so add code that explicitly makes these 3 options mutually exclusive, so that the last option specified on the command-line gets precedence. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano