Added Live Git Annotations (screenshots inside) #50

Merged
merged 4 commits into from Jan 25, 2012

7 participants

@cj
cj commented Nov 18, 2011

I found a slight bug, when using comments on the same line as code, it thinks everything is a comment including the line below it:

@cj
cj commented Nov 23, 2011

It also appears that in ruby it thinks everything is a comment when it's not.

@buhrmi

I'm not sure I understand you correctly. The purpose of the feature is to annotate changes in the buffer compared to the latest version in the branch. The blue lines indicate changed lines. Not comments.

@cj
cj commented Nov 23, 2011

I thought green indicates code lines added, blue is comment lines added and red is code lines removed?

@buhrmi

Ah. No.
green = added line
blue = changed line
red line = removed code

@cj
cj commented Nov 23, 2011

ahhh... it all makes sense now :D thank you.

Did you see my other comment on is it possible to show the code in red that got deleted instead of just a red line?

@ericclemmons

Does this PR need to be merged down? The README indicates this command is available, though it's not (yet)

@mgcrea

Please merge this!

@sirkitree

Yeah, this should be removed from the Wiki if it's not been merged yet.

@sheldon
Collaborator

I'm considering requesting that your fork be taken as the auto install version, as this pull request hasn't been merged. what do you think?

@buhrmi

No. I was not able to test it on windows. And I believe it won't work since it's using the diff command through the IO pipes which isn't available on Windows (I think).

@sheldon
Collaborator
@sheldon
Collaborator

I've been trying to get this patch working together with another pull request which modifies the CommandThread constructor in a different way. I'm having some problems, would appreciate some help.

I seem to have the initial annotations working fine, but the live ones are breaking. What I have working is on https://github.com/sheldon/sublime-text-2-git/tree/annotations if you wouldn't mind taking a look.

@sheldon
Collaborator

for anyone that's interested, I've got this successfully merged with the pull request to add git show (#30). both are merged along with most of the outstanding pull requests on my master branch if you'd like to get them added to this original one @kemayo : https://github.com/sheldon/sublime-text-2-git

@sheldon sheldon merged commit c12f445 into kemayo:master Jan 25, 2012
@meshy

This clobbers text colouring :/

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