From f4c442e7d64286914a09505770f3888be768622c Mon Sep 17 00:00:00 2001
From: mj <mj@str8.biz>
Date: Tue, 24 Nov 2015 23:12:52 +0100
Subject: [PATCH] Squashed 'repos/robbyrussell/oh-my-zsh/' changes from
 e44aa50..22632aa
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

22632aa Merge pull request #3859 from gnagy/master
249d222 Cleanup gradle plugin file
950bbcc gradle plugin: also list tasks in subprojects
64e1252 Merge pull request #4623 from apjanke/dircycle-remove-redundant-bindings
5d8fd93 Merge pull request #4617 from ahmadawais/patch-1
7627004 Merge pull request #4612 from stereodenis/patch-1
5289edc Merge pull request #4592 from jstnlef/fix-weird-unstaged-behavior
c120417 Merge pull request #4619 from apjanke/mercurial-readme-tweak
c8e280f dircycle: remove redundant key bindings
8f823c6 Update README.md
cca422e Mercurial plugin: revise README
602cc62 Removed Similar Aliases
bee79f0 bundle outdated alias
135c376 Merge pull request #4563 from danhawkins/master
9041a23 Merge pull request #4598 from syk0saje/patch-1
06db648 typo: able take -> able to take
76c4238 I noticed that for certain projects with unstaged changed I would get a 'U' character instead of the '●' character. This should fix that.
8d388e4 use capit instead of shipit as shipit conflicts with npm package shipit

git-subtree-dir: repos/robbyrussell/oh-my-zsh
git-subtree-split: 22632aac7c99e02ec38223c84b2348435a82d1b5
---
 README.markdown                          |  2 +-
 plugins/bundler/bundler.plugin.zsh       |  1 +
 plugins/capistrano/_capistrano           |  6 ++---
 plugins/capistrano/capistrano.plugin.zsh |  2 +-
 plugins/dircycle/dircycle.plugin.zsh     | 16 ++++++-------
 plugins/gradle/gradle.plugin.zsh         | 40 +++++++-------------------------
 plugins/mercurial/README.md              | 24 ++++++++-----------
 plugins/wp-cli/README.md                 |  4 ++--
 plugins/wp-cli/wp-cli.plugin.zsh         |  4 ++--
 themes/agnoster.zsh-theme                |  4 ++--
 10 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/README.markdown b/README.markdown
index cee314d..6007d65 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,7 +3,7 @@
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again.
 
