Skip to content

Add popup for file history - #841

Merged
extrawurst merged 20 commits into
gitui-org:masterfrom
cruessler:add-file-history
Jan 30, 2022
Merged

Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom
cruessler:add-file-history

Conversation

@cruessler

@cruesslercruessler commented Aug 15, 2021

Copy link
Copy Markdown
Collaborator

This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.

There are a few issues that would need to be resolved before this can be considered ready:

  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?

Looking forward to your feedback!

@extrawurstextrawurst linked an issue Aug 15, 2021 that may be closed by this pull request
View log/history of a file #381
Closed
@extrawurst

extrawurst commented Aug 15, 2021•
edited
Loading

Copy link
Copy Markdown
Collaborator

Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!

Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.
Here is my list of topics I think we should tackle before merging as a MVP:

  • allowing to open the history of a file from the repo file tree view (tab 3)
  • scrollbar in the history view

In terms of post-MVP steps I find these two most important:

  • support the details side panel you mentioned above
  • use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)

@cruessler

cruessler commented Aug 28, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!

I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.

Let me know what you think!

@extrawurst

extrawurst commented Aug 28, 2021

Copy link
Copy Markdown
Collaborator

@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)

sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(

I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.

no problem at all, we all do this in our spare time ❤️

I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.

Let me know what you think!

looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?

@extrawurst

extrawurst commented Aug 28, 2021•
edited
Loading

Copy link
Copy Markdown
Collaborator

@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)

even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:

  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)

little mockup
Screenshot 2021-08-28 at 14 28 58

@cruessler

cruessler commented Aug 29, 2021

Copy link
Copy Markdown
CollaboratorAuthor

Having a specialized list that shows additional information makes sense to me. I'll see what I can do!

@extrawurst

extrawurst commented Oct 6, 2021

Copy link
Copy Markdown
Collaborator

@cruessler are you still on this?

@cruessler

cruessler commented Oct 6, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst Yes, I was planning on working on it this weekend!

@cruessler

cruessler commented Oct 10, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.

@cruessler

cruessler commented Oct 25, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.

@extrawurst

extrawurst commented Oct 26, 2021

Copy link
Copy Markdown
Collaborator

@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.

That starts to look really cool already though! Thanks for holding on here ❤️

@ajschmidt8

ajschmidt8 commented Nov 2, 2021

Copy link
Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst

@cruessler

cruessler commented Nov 29, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?

@extrawurst

extrawurst commented Nov 29, 2021

Copy link
Copy Markdown
Collaborator

@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.

What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.

FileLogJob will then only expose LogEntries we also have the marker for.

@extrawurst

extrawurst commented Dec 25, 2021

Copy link
Copy Markdown
Collaborator

@cruessler Merry Christmas 🎄
any updates ? :)

@cruessler

cruessler commented Dec 26, 2021

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀

@cruessler
cruesslerforce-pushed the add-file-history branch 2 times, most recently from fc21f4b to 24892bbCompareDecember 29, 2021 16:23
@extrawurst

extrawurst commented Jan 10, 2022

Copy link
Copy Markdown
Collaborator

@cruessler cool progress!!

Screenshot 2022-01-10 at 01 31 15

@extrawurst

extrawurst commented Jan 10, 2022

Copy link
Copy Markdown
Collaborator

@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?

  • diff side-by-side
  • scrollbar
  • page-up/down support

@extrawurst

extrawurst commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

@cruessler ping? 🥺

@cruessler

cruessler commented Jan 30, 2022

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)

@cruessler
cruessler marked this pull request as ready for review January 30, 2022 13:57
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs Outdated
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs Outdated
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs Outdated
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs Outdated
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs Outdated
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs Outdated
extrawurst
extrawurst reviewed Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs Outdated
@extrawurst

extrawurst commented Jan 30, 2022•
edited
Loading

Copy link
Copy Markdown
Collaborator

@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this

edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why

@cruessler

cruessler commented Jan 30, 2022

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)

I found the reason for the file contents not being shown and pushed an additional commit.

@extrawurst
extrawurst merged commit b622cee into gitui-org:masterJan 30, 2022
@extrawurst

extrawurst commented Jan 30, 2022

Copy link
Copy Markdown
Collaborator

@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳

@extrawurstextrawurst mentioned this pull request Jan 30, 2022
Closed
@cruessler

cruessler commented Jan 30, 2022

Copy link
Copy Markdown
CollaboratorAuthor

@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!

