From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann Dirson Subject: [PATCH v6 5/5] [WIP] Allow hiding renames of individual files involved in a directory rename. Date: Fri, 15 Oct 2010 01:29:59 +0200 Message-ID: <1287098999-9244-6-git-send-email-ydirson@altern.org> References: <1287098999-9244-1-git-send-email-ydirson@altern.org> <1287098999-9244-2-git-send-email-ydirson@altern.org> <1287098999-9244-3-git-send-email-ydirson@altern.org> <1287098999-9244-4-git-send-email-ydirson@altern.org> <1287098999-9244-5-git-send-email-ydirson@altern.org> Cc: Yann Dirson , Yann Dirson To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Oct 15 01:20:11 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P6X5k-00046c-9p for gcvg-git-2@lo.gmane.org; Fri, 15 Oct 2010 01:20:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756002Ab0JNXTQ (ORCPT ); Thu, 14 Oct 2010 19:19:16 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:40460 "EHLO smtp5-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755015Ab0JNXTO (ORCPT ); Thu, 14 Oct 2010 19:19:14 -0400 Received: from home.lan (unknown [81.57.214.146]) by smtp5-g21.free.fr (Postfix) with ESMTP id CE297D48070; Fri, 15 Oct 2010 01:19:07 +0200 (CEST) Received: from yann by home.lan with local (Exim 4.72) (envelope-from ) id 1P6XFK-0002Q8-3I; Fri, 15 Oct 2010 01:30:02 +0200 X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1287098999-9244-5-git-send-email-ydirson@altern.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Once has identified groups of bulk-moved files, and then the --hide-bulk-move-details flag hides those of the individual renames which carry no other information (further name change, or content changes). This makes it much easier to a human reader to spot content changes in a commit that also moves a whole subtree. Important note: unified diff output is not currently useful, since the "bulk move" headers are not yet added by --detect-bulk-moves, but the redundant renames are really removed. Signed-off-by: Yann Dirson --- diff.c | 7 +++++ diff.h | 3 ++ diffcore-rename.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++-- diffcore.h | 1 + 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 4de43d6..81282bf 100644 --- a/diff.c +++ b/diff.c @@ -3193,6 +3193,13 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) if (!options->detect_rename) options->detect_rename = DIFF_DETECT_RENAME; } + else if (!strcmp(arg, "--hide-bulk-move-details")) { + DIFF_OPT_SET(options, HIDE_DIR_RENAME_DETAILS); + if (!DIFF_OPT_TST(options, DETECT_BULK_MOVES)) + DIFF_OPT_SET(options, DETECT_BULK_MOVES); + if (!options->detect_rename) + options->detect_rename = DIFF_DETECT_RENAME; + } else if (!strcmp(arg, "--follow")) DIFF_OPT_SET(options, FOLLOW_RENAMES); else if (!strcmp(arg, "--color")) diff --git a/diff.h b/diff.h index b0d6fa6..7f132d0 100644 --- a/diff.h +++ b/diff.h @@ -79,6 +79,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26) #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27) #define DIFF_OPT_DETECT_BULK_MOVES (1 << 28) +#define DIFF_OPT_HIDE_DIR_RENAME_DETAILS (1 << 29) #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) @@ -268,6 +269,8 @@ extern void diffcore_fix_diff_index(struct diff_options *); " try unchanged files as candidate for copy detection.\n" \ " --detect-bulk-moves\n" \ " detect wholesale directory renames.\n" \ +" --hide-bulk-move-details\n" \ +" hide renames of individual files in a directory rename.\n" \ " -l limit rename attempts up to paths.\n" \ " -O reorder diffs according to the .\n" \ " -S find filepair whose only one side contains the string.\n" \ diff --git a/diffcore-rename.c b/diffcore-rename.c index ff69201..b419953 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -456,6 +456,34 @@ struct diff_dir_rename { }; /* + * Marks as such file_rename if it is made uninteresting by dir_rename. + * Returns -1 if the file_rename is outside of the range in which given + * renames concerned by dir_rename are to be found (ie. end of loop), + * 0 otherwise. + */ +static int maybe_mark_uninteresting(struct diff_rename_dst* file_rename, + struct diff_dir_rename* dir_rename, + int one_len, int two_len) +{ + if (!file_rename->pair) /* file add */ + return 0; + if (strncmp(file_rename->two->path, + dir_rename->two->path, two_len)) + return -1; + if (strncmp(file_rename->pair->one->path, + dir_rename->one->path, one_len) || + !basename_same(file_rename->pair->one, file_rename->two) || + file_rename->pair->score != MAX_SCORE) + return 0; + + file_rename->pair->uninteresting_rename = 1; + fprintf (stderr, "[DBG] %s* -> %s* makes %s -> %s uninteresting\n", + dir_rename->one->path, dir_rename->two->path, + file_rename->pair->one->path, file_rename->two->path); + return 0; +} + +/* * Copy dirname of src into dst, suitable to append a filename without * an additional "/". * Only handles relative paths since there is no absolute path in a git repo. @@ -670,11 +698,43 @@ static void check_one_bulk_move(struct diff_filepair *dstpair) * Take all file renames recorded so far and check if they could cause * a bulk move to be detected. */ -static void diffcore_bulk_moves(void) +static void diffcore_bulk_moves(int opt_hide_renames) { int i; for (i = 0; i < rename_dst_nr; i++) check_one_bulk_move(rename_dst[i].pair); + + if (opt_hide_renames) { + // flag as "uninteresting" those candidates hidden by dir move + struct diff_dir_rename* candidate; + for (candidate=bulkmove_candidates; + candidate; candidate = candidate->next) { + int two_idx, i, one_len, two_len; + if (candidate->discarded) + continue; + + // bisect to any entry within candidate dst dir + struct diff_rename_dst* two_sample = + locate_rename_dst_dir(candidate->two->path); + if (!two_sample) { + die ("PANIC: %s candidate of rename not in target tree (from %s)\n", + candidate->two->path, candidate->one->path); + } + two_idx = two_sample - rename_dst; + + // now remove extraneous 100% files inside. + one_len = strlen(candidate->one->path); + two_len = strlen(candidate->two->path); + for (i = two_idx; i < rename_dst_nr; i++) + if (maybe_mark_uninteresting (rename_dst+i, candidate, + one_len, two_len) < 0) + break; + for (i = two_idx-1; i >= 0; i--) + if (maybe_mark_uninteresting (rename_dst+i, candidate, + one_len, two_len) < 0) + break; + } + } } void diffcore_rename(struct diff_options *options) @@ -847,7 +907,7 @@ void diffcore_rename(struct diff_options *options) /* Now possibly factorize those renames and copies. */ if (DIFF_OPT_TST(options, DETECT_BULK_MOVES)) - diffcore_bulk_moves(); + diffcore_bulk_moves(DIFF_OPT_TST(options, HIDE_DIR_RENAME_DETAILS)); DIFF_QUEUE_CLEAR(&outq); @@ -881,7 +941,8 @@ void diffcore_rename(struct diff_options *options) struct diff_rename_dst *dst = locate_rename_dst(p->two, 0); if (dst && dst->pair) { - diff_q(&outq, dst->pair); + if (!dst->pair->uninteresting_rename) + diff_q(&outq, dst->pair); pair_to_free = p; } else diff --git a/diffcore.h b/diffcore.h index 6dab95b..a4eb8e1 100644 --- a/diffcore.h +++ b/diffcore.h @@ -69,6 +69,7 @@ struct diff_filepair { unsigned broken_pair : 1; unsigned renamed_pair : 1; unsigned is_unmerged : 1; + unsigned uninteresting_rename : 1; unsigned is_bulkmove : 1; }; #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged) -- 1.7.2.3