Commit Graph

209 Commits

Author SHA1 Message Date
Andy Stewart
d1e66b71f9 Revert "Show sign on first line when line(s) deleted at start of file."
Signs aren't shown for deleted lines which aren't at the start of the
file.

This reverts commit 0fd18d66f6.
2014-05-31 16:57:15 +02:00
Andy Stewart
0fd18d66f6 Show sign on first line when line(s) deleted at start of file. 2014-05-30 17:03:54 +02:00
Chris Faulkner
833b8a439f Use proper regex when fetching SignColumn colors.
The previous regex would incorrectly match null characters in some cases.
2014-05-21 20:47:33 -07:00
Andy Stewart
ceeba75239 Fix independent toggling of signs in sign column and line highlights.
Note that line highlighting requires signs to be placed (because the
line highlight is simply an attribute of a sign).  If the user doesn't
want to see signs in the sign column, but does want line highlighting,
then we make the signs in the sign column invisible.

If neither the signs in the sign column nor the line highlights are
needed (presumably the user just looks at the hunks stats) then we can
remove all signs, at which point Vim removes the sign column...unless
the "sign column always" option is set.
2014-05-19 15:50:51 +02:00
Andy Stewart
0759c96770 Rename function for clarity. 2014-05-19 14:44:58 +02:00
Andy Stewart
d44c51456a Fix typo in function definition. 2014-05-07 14:10:13 +02:00
Andy Stewart
a4347c57ea When disabling, disable across all buffers. 2014-04-14 15:24:25 +02:00
Christian Wellenbrock
47ffb2e30b Follow linked highlight groups to find background colors 2014-04-07 13:35:47 +02:00
Christian Wellenbrock
7e7ccea694 Use bg values from SignColumn for GitGutter{Add,Change,Delete}Default 2014-04-06 00:07:06 +02:00
Andy Stewart
ba0f5930e5 Optimise removal of all signs where possible. 2014-03-24 10:26:36 +01:00
Andy Stewart
0ca3f7e3cd Add hunk previewing. 2014-03-18 13:50:22 +01:00
Andy Stewart
9c66906d56 Move logic out of main plugin file. 2014-03-17 11:27:31 +01:00
Andy Stewart
eee8ba4cff Refactor hunk functionality. 2014-03-17 10:48:05 +01:00
Andy Stewart
a1a29b87ee Use cross-platform way to exit with success.
`exit 0` works across all shells (as far as I know).
2014-02-27 09:42:00 +01:00
Andy Stewart
e9db45e36d Escape grep's argument. 2014-02-26 16:47:47 +01:00
Andy Stewart
aeec864d8d Suppress non-zero exit codes for diff.
Exactly as we do for `grep`.
2014-02-26 16:44:39 +01:00
Andy Stewart
7e8d2fb5a6 Use minimal file paths.
Since we start all external commands by cd'ing to the current file's
directory, we can use the file's name instead of its full path.

The exception is `git show :FILE` where we must use a path relative to
the repo root for maximum git compatibility.  It turns out `git
rev-parse` takes a `--show-prefix` argument which makes our relative
path calculation far simpler.

Minimising files paths has these benefits:

- Easier to inspect the generated commands.
- Less opportunity for escaping problems.
- Eliminates possible mismatches betwen absolute paths generated by git
  and absolute paths generated by Vim (crops up with msys/msys2 on
  Windows).

Thanks to @suxpert for helping with this.
2014-02-26 11:52:38 +01:00
Jonathan Warner
dff7bc8736 Wrap compound commands in parentheses.
This fixes a problem on Windows where non-git-tracked files caused an
error in Vim instead of returning normally with a non-zero exit code.
2014-02-20 11:26:50 +01:00
Andy Stewart
f7368e042f Merge branch 'signs-139'
* signs-139:
  Document variable types.
  Remove orphaned signs.
2014-02-04 12:50:22 +01:00
Andy Stewart
43ae99b3d0 Document variable types. 2014-02-04 12:50:21 +01:00
Andy Stewart
84cb4b8b9d Remove orphaned signs. 2014-02-04 12:49:55 +01:00
Andy Stewart
37491628f4 Add debug command. 2014-02-03 14:13:05 +01:00
Andy Stewart
270973079d Fix bug where updated sign kept old name. 2014-02-03 11:07:54 +01:00
Andy Stewart
468474bedf Custom shellescape(arg) to cope better with Windows.
Hopefully :)
2014-01-31 10:38:04 +01:00
Andy Stewart
8541eec8fc Remove unnecessary escaping.
While I can't say I fully understand escaping rules for Windows, I
understand them better now than I did when I copied that code from
another plugin and hoped for the best.

