Commit Graph

128 Commits

Author SHA1 Message Date
Grzegorz Milka
3899f848a7 Adapt data structures of branch.vim to async
* The head string is now calculated iff it has changed.
* The not exists symbol for current file appears as soon as its status is known.
* Fixes various problems with asynchronous status checking, such as:
  * The not exists symbol keeps appearing and disapearing. This happened when
    file was marked as not existing, the untracked cache was invalidated, and
    the cache update is started, but in the meantime, the head string
    calculation used the current (empty) value of the cache.
  * The not exists symbol never appears, because cache keeps getting invalidated
    before b:airline_head is emptied and updated.

closes #1306
2016-11-03 21:03:13 +01:00
Christian Brabandt
02ecb8631d fix missing part of commit 3bd6cb5ee4
There was a part missing of #3bd6cb5ee4981227
add it back
2016-11-03 17:54:50 +01:00
Christian Brabandt
6dae3452db Fix order of statements
Commit #3bd6cb5ee498 causes an error, because a variable was used
before it was declared. Fix this.
2016-11-03 17:26:32 +01:00
Grzegorz Milka
3bd6cb5ee4 Refactor branch.vim to avoid code duplication
* Introduce a config variable that holds the vcs-dependent parts of code.
* Removes `get_*_untracked` duplication by merging their logic together.
* Removes custom checks for 'git' or 'hg'. Functions now rely on provided config
  argument.
* Use loops instead of manually specifying each handled VCS.

closes #1303
2016-11-03 17:19:17 +01:00
Christian Brabandt
516870bf9f Check for correct async condition
fixes #1308
2016-11-02 16:43:47 +01:00
Christian Brabandt
0ea4daa103 Merge pull request #1297 from chrisbra/mq
Add mq status for hg repositories
2016-10-26 20:47:45 +02:00
Grzegorz Milka
2af2bdb424 Display not exists symbol correctly in Git repos
This commit fixes a bug, where untracked files in Git repos did not get the not
exists symbol displayed. The fix works by replacing the previous check for
whether currently edited file is a directory or not with a check based on
`findfile`. More detailed explanation follows.

VCS extension to vim-airline checks whether currently edited file is untracked.
The previous `s:get_git_untracked` implementation, which was used for the
aforementioned purpose for Git repos, was buggy, because it did not return the
untracked symbol in most situations, i.e. the edited file is untracked, but it
was treated as if it wasn't.
The root cause was the second clause in boolean expression checking the output
of `git status`:

    if output[0:1] is# '??' && output[3:-2] is? a:file

It was added to make sure we are not checking a directory, but at this point in
the program `a:file` is an absolute path, while output of `git status` is a
relative path from the root of git repo. So the `is?` expression failed in most
situations.
2016-10-25 19:26:44 +02:00
Christian Brabandt
14ab47cae6 Add mq status for hg repositories
Now that we have async feature for Vim 8, we can add the output of 'hg
qtop' back to the statusline if it is supported
2016-10-20 22:46:24 +02:00
Aditya
be6e3db68b
on_exit function fix if self.file is missing 2016-10-18 22:23:07 -04:00
Christian Brabandt
8964603844 fix missing declaration 2016-10-14 11:14:33 +02:00
Christian Brabandt
4f8a16c31e fixup for async feature 2016-10-14 10:36:21 +02:00
Christian Brabandt
c39e5f82cc check for existence of git/hg before calling them 2016-10-14 10:36:21 +02:00
Christian Brabandt
f706edee9f init async global variables 2016-10-14 10:36:21 +02:00
Christian Brabandt
57ca6c9e78 include workaround from c1704a2de0
add workaround from commit c1704a2de0 to prevent overwriting
v:shell_error
2016-10-14 10:36:21 +02:00
Christian Brabandt
ffa3d59af2 branch ext: use async functions for system() commands
Make use of vim 8 async functionality and use it to get the vcs status
for the branch extension.

Won't work with neovim.

fixes #1266
2016-10-14 10:36:21 +02:00
Christian Brabandt
513afd25bc Merge pull request #1263 from thawk/master
Set script encoding to avoid script parsing problem in non UTF-8 VIM
2016-09-24 21:55:50 +02:00
thawk
45d77ca909 Add 'scriptencoding utf-8' to all scripts 2016-09-24 08:16:30 +08:00
Christian Brabandt
c1704a2de0 Do not overwrite v:shell_overwrite after ShellCmdPost
Prevents resetting v:shell_error from the followin system() call in
get_git_untracked.

