Hi Eric, On Wed, 30 May 2018, Eric Sunshine wrote:
> When generating a range-diff, matching up commits between two version of > a patch series involves heuristics, thus may give unexpected results. > git-branch-diff allows tweaking the heuristic via --creation-weight. > Follow suit by accepting --creation-weight in combination with > --range-diff when generating a range-diff for a cover-letter. Since I opted to change this to `--creation-factor`, taking an integer between 0 and 100 (essentially), this patch will need heavy adjustment ;-=) Thanks, Dscho > Signed-off-by: Eric Sunshine <[email protected]> > --- > Documentation/git-format-patch.txt | 8 +++++++- > builtin/log.c | 19 +++++++++++++++---- > 2 files changed, 22 insertions(+), 5 deletions(-) > > diff --git a/Documentation/git-format-patch.txt > b/Documentation/git-format-patch.txt > index 25026ae26e..7ed9ec9dae 100644 > --- a/Documentation/git-format-patch.txt > +++ b/Documentation/git-format-patch.txt > @@ -23,7 +23,7 @@ SYNOPSIS > [(--reroll-count|-v) <n>] > [--to=<email>] [--cc=<email>] > [--[no-]cover-letter] [--quiet] [--notes[=<ref>]] > - [--range-diff=<previous>] > + [--range-diff=<previous> [--creation-weight=<factor>]] > [--progress] > [<common diff options>] > [ <since> | <revision range> ] > @@ -240,6 +240,12 @@ feeding the result to `git send-email`. > disjoint (for example `git format-patch --cover-letter > --range-diff=feature/v1~3..feature/v1 -3 feature/v2`). > > +--creation-weight=<factor>:: > + Used with `--range-diff`, tweak the heuristic which matches up commits > + between the previous and current series of patches by adjusting the > + creation/deletion cost fudge factor. See linkgit:git-branch-diff[1]) > + for details. > + > --notes[=<ref>]:: > Append the notes (see linkgit:git-notes[1]) for the commit > after the three-dash line. > diff --git a/builtin/log.c b/builtin/log.c > index 3089d3a50a..2c49011b51 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -1012,12 +1012,16 @@ static void infer_diff_ranges(struct argv_array *args, > } > > static int get_range_diff(struct strbuf *sb, > - const struct argv_array *ranges) > + const struct argv_array *ranges, > + const char *creation_weight) > { > struct child_process cp = CHILD_PROCESS_INIT; > > cp.git_cmd = 1; > argv_array_pushl(&cp.args, "branch-diff", "--no-color", NULL); > + if (creation_weight) > + argv_array_pushf(&cp.args, > + "--creation-weight=%s", creation_weight); > argv_array_pushv(&cp.args, ranges->argv); > return capture_command(&cp, sb, 0); > } > @@ -1047,7 +1051,8 @@ static void make_cover_letter(struct rev_info *rev, int > use_stdout, > int nr, struct commit **list, > const char *branch_name, > int quiet, > - const char *range_diff) > + const char *range_diff, > + const char *creation_weight) > { > const char *committer; > const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; > @@ -1070,7 +1075,7 @@ static void make_cover_letter(struct rev_info *rev, int > use_stdout, > if (range_diff) { > struct argv_array ranges = ARGV_ARRAY_INIT; > infer_diff_ranges(&ranges, range_diff, origin, head); > - if (get_range_diff(&diff, &ranges)) > + if (get_range_diff(&diff, &ranges, creation_weight)) > die(_("failed to generate range-diff")); > argv_array_clear(&ranges); > } > @@ -1495,6 +1500,7 @@ int cmd_format_patch(int argc, const char **argv, const > char *prefix) > int show_progress = 0; > struct progress *progress = NULL; > const char *range_diff = NULL; > + const char *creation_weight = NULL; > > const struct option builtin_format_patch_options[] = { > { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL, > @@ -1570,6 +1576,8 @@ int cmd_format_patch(int argc, const char **argv, const > char *prefix) > N_("show progress while generating patches")), > OPT_STRING(0, "range-diff", &range_diff, N_("rev-range"), > N_("show changes against <rev-range> in cover > letter")), > + OPT_STRING(0, "creation-weight", &creation_weight, N_("factor"), > + N_("fudge factor by which creation is weighted")), > OPT_END() > }; > > @@ -1664,6 +1672,9 @@ int cmd_format_patch(int argc, const char **argv, const > char *prefix) > die (_("--subject-prefix/--rfc and -k are mutually > exclusive.")); > rev.preserve_subject = keep_subject; > > + if (creation_weight && !range_diff) > + die(_("--creation-weight requires --range-diff")); > + > argc = setup_revisions(argc, argv, &rev, &s_r_opt); > if (argc > 1) > die (_("unrecognized argument: %s"), argv[1]); > @@ -1827,7 +1838,7 @@ int cmd_format_patch(int argc, const char **argv, const > char *prefix) > gen_message_id(&rev, "cover"); > make_cover_letter(&rev, use_stdout, > origin, nr, list, branch_name, quiet, > - range_diff); > + range_diff, creation_weight); > print_bases(&bases, rev.diffopt.file); > print_signature(rev.diffopt.file); > total++; > -- > 2.17.1.1235.ge295dfb56e > >
