Show staging status

[mcmillion]

Would it be possible to show an indicator for lines of files that have been staged?

[jisaacks]

This is a feature I am currently working on.

Thanks.

[tkoenig]

+1

[jisaacks]

I have a branch called staged with what I have so far.

Some notes:

• Trying to determine what changes are staged/unstaged in a dirty file (a file with unsaved changes) is very difficult. so I currently only have it distinguishing unstaged/staged when the file is clean (no unsaved changes.) If anyone can solve this problem it would be great!
• The colors for the icons come from the colors scheme. GitGutter uses the format markup.change-type.git_gutter for example markup.inserted.git_gutter. Since color schemes in sublime text fall back, if the current color scheme does not define a color for markup.inserted.git_gutter it will fall back and use markup.inserted which many of the default color schemes have defined. I have extended this farther by making the colors for staged and unstaged defined like markup.inserted.git_gutter.staged and markup.inserted.git_gutter.unstaged. So needless to say if you want to checkout the staged branch and check it out, you will need to define these color defs. But it won't break if you don't have them defined. I have already added them to DeepBlueSee so you can use that color scheme to check this feature out.

---

Here is a screenshot using the DeepBlueSee color scheme:

The green ones are staged and the faint ones are not staged.

---

I would love to have some feedback on all of this from any interested parties.

[mcmillion]

Just got this worked into my theme. Looks great.

[maffiou]

Cool stuff.

I've just started to use gitGutter and it's amazing...
I do a lot of patch amending, would it be possible to add a key combination to show the diffs between HEAD and HEAD^ as well as the ongoing changes (I appreciate it might be quite tricky)

[jisaacks]

@maffiou take a look at the compare branch and this issue: #104

[jisaacks]

@maffiou There is a new feature (pulled in from the branch I linked previously) that lets you choose a commit to compare against. You can find it in the command palette.

@mcmillion I am still working on this, its quite tricky. I have a pull request #136 but I am not convinced it is ready for prime time just yet. It does show the staged status even if the file is dirty now.

If you pull the latest code, I would love any feedback.

[maffiou]

@jisaacks Sorry for not responding earlier, I've been stupidly busy lately. I'm using gitGutter every single day and love it. 👍 Will try the latest version when I can risk it. :)
FYI: I did try to flattr you but it doesn't seem to have been picked up...

[jisaacks]

@maffiou Thanks man! BTW, did not know about flattr, just went and created an account.

[Raynos]

@jisaacks I just tried your branch. I'm afraid it won't work cleanly with my default theme :(

This might be an issue for MarkHMorrison/nexus-theme#9

[Raynos]

It might also be an issue with https://github.com/Benvie/JavaScriptNext.tmLanguage/blob/master/JavaScriptNext.tmTheme#L1493

not sure how to apply patches or where to apply them.

[jisaacks]

@Raynos I am not exactly sure I understand what your issue is, but I think you are saying that of the 2 themes you want to use, Nexus, and JavaScriptNext, neither define the appropriate values needed for this branch.

The values that need to be defined (for git gutter in general) look like this:

• markup.inserted.git_gutter
• markup.deleted.git_gutter
• markup.modified.git_gutter

Then for this branch, it adds:

• markup.inserted.git_gutter.staged
• markup.deleted.git_gutter.unstaged
• markup.modified.git_gutter.staged_unstaged (for lines that are mixed)

The way these color defs work in sublime text, is, each . narrows the scope, but falls back to the previous scope if not defined.

So when something needs to be colored like markup.inserted.git_gutter.staged sublime checks for the following values and uses the first one it finds:

• markup.inserted.git_gutter.staged
• markup.inserted.git_gutter
• markup.inserted
• markup

It looks like those themes define the markup.inserted etc. without the git_gutter or staged pieces, which should still work, except staged/unstaged changes will not be colored differently.

If you want to modify/patch the theme to make it work as desired for this branch, you just need to edit the theme and add the appropriate values.

Alternatively if you just want to grab a theme to play with this branch that already has the needed color defs, you can use this theme

[Raynos]

@jisaacks can we get these changes merged into master behind opt in config flags.

It makes it easier to try these changes without having to manually install a branch of gitgutter in sublime.

Same thing for the protected regions branch.

[jisaacks]

@Raynos actually, I think there is a way to tag a branch and have it installable as a separate version via Package Manager. I will look into that when I get some free cycles. I would rather not merge half baked features into master.