Fixes #1266
2016-09-23 16:11:53 +02:00
Christian Brabandt
8fda614d0d Cache hunk values, shorten for small windows
Cache the hunk values. In case of short windows, shorten the hunk string
a little bit and make the branch extension take the hunk value into
account when deciding how much to shorten it.
2016-07-03 20:44:05 +02:00
Christian Brabandt
c6f5d8b823 Merge pull request #1202 from chrisbra/resolve_symlink
Try to resolve symlinks for git
2016-07-02 10:55:49 +02:00
Christian Brabandt
409e8b0cbd refactor shortening code 2016-07-02 10:20:07 +02:00
Christian Brabandt
5b00d54cd6 If window is too small, shorten branch name 2016-07-02 10:19:43 +02:00
Christian Brabandt
ece61f346e Try to resolve symlinks for git 2016-07-01 11:52:07 +02:00
Christian Brabandt
985f3d3eca b:airline_head sometimes undefined
Make sure, b:airline_head variable is set, also it is initially set in
this function earlier. But see #1171 for an error.

Therefore, before checking if the variable is empty, make sure it
exists.

fixes #1171
2016-05-22 21:29:00 +02:00
hanhuanle
a8dfdd40b7 shellescape file path when call "system()"
"system()" called by "get_git_untracked" and "get_hg_untracked" fails
sometimes. It reports error "Can't open file /tmp/***".
The root cause is that the file path for system() contains some unordinary
character and lacks quotes.
2016-04-28 23:14:32 +08:00
Christian Brabandt
0bfae15d97 do not unconditionally use utf-8 encoding in branch exten
Check, that encoding is utf8 before using '…'
fixes #1061
2016-02-25 11:30:02 +01:00
Christian Brabandt
13ea57b98a Revert "Add mq patch to branch output"
This reverts commit 8023f6f5dc.

fixes #1035
2016-02-16 17:52:26 +01:00
Christian Brabandt
5e0b10c005 Revert "Only show hg qtop output, if branch is also shown"
This reverts commit da78d4a7bb,
since it causes a massive performance impact.

fixes #1035
2016-02-16 17:48:57 +01:00
Christian Brabandt
da78d4a7bb Only show hg qtop output, if branch is also shown 2016-02-15 17:05:53 +01:00
Christian Brabandt
8023f6f5dc Add mq patch to branch output 2016-02-11 22:44:12 +01:00
Christian Brabandt
0022de3b78 Small improvement for untracked feature
first argument of git status is <pathspec> in git speech,
and so if you feed it a directory, that contained an untracked file,
the directory would be marked as untracked. So fix this.
2016-02-05 23:11:37 +01:00
Christian Brabandt
d8adbfa135 Add untracked feature to branch extension.
This will show a little not-existing sign in a buffer,
if that file lives in a git/hg repository but does not exists
there yet. Use `:let g:airline_symbols.notexists='!'` to configure
the '!' as symbol. By default, will use U+2204 symbol

To not impact performance by shelling out a lot, the result is cached
until the buffer is written or a shell command is issued.

Should work with mercurial and git.

fixes #925
2016-02-04 16:43:42 +01:00
namark
d6a42528a1 Made fugitive and lawrencium coexist in peace,
meaning that branches retrieved from those are now displayed side by
side. The order can be customised with g:airline#extensions#branch#vcs_priority.
The VCS name is now prepended to the branch name to be able to tell
which is which. The VSCCommand behaviour is unchanged.
Also restructured the code a little bit, and made found_fugitive_head
variable behave as its name suggests.
2016-02-01 22:51:34 +01:00
Bailey Ling
ce44577f1b move branch variable into the extension 2016-01-29 09:29:40 -05:00
Bailey Ling
b7a74b1748 remove deprecated variables
over 2 years is more than enough warning...
2016-01-28 09:54:14 -05:00
Bailey Ling
048b24a916 happy 2016! 2016-01-14 21:38:38 -05:00
Tobias Witt
b48e2390cb
Add pathshorten as a built-in format for long branch names 2015-11-19 11:03:54 +01:00
Bailey Ling
5dc0cc5418 allow displayed_head_limit to work alongside format. resolves #729. 2015-03-14 12:26:35 -04:00
Bailey Ling
ca44fd467c support display only tail end of a branch; as well as custom format
functions. resolves #710.
2015-02-27 22:04:13 -05:00
Bailey Ling
1ca6ffb6d0 happy 2015
resolves #692.
2015-02-13 21:47:43 -05:00
Bailey Ling
13ee9f456a address syntax errors
resolves #683
2015-01-03 19:38:17 -05:00
Quinn Strahl
30df99a681 Don't wipe out b:airline_head if fugitive finds the head
- Fugitive can edit virtual files that represent objects in git; while
  editing these files, it still reports on the HEAD of the relevant
  repo, which should be displayed as the branch (rather than having the
  branch section disappear)
