aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* accidentally reopened #943, fixed nowGravatar David Adam (zanchey)2013-08-07
|
* docs: add editor documentation, move binding informationGravatar David Adam (zanchey)2013-08-07
| | | | | closes #931 also fixes a crossreference error
* git_prompt: Default upstream_prefix to nothingGravatar Kevin Ballard2013-08-05
| | | | | | 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.
* git_prompt: Fix bad test if bash.showUntrackedFiles isn't setGravatar Kevin Ballard2013-08-05
|
* .gitignore: ignore generated source docs, don't ignore Doxyfile.helpGravatar David Adam (zanchey)2013-08-05
| | | | Doxyfile.help isn't generated
* Fixes broken link in docs. Fixes #943Gravatar Gennadiy Zlobin2013-08-04
|
* git_prompt: Make informative separator configurableGravatar Brian Gernhardt2013-07-30
| | | | | | 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.
* git_prompt: Change informative character defaultsGravatar Brian Gernhardt2013-07-30
| | | | | | | | | | | 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
* git_prompt: Show upstream with informative statusGravatar Brian Gernhardt2013-07-30
| | | | | | 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.
* git_prompt: Informative upstream with informative statusGravatar Brian Gernhardt2013-07-30
| | | | | This makes $__fish_git_prompt_showupstream = "auto" mean "informative" instead of "git" if $__fish_git_prompt_show_informative_status is set.
* builtin_test: drop unused condstrGravatar David Adam (zanchey)2013-07-29
|
* documentation for test and function (closes: #734)Gravatar David Adam (zanchey)2013-07-29
| | | | | | | plus speling in documentation for bind. Note that this commit does not re-enable the generation of the manpage for test, which will therefore still fall through to the system manual page with `man test`.
* Rename STYLEGUIDE.md to CONTRIBUTING.md, so GitHub would notice it.Gravatar Konrad Borowski2013-07-28
|
* Remove useless debugging codeGravatar Konrad Borowski2013-07-27
|
* git_prompt: fix non-informative upstreamGravatar Brian Gernhardt2013-07-27
| | | | | `test -n informative` will always succeed. We want to test the informative variable instead so that other modes can still work.
* git_prompt: Repaint when show_informative_status is changedGravatar Brian Gernhardt2013-07-27
|
* git_prompt: Fix resetting colors in informative_statusGravatar Brian Gernhardt2013-07-27
|
* Highlight incorrect use of command or execGravatar Konrad Borowski2013-07-27
|
* Ctrl+E should insert suggested completion and then go to end of lineGravatar waterhouse2013-07-27
| | | | | | | | | | | (Closes #91, #932) Currently, control-E is bound to `end-of-line`. This patch modifes the `end-of-line` procedure so that, if it is invoked when the cursor is at the end of a command and there is pending completion text, it will accept the completion text and move to the end. The behavior of `end-of-line` will not otherwise be altered.
* git-prompt: Document informative_status changesGravatar Brian Gernhardt2013-07-26
|
* git-prompt: Move status_order to near informative_statusGravatar Brian Gernhardt2013-07-26
| | | | | | 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.
* git-prompt: Ensure repaint on all char and color changesGravatar Brian Gernhardt2013-07-26
| | | | | | | 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.
* git_prompt: don't save output of ls-files for untracked filesGravatar Brian Gernhardt2013-07-26
| | | | | based on git.git 14d7649: "bash prompt: avoid command substitution when checking for untracked files"
* git_prompt: Call `git rev-parse` less oftenGravatar Brian Gernhardt2013-07-26
| | | | | | | | | | | | 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
* git_prompt: remove __fish_git_prompt_git_dirGravatar Brian Gernhardt2013-07-26
| | | | | | | | 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()"
* git_prompt: print unique detached HEAD abbreviated object nameGravatar Brian Gernhardt2013-07-26
| | | | | | | | | | 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"
* git_prompt: Display head for simple rebaseGravatar Brian Gernhardt2013-07-26
| | | | based on git.git 1306321: "prompt: fix for simple rebase"
* git_prompt: Add __fish_git_prompt_char_stateseparatorGravatar Brian Gernhardt2013-07-26
| | | | | | | | 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
* git_prompt: show where rebase is at when stoppedGravatar Brian Gernhardt2013-07-26
| | | | | | | 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_prompt: use REVERT_HEADGravatar Brian Gernhardt2013-07-26
| | | | | | | 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
* git_prompt: add bash.showUntrackedFiles optionGravatar Brian Gernhardt2013-07-26
| | | | | The option was added in git.git 66cb5d4, so pay attention to it like we do the other bash.* options.
* git_prompt: __fish_git_prompt_showcolorhintsGravatar Brian Gernhardt2013-07-26
| | | | | | | | | | | | 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
* git_prompt: Add defaults to set_colorGravatar Brian Gernhardt2013-07-26
| | | | | | | 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.
* git_prompt: Expand color/character explinationsGravatar Brian Gernhardt2013-07-26
| | | | | This will be getting more complicated when I add the showcolorhint option from git.git.
* git_prompt: Update documentationGravatar Brian Gernhardt2013-07-26
| | | | | | | | | | | | | | | | | | | * 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.
* git_prompt: Add branch information for rebaseGravatar Brian Gernhardt2013-07-26
|
* git_prompt: Merge operation, branch, and bare helpersGravatar Brian Gernhardt2013-07-26
| | | | | | | | | | | | | 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.
* git_prompt: Reorder show_upstream to match originalGravatar Brian Gernhardt2013-07-26
| | | | | | 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.
* Fix make command completion. Fixes issue #928.Gravatar Konrad Borowski2013-07-25
| | | | | Previously, TAB on make CC=/us caused CC=/us/usr/ to appear. This commit fixes this, by properly removing part after equals sign.
* Next stab at abbreviations. Highlighting should work.Gravatar ridiculousfish2013-07-19
|
* Initial abbreviation work. Tests currently fail.Gravatar ridiculousfish2013-07-19
|
* Avoid standard command not found message when command-not-found is foundGravatar Konrad Borowski2013-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Fix canto completionGravatar Konrad Borowski2013-07-19
| | | | -d option was forgotten, causing error for last complete command
* Add completion for canto.Gravatar Johann Weging2013-07-19
|
* Merge pull request #915 from GlitchMr/fix-printfGravatar Konrad Borowski2013-07-19
|\ | | | | printf '\0' now works. Fixes #908.
* | Fixed ftp completionsGravatar Siteshwar Vashisht2013-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * printf '\0' now works. Fixes #908.Gravatar Konrad Borowski2013-07-17
| |
* | Make parse_util_locate_cmdsubst return the innermost command substitution ↵Gravatar ridiculousfish2013-07-17
| | | | | | | | | | | | instead of the outermost. Fixes https://github.com/fish-shell/fish-shell/issues/913
* | Use \x1B instead of \e.Gravatar Konrad Borowski2013-07-16
| |
* | Fix some warnings exposed by -WallGravatar ridiculousfish2013-07-16
| |