-__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
+__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able to take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often.
 
 To learn more, visit [ohmyz.sh](http://ohmyz.sh) and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
 
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index dfff695..382a1a4 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -2,6 +2,7 @@ alias be="bundle exec"
 alias bl="bundle list"
 alias bp="bundle package"
 alias bo="bundle open"
+alias bout="bundle outdated"
 alias bu="bundle update"
 alias bi="bundle_install"
 alias bcn="bundle clean"
diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
index c19c20b..a79e47b 100644
--- a/plugins/capistrano/_capistrano
+++ b/plugins/capistrano/_capistrano
@@ -1,7 +1,7 @@
-#compdef shipit
+#compdef capit
 #autoload
 
-# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
+# Added `capit` because `cap` is a reserved word. `cap` completion doesn't work.
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
 local curcontext="$curcontext" state line ret=1
@@ -14,7 +14,7 @@ _arguments -C \
 _cap_tasks() {
   if [[ -f config/deploy.rb || -f Capfile ]]; then
     if [[ ! -f .cap_tasks~ ]]; then
-      shipit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
+      capit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~
     fi
 
     OLD_IFS=$IFS
diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh
index c85eb47..0b55597 100644
--- a/plugins/capistrano/capistrano.plugin.zsh
+++ b/plugins/capistrano/capistrano.plugin.zsh
@@ -1,7 +1,7 @@
 # Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work.
 # http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module
 
-func shipit() {
+func capit() {
   if [ -f Gemfile ]
   then
     bundle exec cap $*
diff --git a/plugins/dircycle/dircycle.plugin.zsh b/plugins/dircycle/dircycle.plugin.zsh
index 1e31105..8a406b5 100644
--- a/plugins/dircycle/dircycle.plugin.zsh
+++ b/plugins/dircycle/dircycle.plugin.zsh
@@ -27,11 +27,11 @@ insert-cycledright () {
 zle -N insert-cycledright
 
 
-# add key bindings for iTerm2
-if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-	bindkey "^[[1;6D" insert-cycledleft
-	bindkey "^[[1;6C" insert-cycledright
-else
-	bindkey "\e[1;6D" insert-cycledleft
-	bindkey "\e[1;6C" insert-cycledright
-fi
\ No newline at end of file
+# These sequences work for xterm, Apple Terminal.app, and probably others.
+# Not for rxvt-unicode, but it doesn't seem differentiate Ctrl-Shift-Arrow
+# from plain Shift-Arrow, at least by default.
+# iTerm2 does not have these key combinations defined by default; you will need
+# to add them under "Keys" in your profile if you want to use this. You can do
+# this conveniently by loading the "xterm with Numeric Keypad" preset.
+bindkey "\e[1;6D" insert-cycledleft
+bindkey "\e[1;6C" insert-cycledright
diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh
index 661c29d..a908eae 100644
--- a/plugins/gradle/gradle.plugin.zsh
+++ b/plugins/gradle/gradle.plugin.zsh
@@ -1,4 +1,3 @@
-#!zsh
 ##############################################################################
 # A descriptive listing of core Gradle commands
 ############################################################################
@@ -54,22 +53,11 @@ function _gradle_arguments() {
 
 
 ##############################################################################
-# Are we in a directory containing a build.gradle file?
-############################################################################
-function in_gradle() {
-    if [[ -f build.gradle ]]; then
-        echo 1
-    fi
-}
-
-############################################################################## Examine the build.gradle file to see if its
-# timestamp has changed, and if so, regen
-# the .gradle_tasks cache file
+# Examine the build.gradle file to see if its timestamp has changed;
+# and if so, regenerate the .gradle_tasks cache file
 ############################################################################
 _gradle_does_task_list_need_generating () {
-  [ ! -f .gradletasknamecache ] && return 0;
-  [ build.gradle -nt .gradletasknamecache ] && return 0;
-  return 1;
+  [[ ! -f .gradletasknamecache ]] || [[ build.gradle -nt .gradletasknamecache ]]
 }
 
 
@@ -77,22 +65,22 @@ _gradle_does_task_list_need_generating () {
 # Discover the gradle tasks by running "gradle tasks --all"
 ############################################################################
 _gradle_tasks () {
-  if [ in_gradle ]; then
+  if [[ -f build.gradle ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-     gradle tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+      gradle tasks --all | awk '/[a-zA-Z0-9:-]* - / {print $1}' > .gradletasknamecache
     fi
-    compadd -X "==== Gradle Tasks ====" `cat .gradletasknamecache`
+    compadd -X "==== Gradle Tasks ====" $(cat .gradletasknamecache)
   fi
 }
 
 _gradlew_tasks () {
-  if [ in_gradle ]; then
+  if [[ -f build.gradle ]]; then
     _gradle_arguments
     if _gradle_does_task_list_need_generating; then
-     ./gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache
+      ./gradlew tasks --all | awk '/[a-zA-Z0-9:-]* - / {print $1}' > .gradletasknamecache
     fi
-    compadd -X "==== Gradlew Tasks ====" `cat .gradletasknamecache`
+    compadd -X "==== Gradlew Tasks ====" $(cat .gradletasknamecache)
   fi
 }
 
@@ -102,13 +90,3 @@ _gradlew_tasks () {
 ############################################################################
 compdef _gradle_tasks gradle
 compdef _gradlew_tasks gradlew
-
-
-##############################################################################
-# Open questions for future improvements:
-# 1) Should 'gradle tasks' use --all or just the regular set?
-# 2) Should gradlew use the same approach as gradle?
-# 3) Should only the " - " be replaced with a colon so it can work
-#     with the richer descriptive method of _arguments?
-#     gradle tasks | grep "^[a-zA-Z0-9]*\ -\ " | sed "s/ - /\:/"
-#############################################################################
diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 89e1c17..f42212d 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -2,23 +2,20 @@
 ### Usage
 Update .zshrc:
 
-1. Add name to the list of plugins, e.g. `plugins = (..., mercurial, ...)`
+1. Add name to the list of plugins, e.g. `plugins=(... mercurial ...)`
    (that is pretty obvious).
-2. Change PROMPT variable of current theme to contain current folder mercurial repo info:
+2. Switch to a theme which uses `hg_prompt_info`.
 
-   robbyrussel theme is used by default, so you need to modify PROMPT var
-   from [this file](https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/robbyrussell.zsh-theme)
-   by adding `$(hg_prompt_info)` after `$(git_prompt_info)`, so currently it
-   looks next:
+   Or, customize the `$PROMPT` variable of your current theme to contain current folder mercurial repo info. This can be done by putting a custom version of the theme in `$ZSH_CUSTOM` or by changing `$PROMPT` in `.zshrc` after loading the theme.
 
-   ```diff
-   - PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-   + PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(hg_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+   The `robbyrussell` theme is used by default, so you need to modify `$PROMPT` var by adding `$(hg_prompt_info)` after `$(git_prompt_info)`, so it looks like this:
+
+   ```zsh
+   PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(hg_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
    ```
-   
-   and put modified var at the end of **.zshrc**.
+
 3. Initialize additional vars used in plugin. So in short put next in **.zshrc**:
-   
+
    ```
    ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[magenta]%}hg:(%{$fg[red]%}"
    ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}"
@@ -55,8 +52,7 @@ Update .zshrc:
 #### Displays repo branch and directory status in prompt
 This is the same as git plugin does.
 
-**Note**: additional changes to **.zshrc** are required in order for this to
-work.
+**Note**: Additional changes to **.zshrc**, or using a theme designed to use `hg_prompt_info`, are required in order for this to work.
 
 ### Mantainers
 [ptrv](https://github.com/ptrv) - original creator
diff --git a/plugins/wp-cli/README.md b/plugins/wp-cli/README.md
index 6dda07d..1a79d60 100644
--- a/plugins/wp-cli/README.md
+++ b/plugins/wp-cli/README.md
@@ -43,7 +43,7 @@ WP-CLI is a set of command-line tools for managing WordPress installations. You
 - wpps='search'
 - wppst='status'
 - wppt='toggle'
-- wppu='uninstall'
+- wppun='uninstall'
 - wppu='update'
 
 ### Post
@@ -55,7 +55,7 @@ WP-CLI is a set of command-line tools for managing WordPress installations. You
 - wppol='wp post list'
 - wppom='wp post meta'
 - wppou='wp post update'
-- wppou='wp post url'
+- wppourl='wp post url'
 
 ### Sidebar
 - wpsbl='wp sidebar list'
diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 6c70a7a..7b41c32 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -63,7 +63,7 @@ alias wppp='wp plugin path'
 alias wpps='wp plugin search'
 alias wppst='wp plugin status'
 alias wppt='wp plugin toggle'
-alias wppu='wp plugin uninstall'
+alias wppun='wp plugin uninstall'
 alias wppu='wp plugin update'
 
 # Post
@@ -75,7 +75,7 @@ alias wppog='wp post get'
 alias wppol='wp post list'
 alias wppom='wp post meta'
 alias wppou='wp post update'
-alias wppou='wp post url'
+alias wppourl='wp post url'
 
 # Rewrite
 
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index e54346a..a6bb9c6 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -36,7 +36,7 @@ CURRENT_BG='NONE'
   local LC_ALL="" LC_CTYPE="en_US.UTF-8"
   # NOTE: This segment separator character is correct.  In 2012, Powerline changed
   # the code points they use for their special characters. This is the new code point.
-  # If this is not working for you, you probably have an old version of the 
+  # If this is not working for you, you probably have an old version of the
   # Powerline-patched fonts installed. Download and install the new version.
   # Do not submit PRs to change this unless you have reviewed the Powerline code point
   # history and have new information.
@@ -118,7 +118,7 @@ prompt_git() {
     zstyle ':vcs_info:*' get-revision true
     zstyle ':vcs_info:*' check-for-changes true
     zstyle ':vcs_info:*' stagedstr '✚'
-    zstyle ':vcs_info:git:*' unstagedstr '●'
+    zstyle ':vcs_info:*' unstagedstr '●'
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-- 
2.0.0