Skip to content
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

Jump to bottom

Fix Git history of relocated files #1039

Merged
merged 4 commits into from
Oct 4, 2021
Merged

Fix Git history of relocated files #1039

merged 4 commits into from
Oct 4, 2021

Conversation

navn-r
Copy link
Collaborator

@navn-r navn-r commented Sep 17, 2021 •
edited
Loading

Fixes #1038

  • If the rename commit has two different filenames. Want to display the diff like this for renames:
    image

@github-actions
Copy link

Binder 👈 Launch a binder notebook on branch navn-r/jupyterlab-git/fix/git-history-relocated-file

navn-r
navn-r commented Sep 17, 2021
View reviewed changes
jupyterlab_git/git.py Outdated Show resolved Hide resolved
fcollonval
fcollonval requested changes Sep 21, 2021
View reviewed changes
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks for starting this @navn-r

jupyterlab_git/git.py Outdated Show resolved Hide resolved
jupyterlab_git/git.py Outdated Show resolved Hide resolved
@navn-r navn-r requested a review from fcollonval October 2, 2021 17:07
fcollonval
fcollonval approved these changes Oct 3, 2021
View reviewed changes
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks a lot @navn-r
This looks great.

I have an optional suggestion: it could be nice to update the labels passed to the diff widget to display the file names and only the short hash (7 characters). Something like <filepath> (<short hash>).
This will display clearly the rename.

@navn-r navn-r requested a review from fcollonval October 4, 2021 10:35
@fcollonval
Copy link
Member

Awesome thanks @navn-r

@fcollonval fcollonval merged commit b4590f8 into jupyterlab:master Oct 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcollonval fcollonval fcollonval approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Unable to view full Git History of relocated files
2 participants
@navn-r @fcollonval