Commit graph

54 commits

Author SHA1 Message Date
Matthew Judy
574ee6dc1c Port #1071 to master (fatal errors emitted by untracked file check in vcs.zsh) 2018-11-17 17:13:25 -05:00
Dominik Ritter
fd660f4b92 Fix checking for untracked files
Now the untracked files are always checked from
the root folder of the repo.
2018-11-12 00:24:29 +01:00
Dominik Ritter
a6e60def4b Fix stashes display
Changing directories while checking for untracked files broke
the display of git stashes. The hook was not called any more.
This is why we disabled checking for untracked files within a
.git folder.
2018-11-12 00:15:52 +01:00
Dominik Ritter
645b974677 Fix error if user cds into a .git directory
In this case is was previously not possible to get the untracked
status. Now we temporarily change the directory to the repo root
folder and then get the list of untracked files.
2018-11-12 00:13:35 +01:00
Dominik Ritter
a90258a9ee Avoid warning when inside of .git dir
We cannot detect untracked files when we are inside of
a .git directory.
2018-11-11 23:17:33 +01:00
Dominik Ritter
3256258ebf Count stashes via ZSH 2018-11-11 23:16:44 +01:00
Dominik Ritter
2038e2650c Avoid aliases 2018-11-06 01:12:19 +01:00
Dominik Ritter
48f0cc11ef Get rid of externals when truncating branch name 2018-11-06 01:11:31 +01:00
Dominik Ritter
c3f9d04354 When checking for untracked or modified files, take submodules into account 2018-11-03 03:23:23 +01:00
Dominik Ritter
44b4b66925 Speedup VCS segment
Now the untracked files are detected via `git ls-files`, which is
much faster than `git status`. Additionally, we flipped the default
for checking submodules. They are now NOT checked by default, as most
users probably do not use git submodules.
2018-11-03 03:21:47 +01:00
Dominik Ritter
d07507c1eb Make use of git dir determined by VCS_INFO subsystem
instead of determine the git dir manually.
2018-11-03 03:11:51 +01:00
Dominik Ritter
9a67ca5bc3 Get branch name from VCS_INFO subsystem when collecting remote branch 2018-11-03 03:10:53 +01:00
Dominik Ritter
fea5f616d1 Get branch name from VCS_INFO subsystem when collecting ahead/behind info 2018-11-03 03:08:32 +01:00
Dominik Ritter
cd0ad84b01 Get rid of wc dependency when showing ahead/behind info 2018-11-03 03:06:49 +01:00
Dominik Ritter
154e923033 Merge remote-tracking branch 'floor114/next' into staging_065 2018-06-06 23:52:15 +02:00
Dominik Ritter
45ae153700 Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into staging_065
Conflicts were:
- functions/vcs.zsh: Two commits avoided wrapper behaviour. #685
in grep, #797 in git.
2018-06-06 23:48:11 +02:00
Taras Shpachenko
111d152d48 Add vcs branch name truncating. 2018-04-12 18:11:23 +03:00
Guilherme Cassolato
1aee125470 Fixes wrapper slowness in vcs segment 2018-04-11 17:21:33 +02:00
Tim Otlik
bba8bb883e
add check of /etc/os-release for linux distros 2018-02-16 16:45:09 +01:00
Ben Hilburn
ea05b4ebe6 Merge branch 'master' into next 2017-12-14 15:20:02 -05:00
Daniel Porter
cbc7199dc4 Add Stash naming support for Bitbucket Server 2017-11-30 12:10:28 +00:00
Kentaro Hayashi
f154e75667 Disable alias of grep
If user defined alias of grep command with '-r' or '--recursive'
option, it causes a slow response of command line. It is not
unexpected behavior of vcs info.

