Commit Graph

609 Commits

Author SHA1 Message Date
Marco Hinz
6fab9cc2d7 Merge pull request 90 from @talmuth
Closes #90.
2013-11-19 08:24:43 +01:00
Denys Lózko
f4b2350458 Fix sign_overwrite for non-EN locales 2013-11-19 08:24:19 +01:00
Marco Hinz
5817de27c8 Merge pull request 86 from @thallett
Closes #86.
2013-11-18 23:36:56 +01:00
Timothy Hallett
ea5d13ce46 Dynamically re-apply diff options on every diff
Prior to this patch, it was not possible to dynamically apply arguments
to diff commands.  The g:signify_diffoptions variable was only read when
the plugin was loaded.

This patch changes the behavior so that before each diff it checks
g:signify_diffoptions to see what arguments should be passed to the diff
tool.

The motivating use case behind this change is to be able to diff against
a different branch in Git via a key mapping. However, This change will
also allow any other arbitrary diff options to be dynamically updated,
such as whitespace, etc.

Example: Show diff against master instead of against HEAD in Git
  nnoremap \u :let g:signify_diffoptions = { 'git': 'master'}<CR>:SignifyToggle<CR>
2013-11-18 23:34:47 +01:00
Marco Hinz
79cb027b35 Perforce: diff -du0 -> diff -dU0
Closes #89.
2013-11-18 10:26:09 +01:00
Marco Hinz
8893445c70 Merge pull request 85 from epage 2013-11-09 14:22:57 +01:00
Ed Page
9b7ad65ea9 Remove double-dash from perforce call
Closes #85.
2013-11-09 14:22:01 +01:00
Øystein Walle
bf01a95f9e Stylistic change 2013-11-09 14:21:49 +01:00
Øystein Walle
22515a370c Stylistic change 2013-11-03 20:10:21 +01:00
Marco Hinz
1499f548a2 Improve repo detection
Prior to this patch a VCS was only detected by checking if a potential
diff was empty or not. Now the combination of return value and diff is
checked, so it detects an underlying VCS properly even when there are no
changes.

This can save many useless calls to the wrong version control systems.

Simple test:

 - open a version-controlled file without any changes
 - :SyDebug should show the correct VCS now (instead of 'unknown')

Closes #82.
2013-11-03 19:31:46 +01:00
Marco Hinz
56eab9811c Doc: add note about diff tool to vcs_list option
References #83.
2013-11-03 16:08:21 +01:00
Marco Hinz
8fd2d3ce76 Do not use certain VCS if no difftool is available
References #83.
2013-11-03 16:07:15 +01:00
Marco Hinz
ec4d88eb1c Change default value for sign overwriting
References #81.
2013-10-30 12:16:07 +01:00
Marco Hinz
9b32ba5a97 Doc: better description of sign overwriting
References #81.
2013-10-30 12:13:47 +01:00
Marco Hinz
c2cce93b13 Change warning message for sign overwriting
References #81.
2013-10-30 12:12:54 +01:00
Marco Hinz
531d3abd87 Remove misplaced modeline 2013-10-02 14:56:01 +02:00
Marco Hinz
fd9e786b14 README: make author info even shorter 2013-10-02 14:40:38 +02:00
Marco Hinz
a6ed3a9a30 README: remove useless line 2013-10-02 14:34:20 +02:00
Marco Hinz
bc0b62093a README: startify -> signify 2013-10-02 14:33:05 +02:00
Marco Hinz
5c748c5cb5 README: refactoring 2013-10-02 14:30:16 +02:00
Marco Hinz
ce6d03d805 Doc: add some highlights 2013-10-02 14:08:34 +02:00
Marco Hinz
acfc0cbe69 Doc: refactoring 2013-10-02 13:57:31 +02:00
Marco Hinz
c435dc2e01 Merge pull request 78 from esneider
Closes #78.
2013-10-01 09:37:26 +02:00
Dario Sneidermanis
e398fc4856 Repo.vim: use correct variable
After one of the recent changes 'deleted' was used in a place where
'removed' should have been used. This could lead errors:

Error detected while processing function
   sy#toggle..sy#start..sy#repo#process_diff..sy#sign#set:
line   10:
E155: Unknown sign: SignifyChangeDelete12
2013-10-01 09:34:17 +02:00
Marco Hinz
50496311c5 Remove guards from autoload files 2013-09-30 10:22:20 +02:00
Marco Hinz
a9284f363c Move modelines to the top 2013-09-30 10:19:31 +02:00
Marco Hinz
1cac5f971f Merge pull request 77 from derekschrock
Closes #77.
2013-09-30 09:51:28 +02:00
Derek Schrock
60ab3ba98e README: update pathogen installation method 2013-09-30 09:47:58 +02:00
Marco Hinz
5f36c16ff5 Test if 'sign unplace *' is supported 2013-09-30 09:40:46 +02:00
Marco Hinz
b579bd9f8c Code cleanup in repo.vim 2013-09-27 10:45:35 +02:00
Marco Hinz
05bc548ecc Merge pull request #76 from jamessan/patch-1 2013-09-27 01:34:19 -07:00
James McCoy
ded8213bf6 Calculate correct ChangeDelete sign to use
Using deleted was causing the sign to reflect all the deleted lines so
far in the buffer instead of the deleted line count for this hunk.
2013-09-27 00:13:28 -04:00
James McCoy
fb2f2405e6 Fix double counting of deleted lines in a ChangeDelete hunk 2013-09-26 23:48:07 -04:00
Marco Hinz
be4d622bb9 Don't reset signs when another window gets updated
References #73.
2013-09-25 11:17:52 +02:00
Marco Hinz
c299dc5c1c Git: use --no-color
ANSI escape sequences in a patch would confuse Sy. People are advised to
set their color settings to 'auto' instead of 'always', so color codes
would only be used if the output is meant for the terminal.

Thus we just ignore color.diff settings now.

References #72.
2013-09-25 01:36:08 +02:00
Marco Hinz
fcfb40c456 Avoid variable type mismatch 2013-09-16 01:29:11 +02:00
Marco Hinz
35b0b02c44 Merge pull request 70 from chlunde
Closes #70.
2013-09-15 23:01:55 +02:00
Carl Henrik Lunde
d3ead7128d Avoid useless calls to executable()
get() is not lazy and will always evaluate the expression in the default
value.
2013-09-15 23:00:04 +02:00
Marco Hinz
79bf0c4d0f Fix CVS handling 2013-09-15 18:54:41 +02:00
Marco Hinz
f084f1d599 CVS returns 1 on diff and error 2013-09-15 15:17:12 +02:00
Marco Hinz
0b6ffd8d00 Add simple directory cache 2013-09-13 01:23:05 +02:00
Marco Hinz
4d475262c3 Merge pull request 69 from pekepeke
Closes #69.
2013-09-12 09:36:46 +02:00
pekepeke
6a157ebd75 Fix backwards logic in filter() 2013-09-12 09:36:24 +02:00
Marco Hinz
9eedb00a04 Doc: only check installed VCS 2013-09-12 00:31:09 +02:00
Marco Hinz
fcf5d14460 Refactor VCS detection #2 2013-09-12 00:26:43 +02:00
Marco Hinz
5c386c7451 Merge pull request 68 from bling/performance
Closes #68.
2013-09-12 00:17:01 +02:00
Marco Hinz
a2b96beff7 Refactor VCS detection 2013-09-12 00:16:09 +02:00
Bailey Ling
3133fce524 Improve detection performance (#67) 2013-09-11 21:16:38 +00:00
Marco Hinz
f35b8dfac7 Merge pull request 66 from esneider
Closes #65.
Closes #66.
2013-09-06 17:39:07 +02:00
Dario Sneidermanis
99ef641012 Fix mapping shadowing
Use empty() instad of ! when testing for string emptiness.

if !'foo' == !'' | echo 'facepalm!' | endif
2013-09-06 17:36:30 +02:00