Commit jumping and line matching fixes #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When pressing back (`[`) until before the commit that added the inspected file, the blame contents go blank (makes sense). When going forward again, until now it was possible that they stay blank because `highlight_line` could become `-1`, and once this happened, it would stay `-1` forever. This commit fixes it by making sure that `max_highlight` cannot be negative.
Until now, a wrong line mapping would be computed when adding text e.g. to the end of a line. This is because in the `git diff --word-diff=porcelain` that was used so far, such changes appear as a "+" line (which makes sense given that it's a word- diff), which the code so far interpreted as the addition of a new line when in fact only words inside the line were changed. So far, I believe that a correct line mapping cannot be computed using `--word-diff`, because it inherently ignores whitespace: If you delete whitespace at the end of the line, and also some following empty lines, it doesn't even appear in `git diff --word-diff=porcelain`. This commit uses `diff` instead, which has a feature to tell us the added, deleted and unchanged lines, from which we can directly construct the line mapping.
nh2
force-pushed
the
commit-jumping-and-fixes
branch
from
42e9db8 to
7d834b2
Compare
…fied commit. This makes `git-browse <rev> <file>` work.
Like all other git invocations, this should separate the revision from the file name using `--`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes a couple of issues that made git-browse unusable for me:
jfor "jump" might be a more natural key)