This commit explicitly disables alias of grep to suppress side
effects.
2017-11-27 15:15:44 +09:00
David Paz
b59d73c039 Hide error when no origin in git repo
Fix git ls-remote call to match as in sugessted code for redirect
error to null.
2017-02-24 10:12:35 +01:00
Ben Hilburn
3a3238444d Merge pull request #360 from davidmpaz/icon_by_repo
Display different icons depending on remote type in VCS segment.
2016-12-21 10:22:13 -05:00
David Paz
f2cac2273a Assign git service icon depending on repo origin
Check git origin url to search for well know services. Return
proper icon if service found, if not return "git" icon from
font-awesome icon set
2016-12-15 13:08:21 +01:00
Ben Hilburn
3326353b10 Merge branch 'master' into next 2016-10-26 11:08:53 -04:00
Matt Traynham
bddbdd62e8 Fix '+vi-svn-detect-changes:local:1: not valid in this context' 2016-10-19 09:35:23 -04:00
Ben Hilburn
3f1f11a1f1 bugfix: typo in "POWERLEVEL9K" broke the VCS tag display 2016-09-26 13:54:43 -04:00
Ben Hilburn
683ca10e36 vcs: adding detection of unstaged / staged for svn repos 2016-08-30 20:44:07 -04:00
Christian Rebischke
3b0da2c348 fixed svn-detect-changes().. the svn prompt has now the same behaviour as the git prompt.. 2016-08-30 20:41:51 -04:00
Christian Rebischke
e134c70bc1 swapped half and full dirty in svn-detect-changes 2016-08-30 20:41:51 -04:00
Christian Rebischke
62e41ada1f added vi-svn-detect-changes() in functions/vcs.zsh 2016-08-30 20:41:51 -04:00
Ben Hilburn
3291b4d476 Merging ability to hide tags from VCS segment. 2016-07-12 20:28:01 -04:00
Chris Hudson
ef2d01a2aa Added POWERLEVEL9K_VCS_HIDE_TAGS variable to control displaying of vcs tags in segment 2016-07-07 22:40:26 +01:00
Dominik Ritter
7b2e995299 Fix truncation of changeset in detached tag mode 2016-04-17 18:03:31 +02:00
Ben Hilburn
a09eda6774 Fixing comments in vi-git
-tagname
2016-04-12 10:54:10 -04:00
Ben Hilburn
0f4e3e7588 git-tagname: Now showing hash/branchname when sitting on a tag 2016-04-12 10:43:34 -04:00
Ben Hilburn
6fde7bf3fd git-tagname: reducing conditionals in logic 2016-04-12 10:42:34 -04:00
Niccolò Maggioni
14e213bd68
Weird conditions handling
Become a programmer, they said. It'll be fun, they said.
2016-04-11 23:02:58 +02:00
Niccolò Maggioni
ce16b087c6
Avoid tag/branch duplication if same value 2016-04-11 21:37:28 +02:00
Niccolò Maggioni
1ab41d9a6c
Better DETACHED_HEAD detection 2016-03-25 10:51:33 +01:00
Niccolò Maggioni
4fdf5df258
Documentation 2016-03-22 18:24:34 +01:00
Niccolò Maggioni
89fefbdf6e
DETACHED_HEAD handling 2016-03-22 17:51:01 +01:00
Niccolò Maggioni
b46a96a7ce
Git tag not replacing branch 2016-03-22 17:29:34 +01:00
Dominik Ritter
cb5d33affb Fix untracked state of the vcs segment 2016-02-26 15:53:14 +01:00
Dominik Ritter
a1ef6548d5 Fix dynamic coloring of VCS segment
The VCS segment had a lot of own color definitions. Now they are all
gone, so that the only color definitions are when the segment gets
printed.
2016-02-18 18:27:32 +01:00
Ben Hilburn
94c87a4d23 Reflect submodule status in VCS prompty by default. 2016-02-17 17:09:54 -08:00
Sebastien Varrette
52982e3f63 mention to git_compare_version
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-09 14:22:47 +01:00
Sebastien Varrette
0fd9d277f9 correct half-dirty detection -- restrict to untracked files
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-09 14:09:33 +01:00
Sebastien Varrette
56bc1b3f47 dirty check even in subdirs
Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
2016-02-08 17:14:28 +01:00