As far as I can tell, this escaping code was written to be used when
manually constructing a system command to execute – which isn't how this
plugin is written.  So this code shouldn't be here.
2014-01-31 10:04:41 +01:00
Andy Stewart
f016924284 Refactor: inline method. 2014-01-30 16:53:14 +01:00
Andy Stewart
5ac69a8bbc Fix typo in utility#escape(). 2014-01-29 16:10:12 +01:00
Andy Stewart
bd2091a850 Escape the blob filename. 2014-01-29 13:55:58 +01:00
Andy Stewart
974cd952fc Always use path relative to repo root with git-show.
More recent versions of git support paths relative to current directory.
But for maximum compatibility we need to use paths relative to the
file's repo's root.
2014-01-29 13:47:22 +01:00
Jonathan Warner
721c96c8ef Use POSIX and Windows compatible command. 2014-01-29 11:20:29 +01:00
Andy Stewart
c7af455c95 Remove unnecessary shell redirection.
While it is aesthetically nicer to discard the unused output from `git
ls-files`, it isn't necessary.  Discarding requires a shell redirection
which exposes us to vim's shell quirks; it's not worth it.
2014-01-29 10:57:20 +01:00
Andy Stewart
f158fee95e Remove debugging line. 2014-01-27 15:24:04 +01:00
Andy Stewart
5485c37b38 Fix bug in realtime diff of non-current buffer.
This bug meant that a realtime diff of a buffer which wasn't the current
one -- which happens during GitGutterAll() -- diffed the staged version
of the buffer against the current buffer's contents instead of the
buffer's contents.
2014-01-27 14:51:19 +01:00
Andy Stewart
072846e945 Don't place/unplace dummy sign unnecessarily. 2014-01-27 14:15:19 +01:00
Andy Stewart
afecd8711d Fix precedence in diff command. 2014-01-27 13:54:11 +01:00
Andy Stewart
8ada986fcf More accurate error message. 2014-01-27 13:41:05 +01:00
Andy Stewart
f2e08dbeb3 Move git-tracking check into diff command.
This avoids shelling out twice per buffer: once to check whether git
knows about the file and once to perform the diff.  Now we simply do
both in one external call.

Profiling showed external calls to git taking ~20ms.  This doesn't seem
too bad but it adds up.
2014-01-27 10:48:47 +01:00
Andy Stewart
bb87232842 Add ability to toggle signs on and off. 2014-01-16 11:32:41 +01:00
Andy Stewart
7808f9f647 Fix type of variable when clearing signs. 2014-01-16 11:22:32 +01:00
Andy Stewart
c680694b06 Improve sign handling with better data structure.
Using a dictionary instead of a list clarifies the code.
2014-01-13 10:34:41 +01:00
Andy Stewart
da47098496 Fix bug in clearing signs when disabling plugin. 2014-01-13 09:44:26 +01:00
Andy Stewart
e750b5fa21 Eliminate unnecessary string concatenation. 2014-01-11 17:24:11 +01:00
Andy Stewart
38e6524fff Remove unnecessary argument to sign unplace.
Each sign instance has a unique id so we don't need to scope per file.
2014-01-10 10:51:48 +01:00
Andy Stewart
648281497f Standardise on . 2014-01-10 10:48:20 +01:00
Andy Stewart
b1f023e230 Remove unnecessary colons. 2014-01-10 10:46:53 +01:00
Andy Stewart
a6ac0d879c Whitespace 2014-01-09 18:00:29 +01:00
Andy Stewart
1ad55ae1eb Fix type mismatch.
Introduced by attempt to workaround lack of support for default value in
getbufvar().
2014-01-09 17:57:19 +01:00
Andy Stewart
92abcce1ff Stage and revert individual hunks. 2014-01-09 12:14:59 +01:00
Andy Stewart
7ce6309a01 Don't call getbufvar() with a default value.
Support for a default value in getbufvar() was introduced some time
after Vim 7.3.547 which is the current stable version in some package
repositories.
2014-01-09 10:05:49 +01:00
Andy Stewart
03ca0f8d93 Extract utility functions. 2014-01-08 09:55:54 +01:00