@cruessler
cruessler deleted the add-file-history branch January 30, 2022 18:49
@extrawurstextrawurst mentioned this pull request Jan 30, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

View log/history of a file

3 participants

@cruessler@extrawurst@ajschmidt8
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add popup for file history by cruessler · Pull Request #841 · gitui-org/gitui · GitHub
Skip to content
Add popup for file history - #841
Merged
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Jan 30, 2022
Merged
Add popup for file history#841
extrawurst merged 20 commits into
gitui-org:masterfrom 
cruessler:add-file-history
Conversation
@cruessler
@cruesslercruessler
commented
Aug 15, 2021

Copy link


Copy Markdown

Collaborator
This adds a popup for showing the history of a single file. The PR is already in a state that should give you an idea of how the final version could look like.
There are a few issues that would need to be resolved before this can be considered ready:
  • Gathering the commit history is very slow, compared to running git log -- <path> on the command line. I will investigate and have a look at how git as well as tig do things to get an idea of how to speed things up.
  • I will manually test the new popup to make sure the history matches git log (I already have one minor discrepancy on my list).
  • commands does not return navigation commands for self.list yet.
  • When I had the commit almost prepared, I noticed that the “Log” tab shows commit details on Enter, to the right of the log. Do we want that same behaviour here?
Looking forward to your feedback!
@extrawurstextrawurst
linked an issue
Aug 15, 2021
that may be
closed
by this pull request


View log/history of a file
#381

Closed

@extrawurst
extrawurst
commented
Aug 15, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
Hi @cruessler - first of all, thanks for tackling this! The time you put into this is very appreciated!
Functionally I did not see a specific case where the history was wrong, but I did not test that very throughly yet.

Here is my list of topics I think we should tackle before merging as a MVP:
  •  allowing to open the history of a file from the repo file tree view (tab 3)
  •  scrollbar in the history view
In terms of post-MVP steps I find these two most important:
  •  support the details side panel you mentioned above
  •  use the revlog progress notifications to show a progress indicator (in percent, not in commits like in the log)
@cruessler
cruessler
commented
Aug 28, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-) I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer. Your comments are very much appreciated, though!
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
@extrawurst
extrawurst
commented
Aug 28, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst That took longer than expected, not least due to the fact that hard tabs were introduced to the codebase. :-)
sorry for that. but rustfmt can only enforce hard tabs and not the other way around :(
I hope it’s okay if I sometimes don’t get to answering your feedback immediately, but take a bit longer.
no problem at all, we all do this in our spare time ❤️
I addressed the first two items of your list. By adding the scrollbar to CommitList, we get it in the “Log” tab for free.
Let me know what you think!
looks good! is there any gotchas left that you know of, or do you think we can merge this as an MVP?
@extrawurst
extrawurst
commented
Aug 28, 2021•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler I revisited #381 and realise now that we are using the regular commit list here. I don't think this is what we want for the history view. I think we should aim for something more bespoke, similar to the blame view (short commit list on the left side and a diff of the current selected commit on the right) - similar to how fork visualises it - see #381 (comment)
even if that means we have to make the single entry on the left side pane more than one line but I think it should contain the following:
  • short hash
  • timestamp
  • author
  • message (as much as fits)
  • maybe even the symbol of what kind of file diff it was in this commit (add, rename, modified)
little mockup
Screenshot 2021-08-28 at 14 28 58
@cruessler
cruessler
commented
Aug 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
Having a specialized list that shows additional information makes sense to me. I'll see what I can do!
@extrawurst
extrawurst
commented
Oct 6, 2021

Copy link


Copy Markdown

Collaborator
@cruessler are you still on this?
@cruessler
cruessler
commented
Oct 6, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Yes, I was planning on working on it this weekend!
@cruessler
cruessler
commented
Oct 10, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I worked on the PR today. While the changes are not ready yet, I made good progress and will likely be able to present results over the coming week. Your proposal works quite well, I think.
@cruessler
cruessler
commented
Oct 25, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
@extrawurst
extrawurst
commented
Oct 26, 2021

Copy link


Copy Markdown

Collaborator
@extrawurst I finally got to updating the PR. It is not yet complete, but I wanted to do it anyway to let you know I have not forgotten the branch. The two-row layout for the items in the table works well, I think. Still missing is the column that shows the modifier for added/modified/deleted as well as the area that shows the diff to the selected line.
That starts to look really cool already though! Thanks for holding on here ❤️
@ajschmidt8
ajschmidt8
commented
Nov 2, 2021

Copy link


Copy Markdown

Looking forward to this feature addition!!! Thanks for all your work on this @cruessler and @extrawurst
@cruessler
cruessler
commented
Nov 29, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’ve tried adding markers for “added/modified/deleted”, but I’m a bit stuck at the moment, and could need some help/input/ideas. The list of commits currently is a Vec<LogEntry> and does not contain the file status. One option would be to build an async way of getting it. Another way would be to introduce a FileLogWalker that includes a file’s status in the commit log, but I’m worried that might duplicate a lot of code in LogWalker. What do you think?
@extrawurst
extrawurst
commented
Nov 29, 2021

Copy link


Copy Markdown

Collaborator
@cruessler I checked out what we have so far and I am a little worried to add more functionality to the current AsyncLog its already combining the revlog and filtering case and still uses the old approach without AsyncJob.
What do you think about building a new FileLogJob that internally uses AsyncJob via composition and hooks into the notifications to followup each batch of commitIds with looking up the markers of the file in that particular commit. this way we can reuse AsyncJob as is and add the state lookup in an async way.
FileLogJob will then only expose LogEntries we also have the marker for.
@extrawurst
extrawurst
commented
Dec 25, 2021

Copy link


Copy Markdown

Collaborator
@cruessler Merry Christmas 🎄

any updates ? :)
@cruessler
cruessler
commented
Dec 26, 2021

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Not yet, but I want to work on the PR over the holidays. Merry Christmas! 🎄😀
@cruessler
cruesslerforce-pushed
the
add-file-history
branch
2 times, most recently
from
fc21f4b to
24892bbCompareDecember 29, 2021 16:23
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler cool progress!!
Screenshot 2022-01-10 at 01 31 15
@extrawurst
extrawurst
commented
Jan 10, 2022

