git/diff-merges.h, branch jch

diff-index: restore -c/--cc options handling

2021-09-07T18:11:35Z

This fixes 19b2517f (diff-merges: move specific diff-index "-m" handling to diff-index, 2021-05-21). That commit disabled handling of all diff for merges options in diff-index on an assumption that they are unused. However, it later appeared that -c and --cc, even though undocumented and not being covered by tests, happen to have had particular effect on diff-index output. Restore original -c/--cc options handling by diff-index. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: move specific diff-index "-m" handling to diff-index

2021-05-21T00:24:14Z

Move specific handling of "-m" for diff-index to diff-index.c, so diff-merges is left to handle only diff for merges options. Being a better design by itself, this is especially essential in preparation for letting -m imply -p, as "diff-index -m" obviously should not imply -p, as it's entirely unrelated. To handle this, in addition to moving specific diff-index "-m" code out of diff-merges, we introduce new diff_merges_suppress_options_parsing() and call it before generic options processing in cmd_diff_index(). This new diff_merges_suppress_options_parsing() could then be reused and called before invocations of setup_revisions() for other commands that don't need --diff-merges options, but that's outside of the scope of these patch series. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

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: get rid of now empty diff_merges_init_revs()

2020-12-21T21:47:31Z

After getting rid of 'ignore_merges' field, the diff_merges_init_revs() function became empty. Get rid of it. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: new function diff_merges_set_dense_combined_if_unset()

2020-12-21T21:47:31Z

Call it where given functionality is needed instead of direct checking/tweaking of diff merges related fields. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: new function diff_merges_suppress()

2020-12-21T21:47:31Z

This function sets all the relevant flags to disabled state, so that no code that checks only one of them get it wrong. Then we call this new function everywhere where diff merges output suppression is needed. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: re-arrange functions to match the order they are called in

2020-12-21T21:47:31Z

For clarity, define public functions in the order they are called, to make logic inter-dependencies easier to grok. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: rename diff_merges_default_to_enable() to match semantics

2020-12-21T21:47:31Z

Rename diff_merges_default_to_enable() to diff_merges_default_to_first_parent() to match its semantics. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: move checks for first_parent_only out of the module

2020-12-21T21:47:30Z

The checks for first_parent_only don't in fact belong to this module, as the primary purpose of this flag is history traversal limiting, so get it out of this module and rename the diff_merges_first_parent_defaults_to_enable() to diff_merges_default_to_enable() to match new semantics. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano

diff-merges: rename all functions to have common prefix

2020-12-21T21:47:30Z

Use the same "diff_merges" prefix for all the diff merges function names. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano