From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Derrick Stolee <dstolee@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Taylor Blau <me@ttaylorr.com>, Jeff King <peff@peff.net>,
Elijah Newren <newren@gmail.com>,
Derrick Stolee <stolee@gmail.com>
Subject: Re: [PATCH v3 5/5] gitdiffcore doc: mention new preliminary step for rename detection
Date: Wed, 10 Feb 2021 08:41:18 -0800 [thread overview]
Message-ID: <xmqqtuqj3mfl.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <fc72d24a3358b1c5cc2753b5f07ac60174e6452b.1612970140.git.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Wed, 10 Feb 2021 15:15:40 +0000")
"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Elijah Newren <newren@gmail.com>
>
> The last few patches have introduced a new preliminary step when rename
> detection is on but both break detection and copy detection are off.
> Document this new step. While we're at it, add a testcase that checks
> the new behavior as well.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> Documentation/gitdiffcore.txt | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
> index c970d9fe438a..36ebe364d874 100644
> --- a/Documentation/gitdiffcore.txt
> +++ b/Documentation/gitdiffcore.txt
> @@ -168,6 +168,23 @@ a similarity score different from the default of 50% by giving a
> number after the "-M" or "-C" option (e.g. "-M8" to tell it to use
> 8/10 = 80%).
>
> +Note that when rename detection is on but both copy and break
> +detection are off, rename detection adds a preliminary step that first
> +checks if files are moved across directories while keeping their
> +filename the same. If there is a file added to a directory whose
> +contents is sufficiently similar to a file with the same name that got
> +deleted from a different directory, it will mark them as renames and
> +exclude them from the later quadratic step (the one that pairwise
> +compares all unmatched files to find the "best" matches, determined by
> +the highest content similarity). So, for example, if
> +docs/extensions.txt and docs/config/extensions.txt have similar
> +content, then they will be marked as a rename even if it turns out
> +that docs/extensions.txt was more similar to src/extension-checks.c.
I'd rather use docs/extensions.md instead of src/extension-checks.c;
it would be more realistic for .md to be similar to .txt than .c.
With a raised bar for this step, the equation changes a bit, no?
So, for example, if a deleted docs/ext.txt and an added
docs/config/ext.txt are similar enough, they will be marked as a
rename and prevent an added docs/ext.md that may be even similar
to the deleted docs/ext.txt from being considered as the rename
destination in the later step. For this reason, the preliminary
"match same filename" step uses a bit higher threshold to mark a
file pair as a rename and stop considering other candidates for
better matches.
or something?
> +At most, one comparison is done per file in this preliminary pass; so
> +if there are several extensions.txt files throughout the directory
> +hierarchy that were added and deleted, this preliminary step will be
> +skipped for those files.
Other than that, the whole series looked sensible to my cursory
read.
Thanks.
next prev parent reply other threads:[~2021-02-10 16:43 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 22:52 [PATCH 0/3] Optimization batch 7: use file basenames to guide rename detection Elijah Newren via GitGitGadget
2021-02-06 22:52 ` [PATCH 1/3] diffcore-rename: compute basenames of all source and dest candidates Elijah Newren via GitGitGadget
2021-02-06 22:52 ` [PATCH 2/3] diffcore-rename: complete find_basename_matches() Elijah Newren via GitGitGadget
2021-02-06 22:52 ` [PATCH 3/3] diffcore-rename: guide inexact rename detection based on basenames Elijah Newren via GitGitGadget
2021-02-07 14:38 ` Derrick Stolee
2021-02-07 19:51 ` Junio C Hamano
2021-02-08 8:38 ` Elijah Newren
2021-02-08 11:43 ` Derrick Stolee
2021-02-08 16:25 ` Elijah Newren
2021-02-08 17:37 ` Junio C Hamano
2021-02-08 22:00 ` Elijah Newren
2021-02-08 23:43 ` Junio C Hamano
2021-02-08 23:52 ` Elijah Newren
2021-02-08 8:27 ` Elijah Newren
2021-02-08 11:31 ` Derrick Stolee
2021-02-08 16:09 ` Elijah Newren
2021-02-07 5:19 ` [PATCH 0/3] Optimization batch 7: use file basenames to guide rename detection Junio C Hamano
2021-02-07 6:05 ` Elijah Newren
2021-02-09 11:32 ` [PATCH v2 0/4] " Elijah Newren via GitGitGadget
2021-02-09 11:32 ` [PATCH v2 1/4] diffcore-rename: compute basenames of all source and dest candidates Elijah Newren via GitGitGadget
2021-02-09 13:17 ` Derrick Stolee
2021-02-09 16:56 ` Elijah Newren
2021-02-09 17:02 ` Derrick Stolee
2021-02-09 17:42 ` Elijah Newren
2021-02-09 11:32 ` [PATCH v2 2/4] diffcore-rename: complete find_basename_matches() Elijah Newren via GitGitGadget
2021-02-09 13:25 ` Derrick Stolee
2021-02-09 17:17 ` Elijah Newren
2021-02-09 17:34 ` Derrick Stolee
2021-02-09 11:32 ` [PATCH v2 3/4] diffcore-rename: guide inexact rename detection based on basenames Elijah Newren via GitGitGadget
2021-02-09 13:33 ` Derrick Stolee
2021-02-09 17:41 ` Elijah Newren
2021-02-09 18:59 ` Junio C Hamano
2021-02-09 11:32 ` [PATCH v2 4/4] gitdiffcore doc: mention new preliminary step for rename detection Elijah Newren via GitGitGadget
2021-02-09 12:59 ` Derrick Stolee
2021-02-09 17:03 ` Junio C Hamano
2021-02-09 17:44 ` Elijah Newren
2021-02-10 15:15 ` [PATCH v3 0/5] Optimization batch 7: use file basenames to guide " Elijah Newren via GitGitGadget
2021-02-10 15:15 ` [PATCH v3 1/5] t4001: add a test comparing basename similarity and content similarity Elijah Newren via GitGitGadget
2021-02-13 1:15 ` Junio C Hamano
2021-02-13 4:50 ` Elijah Newren
2021-02-13 23:56 ` Junio C Hamano
2021-02-14 1:24 ` Elijah Newren
2021-02-14 1:32 ` Junio C Hamano
2021-02-14 3:14 ` Elijah Newren
2021-02-10 15:15 ` [PATCH v3 2/5] diffcore-rename: compute basenames of all source and dest candidates Elijah Newren via GitGitGadget
2021-02-13 1:32 ` Junio C Hamano
2021-02-10 15:15 ` [PATCH v3 3/5] diffcore-rename: complete find_basename_matches() Elijah Newren via GitGitGadget
2021-02-13 1:48 ` Junio C Hamano
2021-02-13 18:34 ` Elijah Newren
2021-02-13 23:55 ` Junio C Hamano
2021-02-14 3:08 ` Elijah Newren
2021-02-10 15:15 ` [PATCH v3 4/5] diffcore-rename: guide inexact rename detection based on basenames Elijah Newren via GitGitGadget
2021-02-13 1:49 ` Junio C Hamano
2021-02-10 15:15 ` [PATCH v3 5/5] gitdiffcore doc: mention new preliminary step for rename detection Elijah Newren via GitGitGadget
2021-02-10 16:41 ` Junio C Hamano [this message]
2021-02-10 17:20 ` Elijah Newren
2021-02-11 8:15 ` [PATCH v4 0/6] Optimization batch 7: use file basenames to guide " Elijah Newren via GitGitGadget
2021-02-11 8:15 ` [PATCH v4 1/6] t4001: add a test comparing basename similarity and content similarity Elijah Newren via GitGitGadget
2021-02-11 8:15 ` [PATCH v4 2/6] diffcore-rename: compute basenames of all source and dest candidates Elijah Newren via GitGitGadget
2021-02-11 8:15 ` [PATCH v4 3/6] diffcore-rename: complete find_basename_matches() Elijah Newren via GitGitGadget
2021-02-11 8:15 ` [PATCH v4 4/6] diffcore-rename: guide inexact rename detection based on basenames Elijah Newren via GitGitGadget
2021-02-11 8:15 ` [PATCH v4 5/6] gitdiffcore doc: mention new preliminary step for rename detection Elijah Newren via GitGitGadget
2021-02-11 8:15 ` [PATCH v4 6/6] merge-ort: call diffcore_rename() directly Elijah Newren via GitGitGadget
2021-02-13 1:53 ` [PATCH v4 0/6] Optimization batch 7: use file basenames to guide rename detection Junio C Hamano
2021-02-14 7:51 ` [PATCH v5 " Elijah Newren via GitGitGadget
2021-02-14 7:51 ` [PATCH v5 1/6] t4001: add a test comparing basename similarity and content similarity Elijah Newren via GitGitGadget
2021-02-14 7:51 ` [PATCH v5 2/6] diffcore-rename: compute basenames of source and dest candidates Elijah Newren via GitGitGadget
2021-02-14 7:51 ` [PATCH v5 3/6] diffcore-rename: complete find_basename_matches() Elijah Newren via GitGitGadget
2021-02-14 7:51 ` [PATCH v5 4/6] diffcore-rename: guide inexact rename detection based on basenames Elijah Newren via GitGitGadget
2021-02-14 7:51 ` [PATCH v5 5/6] gitdiffcore doc: mention new preliminary step for rename detection Elijah Newren via GitGitGadget
2021-02-14 7:51 ` [PATCH v5 6/6] merge-ort: call diffcore_rename() directly Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtuqj3mfl.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).