@matheusbsbs / matheus-bagliano / commits / b130c706ec

log: rename "tweak" helpers

The revision walking API allows the callers to tweak its configuration at the last minute, immediately after all the revision and pathspec parameters are parsed from the command line but before the default actions are decided based on them, by defining a "tweak" callback function when calling setup_revisions(). Traditionally, this facility was used by "git show" to turn on the patch output "-p" by default when no diff output option (e.g. "--raw" or "-s" to squelch the output altogether) is given on the command line, and further give dense combined diffs "--cc" for merge commits when no option to countermand it (e.g. "-m" to show pairwise patches). Recently, "git log" started using the same facility, but we named the callback function "default_follow_tweak()", as if the only kind of tweaking we would want for "git log" will forever be limited to turning "--follow" on by default when told by a configuration variable. That was myopic. Rename it to more generic name "log_setup_revisions_tweak()", and match the one used by show "show_setup_revisions_tweak()". Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Aug 20, 2015 at 14:14 UTC b130c706ecfaa370259a476c2b754fb4c4a1a180

1 file changed +6 -5

builtin/log.c

+6 -5

@@ -504,7 +504,8 @@ static int show_tree_object(const unsigned char *sha1,

504 return 0;

505 }

506

507 -static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)

507 +static void show_setup_revisions_tweak(struct rev_info *rev,

508 + struct setup_revision_opt *opt)

509 {

510 if (rev->ignore_merges) {

511 /* There was no "-m" on the command line */

@@ -539,7 +540,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)

540

541 memset(&opt, 0, sizeof(opt));

542 opt.def = "HEAD";

542 - opt.tweak = show_rev_tweak_rev;

543 + opt.tweak = show_setup_revisions_tweak;

544 cmd_log_init(argc, argv, prefix, &rev, &opt);

545

546 if (!rev.no_walk)

@@ -626,8 +627,8 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix)

627 return cmd_log_walk(&rev);

628 }

629

629 -static void default_follow_tweak(struct rev_info *rev,

630 - struct setup_revision_opt *opt)

630 +static void log_setup_revisions_tweak(struct rev_info *rev,

631 + struct setup_revision_opt *opt)

632 {

633 if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) &&

634 rev->prune_data.nr == 1)

@@ -647,7 +648,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)

648 memset(&opt, 0, sizeof(opt));

649 opt.def = "HEAD";

650 opt.revarg_opt = REVARG_COMMITTISH;

650 - opt.tweak = default_follow_tweak;

651 + opt.tweak = log_setup_revisions_tweak;

652 cmd_log_init(argc, argv, prefix, &rev, &opt);

653 return cmd_log_walk(&rev);

654 }