Skip to content

"log_follow_rename": true setting works properly for show_file_at_commit, checkout_file_at_commit #1750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

"log_follow_rename": true setting works properly for show_file_at_commit, checkout_file_at_commit #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7bc3af4
"log_follow_rename": true works properly for show_file_at_commit, che…
Apr 21, 2023
7b1633e
Respond to PR feedback
Apr 21, 2023
73d778a
Merge branch 'timbrel:master' into master
kylebebak Jul 18, 2023
a0aa397
Merge branch 'master' of github.com:timbrel/GitSavvy
Nov 13, 2023
04983d5
Merge branch 'master' of github.com:timbrel/GitSavvy
Apr 25, 2024
b89aff7
Merge branch 'timbrel:master' into master
kylebebak Jul 25, 2024
ebbc079
Merge branch 'timbrel:master' into master
kylebebak Aug 15, 2024
5ab82df
Merge branch 'timbrel:master' into master
kylebebak Aug 16, 2024
e50cdab
Merge branch 'timbrel:master' into master
kylebebak Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions core/commands/blame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,11 @@ def run(self, edit):

def get_content(self, file_path, ignore_whitespace=False, detect_options=None, commit_hash=None):
if commit_hash and self.savvy_settings.get("blame_follow_rename"):
filename_at_commit = self.filename_at_commit(file_path, commit_hash)
else:
filename_at_commit = file_path
file_path = self.filename_at_commit(file_path, commit_hash)

blame_porcelain = self.git(
"blame", "-p", '-w' if ignore_whitespace else None, detect_options,
commit_hash, "--", filename_at_commit
commit_hash, "--", file_path
)
blame_porcelain = unicodedata.normalize('NFC', blame_porcelain)
blamed_lines, commits = self.parse_blame(blame_porcelain.split('\n'))
Expand Down
10 changes: 9 additions & 1 deletion core/commands/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,5 +290,13 @@ def blame_file_atcommit(self):
})

def checkout_file_at_commit(self):
self.checkout_ref(self._commit_hash, fpath=self._file_path)
commit_hash = self._commit_hash
file_path = self._file_path

if commit_hash and file_path and self.savvy_settings.get("log_follow_rename"):
Copy link
Member

@kaste kaste Apr 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point all three predicates should be True all the time if I'm reading this correctly.

There is also

GitSavvy/core/commands/log_graph.py

Lines 2702 to 2704 in 8afe2de

def checkout_file_at_commit(self, commit_hash, file_path):
self.checkout_ref(commit_hash, fpath=file_path)
util.view.refresh_gitsavvy_interfaces(self.window)
which would need the same patch I think.

Copy link
Author

@kylebebak kylebebak Apr 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean the three expressions in the if statement, if commit_hash and file_path and self.savvy_settings.get("log_follow_rename"):?

Type checker says file_path is Unknown | None in line 254 above, and self.filename_at_commit takes (str, str), so I figured I'd just make sure both were truthy

As for self.savvy_settings.get("log_follow_rename"), that's a user setting that's not guaranteed to be truthy in general, right?

Agreed on making same patch in log_graph.py` module, I'll do that

Copy link
Member

@kaste kaste Apr 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As for self.savvy_settings.get("log_follow_rename"), that's a user setting that's not guaranteed to be truthy in general, right?

Ah right, looks like log_follow_rename can be False still, but self._commit_hash is always truthy here and self._file_path too otherwise the menu item would not appear (see def update_actions(self)).

filename_at_commit = self.filename_at_commit(file_path, commit_hash)
else:
filename_at_commit = file_path

self.checkout_ref(self._commit_hash, fpath=filename_at_commit)
util.view.refresh_gitsavvy_interfaces(self.window, refresh_sidebar=True)
3 changes: 3 additions & 0 deletions core/commands/log_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@
needle in line.hash
or needle == line.decoration
or f" {needle}" in line.decoration
or f"{needle}," in line.decoration

Check failure on line 872 in core/commands/log_graph.py

View workflow job for this annotation

GitHub Actions / lint 

missing whitespace after ','
)

def process_graph(lines):
Expand Down Expand Up @@ -943,7 +943,7 @@

def trunc(text, width):
# type: (str, int) -> str
return f"{text[:width - 2]}.." if len(text) > width else f"{text:{width}}"

Check failure on line 946 in core/commands/log_graph.py

View workflow job for this annotation

GitHub Actions / lint 

missing whitespace after ':'

def resolve_refs_from_the_logs():
# type: () -> Dict[str, str]
Expand Down Expand Up @@ -3240,5 +3240,8 @@
})

def checkout_file_at_commit(self, commit_hash, file_path):
if self.savvy_settings.get("log_follow_rename"):
file_path = self.filename_at_commit(file_path, commit_hash)

self.checkout_ref(commit_hash, fpath=file_path)
util.view.refresh_gitsavvy_interfaces(self.window)
3 changes: 3 additions & 0 deletions core/commands/show_file_at_commit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ def run(self, edit: sublime.Edit, position: Position = None, sync: bool = True)
file_path = settings.get("git_savvy.file_path")
commit_hash = settings.get("git_savvy.show_file_at_commit_view.commit")

if commit_hash and self.savvy_settings.get("log_follow_rename"):
file_path = self.filename_at_commit(file_path, commit_hash)

def program():
text = self.get_file_content_at_commit(file_path, commit_hash)
render(view, text, position)
Expand Down
Loading