Copy link


Copy Markdown

Collaborator
@cruessler if the modification type makes this overly complicated maybe we can do a MVP that we polish a bit?
  • diff side-by-side
  • scrollbar
  • page-up/down support
@extrawurst
extrawurst
commented
Jan 26, 2022

Copy link


Copy Markdown

Collaborator
@cruessler ping? 🥺
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I implemented your suggestions, and I think the PR is now ready for a first test and review. I have not yet cleaned up the code. I started extracting out AsyncFileLogJob, but I did not finish, so there are a few lines commented out that I possibly wanted to incorporate into the new trait. Let me know what you think and how to best proceed from here! And thanks for encouraging me to finish the work! :-)
@cruessler
cruessler
marked this pull request as ready for review
January 30, 2022 13:57
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadasyncgit/src/file_log.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/diff.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/file_revlog.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/components/inspect_commit.rs
Outdated

extrawurst
extrawurst
reviewed
Jan 30, 2022
View reviewed changes
Comment threadsrc/keys/key_list_file.rs
Outdated

@extrawurst
extrawurst
commented
Jan 30, 2022•

edited

Loading

Copy link


Copy Markdown

Collaborator
@cruessler it really depends on how much time you have to work on this. the biggest thing is actually the missing AsyncFileLogJob abstraction to combine the revlog fetching and then doing the get_commits_info on them. since I want to merge this as soon as possible I would say lets clean up the few small comments, remove the undone and unused AsyncFileLogJob and lets merge this
edit: something interferes with the syntax view in the file-tree, its stays empty in this branch. not sure yet why
@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst Next week I probably have little free time, so from my perspective it makes sense to merge first and address the outstanding issues later. I’d be happy to address them myself, but I totally understand if you don’t want to wait for that. I’m sure I would find other open issues. :-)
I found the reason for the file contents not being shown and pushed an additional commit.
@extrawurst
extrawurst
merged commit b622cee
into
gitui-org:masterJan 30, 2022
@extrawurst
extrawurst
commented
Jan 30, 2022

Copy link


Copy Markdown

Collaborator
@cruessler thanks for sticking with this! this is a great addition! checkout when this effort started: august 2021! Awesome work🥳
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

@cruessler
cruessler
commented
Jan 30, 2022

Copy link


Copy Markdown

CollaboratorAuthor
@extrawurst I’m super happy this finally got merged! 🎉 Thanks a lot for being so patient!
@cruessler
cruessler
deleted the

add-file-history

branch
January 30, 2022 18:49
@extrawurstextrawurst
mentioned this pull request
Jan 30, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@extrawurstextrawurstextrawurst left review comments

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

View log/history of a file


3 participants

@cruessler@extrawurst@ajschmidt8