2014-08-25 09:51:52 -04:00
Andrew Gregory
83a7e30790 use commit hash as git branch with detached HEAD
Abbreviated to 7 characters to match `git rev-parse --short HEAD`.
2014-08-20 18:59:15 -04:00
Ben Joldersma
4f904ab0d4 Fix #462 - Configurable head limit. 2014-05-21 10:41:53 -07:00
Johnathan
9e8fe7a98e doesn't assume user has 'set autochdir' set 2014-04-24 03:03:03 +10:00
Bailey Ling
a37f0b9ae0 restore original directory change detection. also resolves #474. 2014-04-03 00:54:43 +00:00
Bailey Ling
d111e4edb3 remove usage of fugitive#detect as per request
https://github.com/tpope/vim-fugitive/issues/463
2014-04-01 16:45:06 -04:00
Russell Hancox
13297cee03 Add CursorHold autocmd to unset airline_head 2014-03-28 10:53:13 -04:00
Russell Hancox
25059d43b1 Save branch head to a buffer variable
Save branch head to a buffer-local variable to prevent looking up the VCS head for every status line refresh.
2014-03-24 14:01:31 -04:00
Paweł Więcek
5e25794d4b Correctly detect mercurial repos using lawrencium 2014-02-25 22:36:36 +01:00
Bailey Ling
fae68dbcb7 account for possibilty of branch extension unavailable. resolves #419. 2014-01-20 12:39:33 -05:00
Bailey Ling
baed8ac063 happy 2014 2014-01-19 23:44:44 -05:00
Rich Alesi
6141a59278 Allow changes to airline_symbols.branch after init
If the user updates the airline_symbols.branch variable later in the vimrc, the value will not update after the initial init.  Since these variables are only used in the get_head() function, I moved them locally within the function to allow evaluation on each instance.
2014-01-15 21:31:07 -07:00
Bailey Ling
0966b693d9 expose cleaner api to determine empty head. 2013-12-03 05:32:54 +00:00
Bailey Ling
253974506a disable vcscommand integration by default. resolves #340. 2013-11-12 09:45:04 -05:00
David Zderic
2e8f99d39b Use VCSCommand to display revision if available 2013-11-08 10:39:00 +11:00
Bailey Ling
a8c96b6020 parse out submodule path when not in a .git directory (#273). 2013-10-02 10:18:33 -04:00
Bailey Ling
2735282992 account for different git submodule format. resolves #273. 2013-10-01 21:36:24 -04:00
Bailey Ling
948a4178a8 use code 160 for space to fix rendering problems. 2013-09-18 22:23:50 -04:00
Bailey Ling
59e4ab49ce fix windows path separator parsing (#251). 2013-09-13 19:15:01 +00:00
Bailey Ling
3a5a40730a check guard for all extensions. resolves #241. 2013-09-10 15:40:54 +00:00
Bailey Ling
4c6aa4401b check the git/hg root when changing buffers. resolves #237. 2013-09-08 14:03:49 +00:00
Bailey Ling
d268744077 test the layout config for the default extension. 2013-08-30 22:44:20 -04:00
Bailey Ling
fa517238c7 introduce parts metadata. 2013-08-30 21:51:10 +00:00
Bailey Ling
bdd758dd38 convert branch/hunks/bufferline to function names. 2013-08-29 00:15:07 +00:00
Bailey Ling
2708951715 place hunks and branch extension into parts. 2013-08-27 23:22:26 +00:00
Bailey Ling
d5d87d2cdc reduce variable deprecation. 2013-08-27 14:12:03 +00:00
Bailey Ling
6dd4cd5423 clean up how symbols are defined. 2013-08-26 23:39:25 -04:00
Jacob Walker
3920817442 Better toggling of powerline fonts
+ Check the value of airline_powerline_fonts not just existence
2013-08-22 09:14:17 -05:00
Bailey Ling
494d15232c reduce pollution of global scope variables 2013-08-20 03:38:02 +00:00
Bailey Ling
7e563f9c74 detect branch when changing directories. resolves #138. 2013-08-18 18:34:02 +00:00
Bailey Ling
0a88fd81d3 update branch head all the time (#42). 2013-08-18 17:22:35 +00:00
Bailey Ling
2a10bfc32f make the mode and branch text window local 2013-08-11 13:42:47 +00:00
Bailey Ling
35539b2667 customizable empty branch message. closes #121. 2013-08-09 20:12:56 +00:00
Bailey Ling
e858eaa990 fix branch detection 2013-08-06 00:42:59 -04:00
Bailey Ling
990e3fc949 make branch/bufferline default statusline rather than overrides 2013-08-06 00:35:07 -04:00
Bailey Ling
98f3d13705 do not overwrite when left only 2013-08-06 03:33:25 +00:00
Bailey Ling
9c960875fe extract fugitive/lawrencium 2013-08-06 03:07:01 +00:00