| Commit message (Collapse) | Author | Age |
|
|
|
|
|
| |
git.git's __git_ps1 doesn't have an upstream prefix. I'm not sure why
one was added to our __fish_git_prompt, but it certainly shouldn't
default to a space.
|
| |
|
|
|
|
|
|
| |
It reuses $__fish_git_prompt_char_stateseparator, since it has a
similar meaning and goes otherwise unused when
$__fish_git_prompt_show_informative_status is set.
|
|
|
|
|
|
|
|
|
|
|
| |
This changes the defaults for several characters when
$__fish_git_prompt_show_informative_status is set so that the prompt
looks more like the typical informative prompt.
Before: (master >1<2|+3#4*5%6)
After: (master↑1↓2|●3✖4✚5…6)
The defaults were taken from magicmonty/bash-git-prompt
|
|
|
|
|
|
| |
This makes $__fish_git_prompt_show_informative_status imply
$__fish_git_prompt_showupstream = "informative", while adding a none
option for showupstream to disable it if desired.
|
|
|
|
|
| |
This makes $__fish_git_prompt_showupstream = "auto" mean "informative"
instead of "git" if $__fish_git_prompt_show_informative_status is set.
|
|
|
|
|
| |
`test -n informative` will always succeed. We want to test the
informative variable instead so that other modes can still work.
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
It's easy to forget the definition of ___fish_git_prompt_status_order
when there are dozens of lines between where it is defined and where
it is used.
|
|
|
|
|
|
|
| |
A few characters and colors got added without being added to the event
list for repainting.
Also sort and re-align list of characters in validate_chars.
|
|
|
|
|
| |
based on git.git 14d7649: "bash prompt: avoid command substitution
when checking for untracked files"
|
|
|
|
|
|
|
|
|
|
|
|
| |
The code invoked `git rev-parse` several times when the required
information could be collected all at once.
This is based on the following commits from git.git:
efaa0c1: bash prompt: combine 'git rev-parse' executions in the main code path
e3e0b93: bash prompt: combine 'git rev-parse' for detached head
0f37c12: bash prompt: use bash builtins to check for unborn branch for dirty state
dd0b72c: bash prompt: use bash builtins to check stash state
|
|
|
|
|
|
|
|
| |
It's a one line function called in a single place. I suspect it only
existed because the bash equivalent __gitdir existed (it was more
complex), but that function no longer exists either, as of git.git
511ad15: "bash prompt: run 'git rev-parse --git-dir' directly instead
of __gitdir()"
|
|
|
|
|
|
|
|
|
|
| |
Simply using cut duplicates (poorly) `git rev-parse --short`
This also restores the ... printed after the abbreviation which
__fish_git_prompt had been missing.
Based on git.git e8f21ca: "bash prompt: print unique detached HEAD
abbreviated object name"
|
|
|
|
| |
based on git.git 1306321: "prompt: fix for simple rebase"
|
|
|
|
|
|
|
|
| |
Unlike the rest of the __fish_git_prompt_char_* variables, it does not
have its own color because the most likely values are a space and
nothing.
based on git.git 15a54fb: prompt: introduce GIT_PS1_STATESEPARATOR
|
|
|
|
|
|
|
| |
Adds a progress indicator to the rebase messages. (e.g. |REBASE 2/5)
based on the git-prompt portion of git.git b71dc3e: "bash-prompt.sh:
show where rebase is at when stopped"
|
|
|
|
|
|
|
| |
git revert was taught to revert multiple commits, and it stores it
branch information in REVERT_HEAD just like the other *_HEAD files.
based on git.git 3ee4452: bash: teach __git_ps1 about REVERT_HEAD
|
|
|
|
|
| |
The option was added in git.git 66cb5d4, so pay attention to it like
we do the other bash.* options.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Based on GIT_PS1_SHOW_COLORHINTS, it introduces more color by default
and also changes the color of the branch name based on if it is a real
branch or detached.
Based on the following commits from git.git:
9b7e776: show color hints based on state of the git tree
9b3aaf8: Fix up colored git-prompt
76c36c0: coloured git-prompt: paint detached HEAD marker in red
|
|
|
|
|
|
|
| |
This is mostly useful for the next commit that will have different
colors default to different values, but it has one immediate change:
all __fish_git_prompt_color_* variables now default to
__fish_git_prompt_color instead of to nothing, as they used to.
|
|
|
|
|
| |
This will be getting more complicated when I add the showcolorhint
option from git.git.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* The original __git_ps1 function has split from the rest of
git-completion as of git.git af31a45
* Use the description for GIT_PS1_DESCRIBE_STYLE (added in git.git
50b03b0) for __fish_git_prompt_describe_style
* Update the description of __fish_git_prompt_showupstream to include
the meaning of '=' based on git.git f9db192: "Improve the
description of GIT_PS1_SHOWUPSTREAM"
* Note that the PROMPT_COMMAND versions of the command with extra
arguments don't work, in case someone used to the bash version is
looking for it.
* Note that I am updating the script so Kevin Ballard doesn't get
blamed for anything I break.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Operation and branch detection are merged together in the original
because branch information may come from different places depending on
the operation.
Merging the bare helper in helps avoid testing for the working
directory and bare status twice, both of which requires forking a new
process.
Also helps the code match the original more, which will make adding
new features easier.
|
|
|
|
|
|
| |
This makes it easier to see if there are any changes. Also it puts
all of the extra functionality together instead of mixed in with
everything else.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Squashed commit of the following:
commit c208bc30b7747b3743212483b3dd7e3f90819f49
Merge: 97bea94 2633372
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Fri Jul 19 09:56:12 2013 +0200
Merge branch 'command-not-found' of git://github.com/GlitchMr/fish-shell into command-not-found
commit 26333721b9048333d1e7932505c221a31fd0e624
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Fri Jul 19 09:55:13 2013 +0200
Fix command_not_found when not found
commit db34460bb51a4b1c1c456c2e535ae8d913d1071e
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Wed Jul 17 13:41:57 2013 +0200
Avoid showing standard command not found message when possible
In bash, command-not-found handler causes the standard messages to
not appear. Because of events model in fish, it isn't really an
option, so I moved the standard command not found message to
fish function. This way, the messages aren't repeated, and the
standard command not found message appears only when handler
couldn't be found.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Merged pull request at https://github.com/fish-shell/fish-shell/pull/919
Squashed commit of the following:
commit c0662a9d4da12ba49ffe1dddc918533f8a52b91f
Author: Siteshwar Vashisht <siteshwar@gmail.com>
Date: Thu Jul 18 21:23:42 2013 +0530
Added missing quote in ftp completions
commit 9ef408d0390f13be3adc02be62daae3e0f114843
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Thu Jul 18 15:33:57 2013 +0200
Make punctuation consistent properly. Fixes #918.
commit ea26da0f8284fa39dc143e3d2ad088403fa6b2ed
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Thu Jul 18 15:29:02 2013 +0200
Revert "make punctuation consistent"
This reverts commit 993c02857948b45e5d17cc2696f347c73b3a450d.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
* Added FreeBSD's pkg to __fish_print_packages
* Portmaster completes on installed packages and ports
* Options list as per fish_generate_completions, needs to be tidied
up further but will suffice for now
|
|
|
|
|
|
| |
$git_dir was never set in __fish_git_prompt_current_branch, but used
in the case of a detached HEAD. This caused `cut -c1-7 $git_dir/HEAD`
to expand to `cut -c1-7` which then waited for input.
|
|
|
|
| |
Fixes https://github.com/fish-shell/fish-shell/issues/780
|
|
|
|
|
|
|
| |
The code in question displays GIT_DIR! if the user is inside the .git
directory of a repository that has a working directory. Several git
commands won't work in that situation, so it's useful to warn the
user.
|
| |
|
|
|
|
|
|
| |
Normally I wouldn't bother, but it was difficult to follow the nested
if statements. Most of the file used tabs, so replaced all leading
spaces with the appropriate amount of tabs.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 5a577d970a293afe320b6c3280c10c2bd8a1ff50
Merge: 908b075 96941b3
Author: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sat Jun 1 22:59:16 2013 -0700
Merge branch 'dotdir-two-chars' of git://github.com/GlitchMr/fish-shell into GlitchMr-dotdir-two-chars
commit 96941b3a92e5d7e9dd230e4797ee71285700a41f
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Sat May 25 09:55:43 2013 +0200
Support BSD sed
commit 60652c2bd2d1bbce26c90a010913f0f0d8e9365f
Author: Konrad Borowski <glitchmr@myopera.com>
Date: Sun May 19 10:58:40 2013 +0200
Show first two characters for dotdirs. Fixes #754.
|
| |
|
|
|
|
| |
Fixes #73
|