search

jakesankey / git-history

View previous versions of any file known to git.
https://atom.io/packages/git-history
MIT License
28 stars 10 forks source link

Right pane shows raw git diff output only instead of history code with coloured highlights #30

Open pamtbaau opened 8 years ago

pamtbaau commented 8 years ago

When picking a commit from history, a second panel is opened and filled with the raw output of git.

What I expected was two panes with current and history code and coloured highlights of the differences, kinda like split-diffs does.

Am I missing something?

jakesankey commented 8 years ago

Did you check the package settings? There is an option to show either history or diff

pamtbaau commented 8 years ago

Ah, I took that option to mean that a second panel should be opened to show the differences...

After deselecting the Show Diff option I do get two panels with the 'before/after', but don't see differences highlighted. That was my expectation...

jakesankey commented 8 years ago

Do you have language-diff package installed and enabled? That is how atoms knows how to highlight the file.

Jake

Sent from my iPhone

On Nov 26, 2015, at 4:50 AM, pamtbaau notifications@github.com wrote:

Ah, I took that option to mean that a second panel should be opened to show the differences...

After deselecting the Show Diff option I do get two panels with the 'before/after', but don't see differences highlighted. That was my expectation...

— Reply to this email directly or view it on GitHub.

pamtbaau commented 8 years ago

Just installed language-diff, but doesn't make a difference... Two panes from different commits sittings next to each other, but no highlights of differences and no sync scrolling.

Do I have the wrong expectations?

jakesankey commented 8 years ago

Sync scrolling is not (yet) a feature of this plugin but diff highlighting is. No magic there. The right pane should be a .diff file and atom should highlight that automatically. Try restarting atom after installing language-diff. Give it one more shot. If that doesn't work. I'll look into it more.

On Nov 26, 2015, at 5:26 AM, pamtbaau notifications@github.com wrote:

Just installed language-diff, but doesn't make a difference... Two panes from different commits sittings next to each other, but no highlights of differences and no sync scrolling.

Do I have the wrong expectations?

— Reply to this email directly or view it on GitHub.

pamtbaau commented 8 years ago

Nope, no highlights. I used default settings for language-diff. The right-hand side file by the way is not called .diff which language-diff is said to work on. The file has the same filename as on the left side, prepended with a number.

By the way... is it an idea to clear the folder C:\Users\pamtbaau\.atom\.git-history with all its files on deactivation of your package?

jakesankey commented 8 years ago

Interesting. If you have the "show diff" option on in git-history, it should be a .diff file on the right. I can look into this further. Thanks for the info.

It wouldn't hurt to wipe that .git-history file and see what happens if you wanna try that.

Jake

Sent from my iPhone

On Nov 26, 2015, at 10:59 AM, pamtbaau notifications@github.com wrote:

Nope, no highlights. I used default settings for language-diff. The right-hand side file by the way is not called .diff which language-diff is said to work on. The file has the same filename as on the left side, prepended with a number.

By the way... is it an idea to clear the folder C:\Users\pamtbaau.atom.git-history with all its files on deactivation of your package?

— Reply to this email directly or view it on GitHub.

pamtbaau commented 8 years ago

If setting Show Diff is toggled on the right-hand side has the .diff extension, but the pane shows the raw diff. else the right-hand side has the same original extension and panel shows code

jakesankey commented 8 years ago

By "raw diff" you mean it doesn't include highlighting? It is supposed to show the git diff but it should highlight.

pamtbaau commented 8 years ago

Maybe its a good idea to add some images...

Show Diff = off (no highlighting of differences) show diff - off

Show diff = on (raw diff) show diff - on

jakesankey commented 8 years ago

Good idea. Thanks for the feedback.

For more diff-goodness. Checkout line-diff-details package as well.

On Nov 26, 2015, at 1:46 PM, pamtbaau notifications@github.com wrote:

Maybe its a good idea to add some images...

Show Diff = off (no highlighting of differences)

Show diff = on (raw diff)

— Reply to this email directly or view it on GitHub.

irvnriir commented 6 years ago

@jakesankey i'm pretty sure that on 2nd screenshot is not what supposed to be, and same issue here.

*n, 'added','removed' lines marked by "+","-"