Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

馃悰 --color-words output doesn't show hunk headers or line numbers #829

Closed
dandavison opened this issue Dec 6, 2021 · 0 comments 路 Fixed by #833
Closed

馃悰 --color-words output doesn't show hunk headers or line numbers #829

dandavison opened this issue Dec 6, 2021 · 0 comments 路 Fixed by #833

Comments

@dandavison
Copy link
Owner

From #826 (comment)

the handling of --color-words is not quite what I had expected in v0.10.3 either. I suppose it makes sense given that delta is only passing along the raw values, but for a file with multiple hunks, I'm not getting either line numbers from delta or the hunk headers from the raw git.

It looks like the implementation in #807 isn't quite right: it's causing the hunk lines to be emitted raw by not handling them. But I think that what is needed is more complex: to transition into one of the hunk line states of the state machine, emit raw instead of the normal emission, and report the line as having been handled. I think that this is because we are not transitioning the state correctly

dandavison added a commit that referenced this issue Dec 7, 2021
dandavison added a commit that referenced this issue Dec 7, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 8, 2021
dandavison added a commit that referenced this issue Dec 8, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 8, 2021
dandavison added a commit that referenced this issue Dec 8, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 9, 2021
dandavison added a commit that referenced this issue Dec 9, 2021
dandavison added a commit that referenced this issue Dec 9, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 9, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 10, 2021
dandavison added a commit that referenced this issue Dec 10, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 12, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
dandavison added a commit that referenced this issue Dec 12, 2021
The previous implementation (5895cfa) was incorrect.

Fixes #829
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant