Skip to content

file history does not follow file renames #1879

@extrawurst

Description

@extrawurst
Collaborator

I just renamed CHANGELOG.md to -> CHANGELOG-2.md and this is how the file history of it looks like:

Screenshot 2023-09-06 at 00 09 52

original implementation happened in #381 by @cruessler

Activity

extrawurst

extrawurst commented on Sep 5, 2023

@extrawurst
CollaboratorAuthor

Unfortunately the rename detection happens on a diff level which means if we do the fast log walk with path spec filtering we won’t be able to detect renames. We need to actually benchmark this: maybe we just use the full revwalk and filter out diffs not touching the file in question or something more fancy like starting a new revwalk from the commit that does a rename which we can check if we find the added commit of the file

cruessler

cruessler commented on Sep 6, 2023

@cruessler
Collaborator

@extrawurst Did you check what other tools, namely tig, do in this case? If they follow renames and are still reasonably fast, maybe we can get inspiration from their implementation.

extrawurst

extrawurst commented on Sep 6, 2023

@extrawurst
CollaboratorAuthor

Even git_blame_file follows renames. We can look into that one :)

cruessler

cruessler commented on Sep 6, 2023

@cruessler
Collaborator

That fact significantly increases my hope that there is a simple way of following renames. :-)

extrawurst

extrawurst commented on Sep 6, 2023

@extrawurst
Author
extrawurst

extrawurst commented on Sep 6, 2023

@extrawurst
CollaboratorAuthor

actually it does exactly what I suspected internally:

rev walk starting with current filename:

  1. first a fast path-specced diff to see if we can sort this commit out early
  2. if it touches current, do a full-diff to apply rename-detection
  3. if it is in fact a rename change the current filename and proceed with the revlog

interestingly they do not apply the optimisation that I had in mind: the status of the modification of the file in step 1. can be used to skip 2. if the status is not a file-add because a rename effectively looks like the initial commit of a file (with the new name)

linked a pull request that will close this issue on Sep 6, 2023
added this to the v0.25 milestone on Oct 16, 2023
modified the milestones: v0.25, v0.26 on Feb 19, 2024
extrawurst

extrawurst commented on Mar 27, 2024

@extrawurst
CollaboratorAuthor

@cruessler can you pick this up next? it should really be close to finish the PR

cruessler

cruessler commented on Mar 27, 2024

@cruessler
Collaborator

I’ll have a look!

modified the milestones: v0.26, v0.27 on Apr 14, 2024
modified the milestones: v0.27, v0.28 on Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

enhancementNew feature or request

Type

No type

Projects

No projects

Relationships

None yet

    Development

    Participants

    @extrawurst@cruessler

    Issue actions

      file history does not follow file renames · Issue #1879 · gitui-org/gitui