From 10ae7526bebb505ddddba01f76ec97d5f7b5e0e5 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 27 Sep 2010 16:58:25 -0700 Subject: merge-recursive: option to specify rename threshold The recursive merge strategy turns on rename detection but leaves the rename threshold at the default. Add a strategy option to allow the user to specify a rename threshold to use. Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 91faba5..77f2606 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -74,6 +74,10 @@ no-renormalize;; Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable. +rename-threshold=;; + Controls the similarity threshold used for rename detection. + See also linkgit:git-diff[1] `-M`. + subtree[=path];; This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to diff --git a/diff.c b/diff.c index 2332fa6..45177db 100644 --- a/diff.c +++ b/diff.c @@ -3219,7 +3219,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) return 1; } -static int parse_num(const char **cp_p) +int parse_rename_score(const char **cp_p) { unsigned long num, scale; int ch, dot; @@ -3265,7 +3265,7 @@ static int diff_scoreopt_parse(const char *opt) if (cmd != 'M' && cmd != 'C' && cmd != 'B') return -1; /* that is not a -M, -C nor -B option */ - opt1 = parse_num(&opt); + opt1 = parse_rename_score(&opt); if (cmd != 'B') opt2 = 0; else { @@ -3275,7 +3275,7 @@ static int diff_scoreopt_parse(const char *opt) return -1; /* we expect -B80/99 or -B80 */ else { opt++; - opt2 = parse_num(&opt); + opt2 = parse_rename_score(&opt); } } if (*opt != 0) diff --git a/diff.h b/diff.h index 063d10a..dbd5096 100644 --- a/diff.h +++ b/diff.h @@ -301,4 +301,6 @@ extern size_t fill_textconv(struct userdiff_driver *driver, extern struct userdiff_driver *get_textconv(struct diff_filespec *one); +extern int parse_rename_score(const char **cp_p); + #endif /* DIFF_H */ diff --git a/merge-recursive.c b/merge-recursive.c index 9b9f97e..148c550 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -339,6 +339,7 @@ static struct string_list *get_renames(struct merge_options *o, opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : o->diff_rename_limit >= 0 ? o->diff_rename_limit : 500; + opts.rename_score = o->rename_score; opts.warn_on_too_large_rename = 1; opts.output_format = DIFF_FORMAT_NO_OUTPUT; if (diff_setup_done(&opts) < 0) @@ -1525,6 +1526,11 @@ int parse_merge_opt(struct merge_options *o, const char *s) o->renormalize = 1; else if (!strcmp(s, "no-renormalize")) o->renormalize = 0; + else if (!prefixcmp(s, "rename-threshold=")) { + const char *score = s + strlen("rename-threshold="); + if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0) + return -1; + } else return -1; return 0; diff --git a/merge-recursive.h b/merge-recursive.h index d21b446..54420f1 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -19,6 +19,7 @@ struct merge_options { int verbosity; int diff_rename_limit; int merge_rename_limit; + int rename_score; int call_depth; struct strbuf obuf; struct string_list current_file_set; -- cgit v0.10.2-6-g49f6 From 37ab5156ae31ec81e3489406f23be6936a2a370c Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Mon, 27 Sep 2010 16:58:26 -0700 Subject: diff: add synonyms for -M, -C, -B Add new long-form options --detect-renames[=], --detect-copies[=], and --break-rewrites[=[][/]] as synonyms for the -M, -C, and -B options (respectively). Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index e745a3c..df37ccd 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -207,9 +207,11 @@ endif::git-format-patch[] digits can be specified with `--abbrev=`. -B:: +--break-rewrites[=[][/]]:: Break complete rewrite changes into pairs of delete and create. -M:: +--detect-renames[=]:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -220,6 +222,7 @@ ifdef::git-log[] endif::git-log[] -C:: +--detect-copies[=]:: Detect copies as well as renames. See also `--find-copies-harder`. ifndef::git-format-patch[] diff --git a/diff.c b/diff.c index 45177db..85a7fb0 100644 --- a/diff.c +++ b/diff.c @@ -3059,16 +3059,19 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) } /* renames options */ - else if (!prefixcmp(arg, "-B")) { + else if (!prefixcmp(arg, "-B") || !prefixcmp(arg, "--break-rewrites=") || + !strcmp(arg, "--break-rewrites")) { if ((options->break_opt = diff_scoreopt_parse(arg)) == -1) return -1; } - else if (!prefixcmp(arg, "-M")) { + else if (!prefixcmp(arg, "-M") || !prefixcmp(arg, "--detect-renames=") || + !strcmp(arg, "--detect-renames")) { if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) return -1; options->detect_rename = DIFF_DETECT_RENAME; } - else if (!prefixcmp(arg, "-C")) { + else if (!prefixcmp(arg, "-C") || !prefixcmp(arg, "--detect-copies=") || + !strcmp(arg, "--detect-copies")) { if (options->detect_rename == DIFF_DETECT_COPY) DIFF_OPT_SET(options, FIND_COPIES_HARDER); if ((options->rename_score = diff_scoreopt_parse(arg)) == -1) @@ -3262,6 +3265,22 @@ static int diff_scoreopt_parse(const char *opt) if (*opt++ != '-') return -1; cmd = *opt++; + if (cmd == '-') { + /* convert the long-form arguments into short-form versions */ + if (!prefixcmp(opt, "break-rewrites")) { + opt += strlen("break-rewrites"); + if (*opt == 0 || *opt++ == '=') + cmd = 'B'; + } else if (!prefixcmp(opt, "detect-copies")) { + opt += strlen("detect-copies"); + if (*opt == 0 || *opt++ == '=') + cmd = 'C'; + } else if (!prefixcmp(opt, "detect-renames")) { + opt += strlen("detect-renames"); + if (*opt == 0 || *opt++ == '=') + cmd = 'M'; + } + } if (cmd != 'M' && cmd != 'C' && cmd != 'B') return -1; /* that is not a -M, -C nor -B option */ -- cgit v0.10.2-6-g49f6