mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-01-02 02:19:06 +01:00
Revert "merge"
This reverts commit5e8734bfd6, reversing changes made to7a41498b0d.
This commit is contained in:
SimonGreenhill
parent
5e8734bfd6
commit
8b572a010d
26 changed files with 74 additions and 1300 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
|
@ -1,10 +1,8 @@
|
||||||
locals.zsh
|
locals.zsh
|
||||||
log/.zsh_history
|
log/.zsh_history
|
||||||
projects.zsh
|
projects.zsh
|
||||||
custom
|
custom/*
|
||||||
custom/*.zsh
|
!custom/example
|
||||||
*.un~
|
!custom/example.zsh
|
||||||
cache
|
cache
|
||||||
*.swp
|
*.swp
|
||||||
|
|
||||||
.DS_Store
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ h3. The manual way
|
||||||
|
|
||||||
1. Clone the repository
|
1. Clone the repository
|
||||||
|
|
||||||
@git clone git://github.com/sjl/oh-my-zsh.git ~/.oh-my-zsh@
|
@git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
|
||||||
|
|
||||||
2. Create a new zsh config by copying the zsh template we've provided.
|
2. Create a new zsh config by copying the zsh template we've provided.
|
||||||
|
|
||||||
|
|
@ -46,7 +46,7 @@ h2. Usage
|
||||||
* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
|
* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
|
||||||
** example: @plugins=(git osx ruby)@
|
** example: @plugins=(git osx ruby)@
|
||||||
* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
|
* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
|
||||||
** Take a look at the "current themes":http://wiki.github.com/sjl/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
|
** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
|
||||||
* much much more... take a look at @lib/@ what _Oh My Zsh_ offers...
|
* much much more... take a look at @lib/@ what _Oh My Zsh_ offers...
|
||||||
|
|
||||||
h2. Useful
|
h2. Useful
|
||||||
|
|
|
||||||
5
custom/example.zsh
Normal file
5
custom/example.zsh
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
# Add yourself some shortcuts to projects you often work on
|
||||||
|
# Example:
|
||||||
|
#
|
||||||
|
# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
|
||||||
|
#
|
||||||
2
custom/example/example.plugin.zsh
Normal file
2
custom/example/example.plugin.zsh
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Add your own custom plugins in the custom/plugins directory. Plugins placed
|
||||||
|
# here will override ones with the same name in the main plugins directory.
|
||||||
951
functions/_hg
951
functions/_hg
|
|
@ -1,951 +0,0 @@
|
||||||
#compdef hg
|
|
||||||
|
|
||||||
# Zsh completion script for mercurial. Rename this file to _hg and copy
|
|
||||||
# it into your zsh function path (/usr/share/zsh/site-functions for
|
|
||||||
# instance)
|
|
||||||
#
|
|
||||||
# If you do not want to install it globally, you can copy it somewhere
|
|
||||||
# else and add that directory to $fpath. This must be done before
|
|
||||||
# compinit is called. If the file is copied to ~/.zsh.d, your ~/.zshrc
|
|
||||||
# file could look like this:
|
|
||||||
#
|
|
||||||
# fpath=("$HOME/.zsh.d" $fpath)
|
|
||||||
# autoload -U compinit
|
|
||||||
# compinit
|
|
||||||
#
|
|
||||||
# Copyright (C) 2005, 2006 Steve Borho <steve@borho.org>
|
|
||||||
# Copyright (C) 2006-9 Brendan Cully <brendan@kublai.com>
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, without written agreement and without
|
|
||||||
# licence or royalty fees, to use, copy, modify, and distribute this
|
|
||||||
# software and to distribute modified versions of this software for any
|
|
||||||
# purpose, provided that the above copyright notice and the following
|
|
||||||
# two paragraphs appear in all copies of this software.
|
|
||||||
#
|
|
||||||
# In no event shall the authors be liable to any party for direct,
|
|
||||||
# indirect, special, incidental, or consequential damages arising out of
|
|
||||||
# the use of this software and its documentation, even if the authors
|
|
||||||
# have been advised of the possibility of such damage.
|
|
||||||
#
|
|
||||||
# The authors specifically disclaim any warranties, including, but not
|
|
||||||
# limited to, the implied warranties of merchantability and fitness for
|
|
||||||
# a particular purpose. The software provided hereunder is on an "as
|
|
||||||
# is" basis, and the authors have no obligation to provide maintenance,
|
|
||||||
# support, updates, enhancements, or modifications.
|
|
||||||
|
|
||||||
emulate -LR zsh
|
|
||||||
setopt extendedglob
|
|
||||||
|
|
||||||
local curcontext="$curcontext" state line
|
|
||||||
typeset -A _hg_cmd_globals
|
|
||||||
|
|
||||||
_hg() {
|
|
||||||
local cmd _hg_root
|
|
||||||
integer i=2
|
|
||||||
_hg_cmd_globals=()
|
|
||||||
|
|
||||||
while (( i < $#words ))
|
|
||||||
do
|
|
||||||
case "$words[$i]" in
|
|
||||||
-R|--repository)
|
|
||||||
eval _hg_root="$words[$i+1]"
|
|
||||||
_hg_cmd_globals+=("$words[$i]" "$_hg_root")
|
|
||||||
(( i += 2 ))
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
-R*)
|
|
||||||
_hg_cmd_globals+="$words[$i]"
|
|
||||||
eval _hg_root="${words[$i]#-R}"
|
|
||||||
(( i++ ))
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
--cwd|--config)
|
|
||||||
# pass along arguments to hg completer
|
|
||||||
_hg_cmd_globals+=("$words[$i]" "$words[$i+1]")
|
|
||||||
(( i += 2 ))
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
-*)
|
|
||||||
# skip option
|
|
||||||
(( i++ ))
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if [[ -z "$cmd" ]]
|
|
||||||
then
|
|
||||||
cmd="$words[$i]"
|
|
||||||
words[$i]=()
|
|
||||||
(( CURRENT-- ))
|
|
||||||
fi
|
|
||||||
(( i++ ))
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -z "$cmd" ]]
|
|
||||||
then
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
':mercurial command:_hg_commands'
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# resolve abbreviations and aliases
|
|
||||||
if ! (( $+functions[_hg_cmd_${cmd}] ))
|
|
||||||
then
|
|
||||||
local cmdexp
|
|
||||||
(( $#_hg_cmd_list )) || _hg_get_commands
|
|
||||||
|
|
||||||
cmdexp=$_hg_cmd_list[(r)${cmd}*]
|
|
||||||
if [[ $cmdexp == $_hg_cmd_list[(R)${cmd}*] ]]
|
|
||||||
then
|
|
||||||
# might be nice to rewrite the command line with the expansion
|
|
||||||
cmd="$cmdexp"
|
|
||||||
fi
|
|
||||||
if [[ -n $_hg_alias_list[$cmd] ]]
|
|
||||||
then
|
|
||||||
cmd=$_hg_alias_list[$cmd]
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
curcontext="${curcontext%:*:*}:hg-${cmd}:"
|
|
||||||
|
|
||||||
zstyle -s ":completion:$curcontext:" cache-policy update_policy
|
|
||||||
|
|
||||||
if [[ -z "$update_policy" ]]
|
|
||||||
then
|
|
||||||
zstyle ":completion:$curcontext:" cache-policy _hg_cache_policy
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (( $+functions[_hg_cmd_${cmd}] ))
|
|
||||||
then
|
|
||||||
_hg_cmd_${cmd}
|
|
||||||
else
|
|
||||||
# complete unknown commands normally
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'*:files:_hg_files'
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cache_policy() {
|
|
||||||
typeset -a old
|
|
||||||
|
|
||||||
# cache for a minute
|
|
||||||
old=( "$1"(mm+10) )
|
|
||||||
(( $#old )) && return 0
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_get_commands() {
|
|
||||||
typeset -ga _hg_cmd_list
|
|
||||||
typeset -gA _hg_alias_list
|
|
||||||
local hline cmd cmdalias
|
|
||||||
|
|
||||||
_call_program hg hg debugcomplete -v | while read -A hline
|
|
||||||
do
|
|
||||||
cmd=$hline[1]
|
|
||||||
_hg_cmd_list+=($cmd)
|
|
||||||
|
|
||||||
for cmdalias in $hline[2,-1]
|
|
||||||
do
|
|
||||||
_hg_cmd_list+=($cmdalias)
|
|
||||||
_hg_alias_list+=($cmdalias $cmd)
|
|
||||||
done
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_commands() {
|
|
||||||
(( $#_hg_cmd_list )) || _hg_get_commands
|
|
||||||
_describe -t commands 'mercurial command' _hg_cmd_list
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_revrange() {
|
|
||||||
compset -P 1 '*:'
|
|
||||||
_hg_tags "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_tags() {
|
|
||||||
typeset -a tags
|
|
||||||
local tag rev
|
|
||||||
|
|
||||||
_hg_cmd tags | while read tag
|
|
||||||
do
|
|
||||||
tags+=(${tag/ # [0-9]#:*})
|
|
||||||
done
|
|
||||||
(( $#tags )) && _describe -t tags 'tags' tags
|
|
||||||
}
|
|
||||||
|
|
||||||
# likely merge candidates
|
|
||||||
_hg_mergerevs() {
|
|
||||||
typeset -a heads
|
|
||||||
local myrev
|
|
||||||
|
|
||||||
heads=(${(f)"$(_hg_cmd heads --template '{rev}\\n')"})
|
|
||||||
# exclude own revision
|
|
||||||
myrev=$(_hg_cmd log -r . --template '{rev}\\n')
|
|
||||||
heads=(${heads:#$myrev})
|
|
||||||
|
|
||||||
(( $#heads )) && _describe -t heads 'heads' heads
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_files() {
|
|
||||||
if [[ -n "$_hg_root" ]]
|
|
||||||
then
|
|
||||||
[[ -d "$_hg_root/.hg" ]] || return
|
|
||||||
case "$_hg_root" in
|
|
||||||
/*)
|
|
||||||
_files -W $_hg_root
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
_files -W $PWD/$_hg_root
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
_files
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_status() {
|
|
||||||
[[ -d $PREFIX ]] || PREFIX=$PREFIX:h
|
|
||||||
status_files=(${(ps:\0:)"$(_hg_cmd status -0n$1 ./$PREFIX)"})
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_unknown() {
|
|
||||||
typeset -a status_files
|
|
||||||
_hg_status u
|
|
||||||
_wanted files expl 'unknown files' _multi_parts / status_files
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_missing() {
|
|
||||||
typeset -a status_files
|
|
||||||
_hg_status d
|
|
||||||
_wanted files expl 'missing files' _multi_parts / status_files
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_modified() {
|
|
||||||
typeset -a status_files
|
|
||||||
_hg_status m
|
|
||||||
_wanted files expl 'modified files' _multi_parts / status_files
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_resolve() {
|
|
||||||
local rstate rpath
|
|
||||||
|
|
||||||
[[ -d $PREFIX ]] || PREFIX=$PREFIX:h
|
|
||||||
|
|
||||||
_hg_cmd resolve -l ./$PREFIX | while read rstate rpath
|
|
||||||
do
|
|
||||||
[[ $rstate == 'R' ]] && resolved_files+=($rpath)
|
|
||||||
[[ $rstate == 'U' ]] && unresolved_files+=($rpath)
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_resolved() {
|
|
||||||
typeset -a resolved_files unresolved_files
|
|
||||||
_hg_resolve
|
|
||||||
_wanted files expl 'resolved files' _multi_parts / resolved_files
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_unresolved() {
|
|
||||||
typeset -a resolved_files unresolved_files
|
|
||||||
_hg_resolve
|
|
||||||
_wanted files expl 'unresolved files' _multi_parts / unresolved_files
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_config() {
|
|
||||||
typeset -a items
|
|
||||||
items=(${${(%f)"$(_call_program hg hg showconfig)"}%%\=*})
|
|
||||||
(( $#items )) && _describe -t config 'config item' items
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_addremove() {
|
|
||||||
_alternative 'files:unknown files:_hg_unknown' \
|
|
||||||
'files:missing files:_hg_missing'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_ssh_urls() {
|
|
||||||
if [[ -prefix */ ]]
|
|
||||||
then
|
|
||||||
if zstyle -T ":completion:${curcontext}:files" remote-access
|
|
||||||
then
|
|
||||||
local host=${PREFIX%%/*}
|
|
||||||
typeset -a remdirs
|
|
||||||
compset -p $(( $#host + 1 ))
|
|
||||||
local rempath=${(M)PREFIX##*/}
|
|
||||||
local cacheid="hg:${host}-${rempath//\//_}"
|
|
||||||
cacheid=${cacheid%[-_]}
|
|
||||||
compset -P '*/'
|
|
||||||
if _cache_invalid "$cacheid" || ! _retrieve_cache "$cacheid"
|
|
||||||
then
|
|
||||||
remdirs=(${${(M)${(f)"$(_call_program files ssh -a -x $host ls -1FL "${(q)rempath}")"}##*/}%/})
|
|
||||||
_store_cache "$cacheid" remdirs
|
|
||||||
fi
|
|
||||||
_describe -t directories 'remote directory' remdirs -S/
|
|
||||||
else
|
|
||||||
_message 'remote directory'
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if compset -P '*@'
|
|
||||||
then
|
|
||||||
_hosts -S/
|
|
||||||
else
|
|
||||||
_alternative 'hosts:remote host name:_hosts -S/' \
|
|
||||||
'users:user:_users -S@'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_urls() {
|
|
||||||
if compset -P bundle://
|
|
||||||
then
|
|
||||||
_files
|
|
||||||
elif compset -P ssh://
|
|
||||||
then
|
|
||||||
_hg_ssh_urls
|
|
||||||
elif [[ -prefix *: ]]
|
|
||||||
then
|
|
||||||
_urls
|
|
||||||
else
|
|
||||||
local expl
|
|
||||||
compset -S '[^:]*'
|
|
||||||
_wanted url-schemas expl 'URL schema' compadd -S '' - \
|
|
||||||
http:// https:// ssh:// bundle://
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_paths() {
|
|
||||||
typeset -a paths pnames
|
|
||||||
_hg_cmd paths | while read -A pnames
|
|
||||||
do
|
|
||||||
paths+=($pnames[1])
|
|
||||||
done
|
|
||||||
(( $#paths )) && _describe -t path-aliases 'repository alias' paths
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_remote() {
|
|
||||||
_alternative 'path-aliases:repository alias:_hg_paths' \
|
|
||||||
'directories:directory:_files -/' \
|
|
||||||
'urls:URL:_hg_urls'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_clone_dest() {
|
|
||||||
_alternative 'directories:directory:_files -/' \
|
|
||||||
'urls:URL:_hg_urls'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Common options
|
|
||||||
_hg_global_opts=(
|
|
||||||
'(--repository -R)'{-R+,--repository}'[repository root directory]:repository:_files -/'
|
|
||||||
'--cwd[change working directory]:new working directory:_files -/'
|
|
||||||
'(--noninteractive -y)'{-y,--noninteractive}'[do not prompt, assume yes for any required answers]'
|
|
||||||
'(--verbose -v)'{-v,--verbose}'[enable additional output]'
|
|
||||||
'*--config[set/override config option]:defined config items:_hg_config'
|
|
||||||
'(--quiet -q)'{-q,--quiet}'[suppress output]'
|
|
||||||
'(--help -h)'{-h,--help}'[display help and exit]'
|
|
||||||
'--debug[debug mode]'
|
|
||||||
'--debugger[start debugger]'
|
|
||||||
'--encoding[set the charset encoding (default: UTF8)]'
|
|
||||||
'--encodingmode[set the charset encoding mode (default: strict)]'
|
|
||||||
'--lsprof[print improved command execution profile]'
|
|
||||||
'--traceback[print traceback on exception]'
|
|
||||||
'--time[time how long the command takes]'
|
|
||||||
'--profile[profile]'
|
|
||||||
'--version[output version information and exit]'
|
|
||||||
)
|
|
||||||
|
|
||||||
_hg_pat_opts=(
|
|
||||||
'*'{-I+,--include}'[include names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/'
|
|
||||||
'*'{-X+,--exclude}'[exclude names matching the given patterns]:dir:_files -W $(_hg_cmd root) -/')
|
|
||||||
|
|
||||||
_hg_diff_opts=(
|
|
||||||
'(--text -a)'{-a,--text}'[treat all files as text]'
|
|
||||||
'(--git -g)'{-g,--git}'[use git extended diff format]'
|
|
||||||
"--nodates[omit dates from diff headers]")
|
|
||||||
|
|
||||||
_hg_dryrun_opts=(
|
|
||||||
'(--dry-run -n)'{-n,--dry-run}'[do not perform actions, just print output]')
|
|
||||||
|
|
||||||
_hg_style_opts=(
|
|
||||||
'--style[display using template map file]:'
|
|
||||||
'--template[display with template]:')
|
|
||||||
|
|
||||||
_hg_commit_opts=(
|
|
||||||
'(-m --message -l --logfile --edit -e)'{-e,--edit}'[edit commit message]'
|
|
||||||
'(-e --edit -l --logfile --message -m)'{-m+,--message}'[use <text> as commit message]:message:'
|
|
||||||
'(-e --edit -m --message --logfile -l)'{-l+,--logfile}'[read the commit message from <file>]:log file:_files')
|
|
||||||
|
|
||||||
_hg_remote_opts=(
|
|
||||||
'(--ssh -e)'{-e+,--ssh}'[specify ssh command to use]:'
|
|
||||||
'--remotecmd[specify hg command to run on the remote side]:')
|
|
||||||
|
|
||||||
_hg_cmd() {
|
|
||||||
_call_program hg hg --config ui.verbose=0 --config defaults."$1"= \
|
|
||||||
"$_hg_cmd_globals[@]" "$@" 2> /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_add() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
|
|
||||||
'*:unknown files:_hg_unknown'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_addremove() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
|
|
||||||
'(--similarity -s)'{-s+,--similarity}'[guess renamed files by similarity (0<=s<=100)]:' \
|
|
||||||
'*:unknown or missing files:_hg_addremove'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_annotate() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[annotate the specified revision]:revision:_hg_tags' \
|
|
||||||
'(--follow -f)'{-f,--follow}'[follow file copies and renames]' \
|
|
||||||
'(--text -a)'{-a,--text}'[treat all files as text]' \
|
|
||||||
'(--user -u)'{-u,--user}'[list the author]' \
|
|
||||||
'(--date -d)'{-d,--date}'[list the date]' \
|
|
||||||
'(--number -n)'{-n,--number}'[list the revision number (default)]' \
|
|
||||||
'(--changeset -c)'{-c,--changeset}'[list the changeset]' \
|
|
||||||
'*:files:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_archive() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'--no-decode[do not pass files through decoders]' \
|
|
||||||
'(--prefix -p)'{-p+,--prefix}'[directory prefix for files in archive]:' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[revision to distribute]:revision:_hg_tags' \
|
|
||||||
'(--type -t)'{-t+,--type}'[type of distribution to create]:archive type:(files tar tbz2 tgz uzip zip)' \
|
|
||||||
'*:destination:_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_backout() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'--merge[merge with old dirstate parent after backout]' \
|
|
||||||
'(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
|
|
||||||
'--parent[parent to choose when backing out merge]' \
|
|
||||||
'(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_tags' \
|
|
||||||
'(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
|
|
||||||
'(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_files -g \*.txt'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_bisect() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(-)'{-r,--reset}'[reset bisect state]' \
|
|
||||||
'(--good -g --bad -b --skip -s --reset -r)'{-g,--good}'[mark changeset good]'::revision:_hg_tags \
|
|
||||||
'(--good -g --bad -b --skip -s --reset -r)'{-b,--bad}'[mark changeset bad]'::revision:_hg_tags \
|
|
||||||
'(--good -g --bad -b --skip -s --reset -r)'{-s,--skip}'[skip testing changeset]' \
|
|
||||||
'(--command -c --noupdate -U)'{-c+,--command}'[use command to check changeset state]':commands:_command_names \
|
|
||||||
'(--command -c --noupdate -U)'{-U,--noupdate}'[do not update to target]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_branch() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[set branch name even if it shadows an existing branch]' \
|
|
||||||
'(--clean -C)'{-C,--clean}'[reset branch name to parent branch name]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_branches() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--active -a)'{-a,--active}'[show only branches that have unmerge heads]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_bundle() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[run even when remote repository is unrelated]' \
|
|
||||||
'(2)*--base[a base changeset to specify instead of a destination]:revision:_hg_tags' \
|
|
||||||
':output file:_files' \
|
|
||||||
':destination repository:_files -/'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_cat() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--output -o)'{-o+,--output}'[print output to file with formatted name]:filespec:' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_tags' \
|
|
||||||
'*:file:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_clone() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts \
|
|
||||||
'(--noupdate -U)'{-U,--noupdate}'[do not update the new working directory]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[a changeset you would like to have after cloning]:' \
|
|
||||||
'--uncompressed[use uncompressed transfer (fast over LAN)]' \
|
|
||||||
':source repository:_hg_remote' \
|
|
||||||
':destination:_hg_clone_dest'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_commit() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--addremove -A)'{-A,--addremove}'[mark new/missing files as added/removed before committing]' \
|
|
||||||
'(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
|
|
||||||
'(--logfile -l)'{-l+,--logfile}'[read commit message from <file>]:log file:_files -g \*.txt' \
|
|
||||||
'(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
|
|
||||||
'(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
|
|
||||||
'*:file:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_copy() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
|
|
||||||
'(--after -A)'{-A,--after}'[record a copy that has already occurred]' \
|
|
||||||
'(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
|
|
||||||
'*:file:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_diff() {
|
|
||||||
typeset -A opt_args
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_diff_opts \
|
|
||||||
'*'{-r,--rev}'+[revision]:revision:_hg_revrange' \
|
|
||||||
'(--show-function -p)'{-p,--show-function}'[show which function each change is in]' \
|
|
||||||
'(--ignore-all-space -w)'{-w,--ignore-all-space}'[ignore white space when comparing lines]' \
|
|
||||||
'(--ignore-space-change -b)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]' \
|
|
||||||
'(--ignore-blank-lines -B)'{-B,--ignore-blank-lines}'[ignore changes whose lines are all blank]' \
|
|
||||||
'*:file:->diff_files'
|
|
||||||
|
|
||||||
if [[ $state == 'diff_files' ]]
|
|
||||||
then
|
|
||||||
if [[ -n $opt_args[-r] ]]
|
|
||||||
then
|
|
||||||
_hg_files
|
|
||||||
else
|
|
||||||
_hg_modified
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_export() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_diff_opts \
|
|
||||||
'(--outout -o)'{-o+,--output}'[print output to file with formatted name]:filespec:' \
|
|
||||||
'--switch-parent[diff against the second parent]' \
|
|
||||||
'*:revision:_hg_tags'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_grep() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--print0 -0)'{-0,--print0}'[end filenames with NUL]' \
|
|
||||||
'--all[print all revisions with matches]' \
|
|
||||||
'(--follow -f)'{-f,--follow}'[follow changeset or file history]' \
|
|
||||||
'(--ignore-case -i)'{-i,--ignore-case}'[ignore case when matching]' \
|
|
||||||
'(--files-with-matches -l)'{-l,--files-with-matches}'[print only filenames and revs that match]' \
|
|
||||||
'(--line-number -n)'{-n,--line-number}'[print matching line numbers]' \
|
|
||||||
'*'{-r+,--rev}'[search in given revision range]:revision:_hg_revrange' \
|
|
||||||
'(--user -u)'{-u,--user}'[print user who committed change]' \
|
|
||||||
'1:search pattern:' \
|
|
||||||
'*:files:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_heads() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_style_opts \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[show only heads which are descendants of rev]:revision:_hg_tags'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_help() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'*:mercurial command:_hg_commands'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_identify() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[identify the specified rev]:revision:_hg_tags' \
|
|
||||||
'(--num -n)'{-n+,--num}'[show local revision number]' \
|
|
||||||
'(--id -i)'{-i+,--id}'[show global revision id]' \
|
|
||||||
'(--branch -b)'{-b+,--branch}'[show branch]' \
|
|
||||||
'(--tags -t)'{-t+,--tags}'[show tags]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_import() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--strip -p)'{-p+,--strip}'[directory strip option for patch (default: 1)]:count:' \
|
|
||||||
'(--message -m)'{-m+,--message}'[use <text> as commit message]:text:' \
|
|
||||||
'(--force -f)'{-f,--force}'[skip check for outstanding uncommitted changes]' \
|
|
||||||
'*:patch:_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_incoming() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
|
|
||||||
'(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
|
|
||||||
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
|
|
||||||
'(--patch -p)'{-p,--patch}'[show patch]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:_hg_tags' \
|
|
||||||
'(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
|
|
||||||
'--bundle[file to store the bundles into]:bundle file:_files' \
|
|
||||||
':source:_hg_remote'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_init() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts \
|
|
||||||
':dir:_files -/'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_locate() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[search repository as it stood at revision]:revision:_hg_tags' \
|
|
||||||
'(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
|
|
||||||
'(--fullpath -f)'{-f,--fullpath}'[print complete paths]' \
|
|
||||||
'*:search pattern:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_log() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_style_opts \
|
|
||||||
'(--follow --follow-first -f)'{-f,--follow}'[follow changeset or history]' \
|
|
||||||
'(-f --follow)--follow-first[only follow the first parent of merge changesets]' \
|
|
||||||
'(--copies -C)'{-C,--copies}'[show copied files]' \
|
|
||||||
'(--keyword -k)'{-k+,--keyword}'[search for a keyword]:' \
|
|
||||||
'(--limit -l)'{-l+,--limit}'[limit number of changes displayed]:' \
|
|
||||||
'*'{-r,--rev}'[show the specified revision or range]:revision:_hg_revrange' \
|
|
||||||
'(--no-merges -M)'{-M,--no-merges}'[do not show merges]' \
|
|
||||||
'(--only-merges -m)'{-m,--only-merges}'[show only merges]' \
|
|
||||||
'(--patch -p)'{-p,--patch}'[show patch]' \
|
|
||||||
'(--prune -P)'{-P+,--prune}'[do not display revision or any of its ancestors]:revision:_hg_tags' \
|
|
||||||
'*:files:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_manifest() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
':revision:_hg_tags'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_merge() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[force a merge with outstanding changes]' \
|
|
||||||
'(--rev -r 1)'{-r,--rev}'[revision to merge]:revision:_hg_mergerevs' \
|
|
||||||
'(--preview -P)'{-P,--preview}'[review revisions to merge (no merge is performed)]' \
|
|
||||||
':revision:_hg_mergerevs'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_outgoing() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts $_hg_style_opts \
|
|
||||||
'(--no-merges -M)'{-M,--no-merges}'[do not show merge revisions]' \
|
|
||||||
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
|
|
||||||
'(--patch -p)'{-p,--patch}'[show patch]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]' \
|
|
||||||
'(--newest-first -n)'{-n,--newest-first}'[show newest record first]' \
|
|
||||||
':destination:_hg_remote'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_parents() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_style_opts \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[show parents of the specified rev]:revision:_hg_tags' \
|
|
||||||
':last modified file:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_paths() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
':path:_hg_paths'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_pull() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[run even when the remote repository is unrelated]' \
|
|
||||||
'(--update -u)'{-u,--update}'[update to new tip if changesets were pulled]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[a specific revision up to which you would like to pull]:revision:' \
|
|
||||||
':source:_hg_remote'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_push() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_remote_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[force push]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[a specific revision you would like to push]:revision:_hg_tags' \
|
|
||||||
':destination:_hg_remote'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_remove() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--after -A)'{-A,--after}'[record remove that has already occurred]' \
|
|
||||||
'(--force -f)'{-f,--force}'[remove file even if modified]' \
|
|
||||||
'*:file:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_rename() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
|
|
||||||
'(--after -A)'{-A,--after}'[record a rename that has already occurred]' \
|
|
||||||
'(--force -f)'{-f,--force}'[forcibly copy over an existing managed file]' \
|
|
||||||
'*:file:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_resolve() {
|
|
||||||
local context state line
|
|
||||||
typeset -A opt_args
|
|
||||||
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--list -l --mark -m --unmark -u)'{-l,--list}'[list state of files needing merge]:*:merged files:->resolve_files' \
|
|
||||||
'(--mark -m --list -l --unmark -u)'{-m,--mark}'[mark files as resolved]:*:unresolved files:_hg_unresolved' \
|
|
||||||
'(--unmark -u --list -l --mark -m)'{-u,--unmark}'[unmark files as resolved]:*:resolved files:_hg_resolved' \
|
|
||||||
'*:file:_hg_unresolved'
|
|
||||||
|
|
||||||
if [[ $state == 'resolve_files' ]]
|
|
||||||
then
|
|
||||||
_alternative 'files:resolved files:_hg_resolved' \
|
|
||||||
'files:unresolved files:_hg_unresolved'
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_revert() {
|
|
||||||
local context state line
|
|
||||||
typeset -A opt_args
|
|
||||||
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_dryrun_opts \
|
|
||||||
'(--all -a :)'{-a,--all}'[revert all changes when no arguments given]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[revision to revert to]:revision:_hg_tags' \
|
|
||||||
'--no-backup[do not save backup copies of files]' \
|
|
||||||
'*:file:->diff_files'
|
|
||||||
|
|
||||||
if [[ $state == 'diff_files' ]]
|
|
||||||
then
|
|
||||||
if [[ -n $opt_args[-r] ]]
|
|
||||||
then
|
|
||||||
_hg_files
|
|
||||||
else
|
|
||||||
typeset -a status_files
|
|
||||||
_hg_status mard
|
|
||||||
_wanted files expl 'modified, added, removed or deleted file' _multi_parts / status_files
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_serve() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--accesslog -A)'{-A+,--accesslog}'[name of access log file]:log file:_files' \
|
|
||||||
'(--errorlog -E)'{-E+,--errorlog}'[name of error log file]:log file:_files' \
|
|
||||||
'(--daemon -d)'{-d,--daemon}'[run server in background]' \
|
|
||||||
'(--port -p)'{-p+,--port}'[listen port]:listen port:' \
|
|
||||||
'(--address -a)'{-a+,--address}'[interface address]:interface address:' \
|
|
||||||
'(--name -n)'{-n+,--name}'[name to show in web pages]:repository name:' \
|
|
||||||
'(--templates -t)'{-t,--templates}'[web template directory]:template dir:_files -/' \
|
|
||||||
'--style[web template style]:style' \
|
|
||||||
'--stdio[for remote clients]' \
|
|
||||||
'(--ipv6 -6)'{-6,--ipv6}'[use IPv6 in addition to IPv4]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_showconfig() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--untrusted -u)'{-u+,--untrusted}'[show untrusted configuration options]' \
|
|
||||||
':config item:_hg_config'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_status() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'(--all -A)'{-A,--all}'[show status of all files]' \
|
|
||||||
'(--modified -m)'{-m,--modified}'[show only modified files]' \
|
|
||||||
'(--added -a)'{-a,--added}'[show only added files]' \
|
|
||||||
'(--removed -r)'{-r,--removed}'[show only removed files]' \
|
|
||||||
'(--deleted -d)'{-d,--deleted}'[show only deleted (but tracked) files]' \
|
|
||||||
'(--clean -c)'{-c,--clean}'[show only files without changes]' \
|
|
||||||
'(--unknown -u)'{-u,--unknown}'[show only unknown files]' \
|
|
||||||
'(--ignored -i)'{-i,--ignored}'[show ignored files]' \
|
|
||||||
'(--no-status -n)'{-n,--no-status}'[hide status prefix]' \
|
|
||||||
'(--copies -C)'{-C,--copies}'[show source of copied files]' \
|
|
||||||
'(--print0 -0)'{-0,--print0}'[end filenames with NUL, for use with xargs]' \
|
|
||||||
'--rev[show difference from revision]:revision:_hg_tags' \
|
|
||||||
'*:files:_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_summary() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'--remote[check for push and pull]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_tag() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--local -l)'{-l,--local}'[make the tag local]' \
|
|
||||||
'(--message -m)'{-m+,--message}'[message for tag commit log entry]:message:' \
|
|
||||||
'(--date -d)'{-d+,--date}'[record datecode as commit date]:date code:' \
|
|
||||||
'(--user -u)'{-u+,--user}'[record user as commiter]:user:' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[revision to tag]:revision:_hg_tags' \
|
|
||||||
':tag name:'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_tip() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_style_opts \
|
|
||||||
'(--patch -p)'{-p,--patch}'[show patch]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_unbundle() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--update -u)'{-u,--update}'[update to new tip if changesets were unbundled]' \
|
|
||||||
':files:_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_update() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--clean -C)'{-C,--clean}'[overwrite locally modified files]' \
|
|
||||||
'(--rev -r)'{-r+,--rev}'[revision]:revision:_hg_tags' \
|
|
||||||
':revision:_hg_tags'
|
|
||||||
}
|
|
||||||
|
|
||||||
# HGK
|
|
||||||
_hg_cmd_view() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--limit -l)'{-l+,--limit}'[limit number of changes displayed]:' \
|
|
||||||
':revision range:_hg_tags'
|
|
||||||
}
|
|
||||||
|
|
||||||
# MQ
|
|
||||||
_hg_qseries() {
|
|
||||||
typeset -a patches
|
|
||||||
patches=(${(f)"$(_hg_cmd qseries)"})
|
|
||||||
(( $#patches )) && _describe -t hg-patches 'patches' patches
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_qapplied() {
|
|
||||||
typeset -a patches
|
|
||||||
patches=(${(f)"$(_hg_cmd qapplied)"})
|
|
||||||
if (( $#patches ))
|
|
||||||
then
|
|
||||||
patches+=(qbase qtip)
|
|
||||||
_describe -t hg-applied-patches 'applied patches' patches
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_qunapplied() {
|
|
||||||
typeset -a patches
|
|
||||||
patches=(${(f)"$(_hg_cmd qunapplied)"})
|
|
||||||
(( $#patches )) && _describe -t hg-unapplied-patches 'unapplied patches' patches
|
|
||||||
}
|
|
||||||
|
|
||||||
# unapplied, including guarded patches
|
|
||||||
_hg_qdeletable() {
|
|
||||||
typeset -a unapplied
|
|
||||||
unapplied=(${(f)"$(_hg_cmd qseries)"})
|
|
||||||
for p in $(_hg_cmd qapplied)
|
|
||||||
do
|
|
||||||
unapplied=(${unapplied:#$p})
|
|
||||||
done
|
|
||||||
|
|
||||||
(( $#unapplied )) && _describe -t hg-allunapplied-patches 'all unapplied patches' unapplied
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_qguards() {
|
|
||||||
typeset -a guards
|
|
||||||
local guard
|
|
||||||
compset -P "+|-"
|
|
||||||
_hg_cmd qselect -s | while read guard
|
|
||||||
do
|
|
||||||
guards+=(${guard#(+|-)})
|
|
||||||
done
|
|
||||||
(( $#guards )) && _describe -t hg-guards 'guards' guards
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_qseries_opts=(
|
|
||||||
'(--summary -s)'{-s,--summary}'[print first line of patch header]')
|
|
||||||
|
|
||||||
_hg_cmd_qapplied() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_qseries_opts
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qdelete() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--keep -k)'{-k,--keep}'[keep patch file]' \
|
|
||||||
'*'{-r+,--rev}'[stop managing a revision]:applied patch:_hg_revrange' \
|
|
||||||
'*:unapplied patch:_hg_qdeletable'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qdiff() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts \
|
|
||||||
'*:pattern:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qfold() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_h_commit_opts \
|
|
||||||
'(--keep,-k)'{-k,--keep}'[keep folded patch files]' \
|
|
||||||
'*:unapplied patch:_hg_qunapplied'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qgoto() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[overwrite any local changes]' \
|
|
||||||
':patch:_hg_qseries'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qguard() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--list -l)'{-l,--list}'[list all patches and guards]' \
|
|
||||||
'(--none -n)'{-n,--none}'[drop all guards]' \
|
|
||||||
':patch:_hg_qseries' \
|
|
||||||
'*:guards:_hg_qguards'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qheader() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
':patch:_hg_qseries'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qimport() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--existing -e)'{-e,--existing}'[import file in patch dir]' \
|
|
||||||
'(--name -n 2)'{-n+,--name}'[patch file name]:name:' \
|
|
||||||
'(--force -f)'{-f,--force}'[overwrite existing files]' \
|
|
||||||
'*'{-r+,--rev}'[place existing revisions under mq control]:revision:_hg_revrange' \
|
|
||||||
'*:patch:_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qnew() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_commit_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[import uncommitted changes into patch]' \
|
|
||||||
':patch:'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qnext() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_qseries_opts
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qpop() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--all -a :)'{-a,--all}'[pop all patches]' \
|
|
||||||
'(--name -n)'{-n+,--name}'[queue name to pop]:' \
|
|
||||||
'(--force -f)'{-f,--force}'[forget any local changes]' \
|
|
||||||
':patch:_hg_qapplied'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qprev() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_qseries_opts
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qpush() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--all -a :)'{-a,--all}'[apply all patches]' \
|
|
||||||
'(--list -l)'{-l,--list}'[list patch name in commit text]' \
|
|
||||||
'(--merge -m)'{-m+,--merge}'[merge from another queue]:' \
|
|
||||||
'(--name -n)'{-n+,--name}'[merge queue name]:' \
|
|
||||||
'(--force -f)'{-f,--force}'[apply if the patch has rejects]' \
|
|
||||||
':patch:_hg_qunapplied'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qrefresh() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_pat_opts $_hg_commit_opts \
|
|
||||||
'(--git -g)'{-g,--git}'[use git extended diff format]' \
|
|
||||||
'(--short -s)'{-s,--short}'[short refresh]' \
|
|
||||||
'*:files:_hg_files'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qrename() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
':patch:_hg_qseries' \
|
|
||||||
':destination:'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qselect() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--none -n :)'{-n,--none}'[disable all guards]' \
|
|
||||||
'(--series -s :)'{-s,--series}'[list all guards in series file]' \
|
|
||||||
'--pop[pop to before first guarded applied patch]' \
|
|
||||||
'--reapply[pop and reapply patches]' \
|
|
||||||
'*:guards:_hg_qguards'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qseries() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_qseries_opts \
|
|
||||||
'(--missing -m)'{-m,--missing}'[print patches not in series]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qunapplied() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_qseries_opts
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_qtop() {
|
|
||||||
_arguments -s -w : $_hg_global_opts $_hg_qseries_opts
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg_cmd_strip() {
|
|
||||||
_arguments -s -w : $_hg_global_opts \
|
|
||||||
'(--force -f)'{-f,--force}'[force multi-head removal]' \
|
|
||||||
'(--backup -b)'{-b,--backup}'[bundle unrelated changesets]' \
|
|
||||||
'(--nobackup -n)'{-n,--nobackup}'[no backups]' \
|
|
||||||
':revision:_hg_tags'
|
|
||||||
}
|
|
||||||
|
|
||||||
_hg "$@"
|
|
||||||
|
|
@ -1,14 +1,16 @@
|
||||||
# fixme - the load process here seems a bit bizarre
|
# fixme - the load process here seems a bit bizarre
|
||||||
|
|
||||||
unsetopt noautomenu
|
unsetopt menu_complete # do not autoselect the first completion entry
|
||||||
|
unsetopt flowcontrol
|
||||||
|
setopt auto_menu # show completion menu on succesive tab press
|
||||||
setopt complete_in_word
|
setopt complete_in_word
|
||||||
unsetopt always_to_end
|
setopt always_to_end
|
||||||
|
|
||||||
WORDCHARS=''
|
WORDCHARS=''
|
||||||
|
|
||||||
zmodload -i zsh/complist
|
zmodload -i zsh/complist
|
||||||
|
|
||||||
# case-insensitive (all), partial-word and then substring completion
|
## case-insensitive (all),partial-word and then substring completion
|
||||||
if [ "x$CASE_SENSITIVE" = "xtrue" ]; then
|
if [ "x$CASE_SENSITIVE" = "xtrue" ]; then
|
||||||
zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
|
zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
|
||||||
unset CASE_SENSITIVE
|
unset CASE_SENSITIVE
|
||||||
|
|
|
||||||
|
|
@ -4,3 +4,7 @@ alias man='nocorrect man'
|
||||||
alias mv='nocorrect mv'
|
alias mv='nocorrect mv'
|
||||||
alias mysql='nocorrect mysql'
|
alias mysql='nocorrect mysql'
|
||||||
alias mkdir='nocorrect mkdir'
|
alias mkdir='nocorrect mkdir'
|
||||||
|
alias gist='nocorrect gist'
|
||||||
|
alias heroku='nocorrect heroku'
|
||||||
|
alias ebuild='nocorrect ebuild'
|
||||||
|
alias hpodder='nocorrect hpodder'
|
||||||
|
|
|
||||||
|
|
@ -3,17 +3,23 @@ setopt auto_name_dirs
|
||||||
setopt auto_pushd
|
setopt auto_pushd
|
||||||
setopt pushd_ignore_dups
|
setopt pushd_ignore_dups
|
||||||
|
|
||||||
alias -- -='cd -'
|
|
||||||
alias ..='cd ..'
|
alias ..='cd ..'
|
||||||
alias ...='cd ../..'
|
|
||||||
alias ....='cd ../../..'
|
|
||||||
alias .....='cd ../../../..'
|
|
||||||
alias cd..='cd ..'
|
alias cd..='cd ..'
|
||||||
alias cd...='cd ../..'
|
alias cd...='cd ../..'
|
||||||
alias cd....='cd ../../..'
|
alias cd....='cd ../../..'
|
||||||
alias cd.....='cd ../../../..'
|
alias cd.....='cd ../../../..'
|
||||||
alias cd/='cd /'
|
alias cd/='cd /'
|
||||||
|
|
||||||
|
alias 1='cd -'
|
||||||
|
alias 2='cd +2'
|
||||||
|
alias 3='cd +3'
|
||||||
|
alias 4='cd +4'
|
||||||
|
alias 5='cd +5'
|
||||||
|
alias 6='cd +6'
|
||||||
|
alias 7='cd +7'
|
||||||
|
alias 8='cd +8'
|
||||||
|
alias 9='cd +9'
|
||||||
|
|
||||||
cd () {
|
cd () {
|
||||||
if [[ "x$*" == "x..." ]]; then
|
if [[ "x$*" == "x..." ]]; then
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
@ -32,18 +38,6 @@ alias md='mkdir -p'
|
||||||
alias rd=rmdir
|
alias rd=rmdir
|
||||||
alias d='dirs -v'
|
alias d='dirs -v'
|
||||||
|
|
||||||
# List direcory contents
|
|
||||||
alias l1='tree --dirsfirst -ChFL 1'
|
|
||||||
alias l2='tree --dirsfirst -ChFL 2'
|
|
||||||
alias l3='tree --dirsfirst -ChFL 3'
|
|
||||||
|
|
||||||
alias ll1='tree --dirsfirst -ChFupDaL 1'
|
|
||||||
alias ll2='tree --dirsfirst -ChFupDaL 2'
|
|
||||||
alias ll3='tree --dirsfirst -ChFupDaL 3'
|
|
||||||
|
|
||||||
alias l='l1'
|
|
||||||
alias ll='ll1'
|
|
||||||
|
|
||||||
# mkdir & cd to it
|
# mkdir & cd to it
|
||||||
function mcd() {
|
function mcd() {
|
||||||
mkdir -p "$1" && cd "$1";
|
mkdir -p "$1" && cd "$1";
|
||||||
|
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
alias pm='python manage.py'
|
|
||||||
alias pmr='python manage.py runserver'
|
|
||||||
alias pmrp='python manage.py runserver_plus'
|
|
||||||
alias pmrpg='pmrp --adminmedia=`pwd`/static/admin'
|
|
||||||
alias pmsdb='python manage.py syncdb'
|
|
||||||
alias pms='python manage.py shell'
|
|
||||||
alias pmsp='python manage.py shell_plus'
|
|
||||||
alias pmlf='python manage.py loaddata fixtures/*'
|
|
||||||
alias pmt='python -W ignore::DeprecationWarning manage.py test'
|
|
||||||
|
|
||||||
alias pmdm='python manage.py datamigration'
|
|
||||||
alias pmsm='python manage.py schemamigration --auto'
|
|
||||||
alias pmsi='python manage.py schemamigration --initial'
|
|
||||||
alias pmm='python manage.py migrate'
|
|
||||||
alias pmma='python manage.py migrate --all'
|
|
||||||
alias pmml='python manage.py migrate --list'
|
|
||||||
alias pmmf='python manage.py migrate --fake'
|
|
||||||
alias pmcats='python manage.py convert_to_south'
|
|
||||||
|
|
||||||
alias gs='gunicorn_django'
|
|
||||||
alias gk='kill `cat .gunicorn.pid`'
|
|
||||||
alias gl='tail -f .gunicorn.log'
|
|
||||||
|
|
||||||
function djapp() {
|
|
||||||
mkdir -p $1/templates/$1
|
|
||||||
touch $1/__init__.py
|
|
||||||
echo "from django.db import models\n\n" > $1/models.py
|
|
||||||
echo "from django.contrib import admin\nfrom $1.models import *\n\n" > $1/admin.py
|
|
||||||
echo "from django.conf.urls.defaults import *\n\n" > $1/urls.py
|
|
||||||
}
|
|
||||||
|
|
@ -10,39 +10,8 @@ function upgrade_oh_my_zsh() {
|
||||||
/usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
|
/usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
function extract() {
|
function take() {
|
||||||
unset REMOVE_ARCHIVE
|
mkdir -p $1
|
||||||
|
cd $1
|
||||||
if test "$1" = "-r"; then
|
|
||||||
REMOVE=1
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
if [[ -f $1 ]]; then
|
|
||||||
case $1 in
|
|
||||||
*.tar.bz2) tar xvjf $1;;
|
|
||||||
*.tar.gz) tar xvzf $1;;
|
|
||||||
*.tar.xz) tar xvJf $1;;
|
|
||||||
*.tar.lzma) tar --lzma -xvf $1;;
|
|
||||||
*.bz2) bunzip $1;;
|
|
||||||
*.rar) unrar x $1;;
|
|
||||||
*.gz) gunzip $1;;
|
|
||||||
*.tar) tar xvf $1;;
|
|
||||||
*.tbz2) tar xvjf $1;;
|
|
||||||
*.tgz) tar xvzf $1;;
|
|
||||||
*.zip) unzip $1;;
|
|
||||||
*.Z) uncompress $1;;
|
|
||||||
*.7z) 7z x $1;;
|
|
||||||
*) echo "'$1' cannot be extracted via >extract<";;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
|
|
||||||
echo removing "$1";
|
|
||||||
/bin/rm "$1";
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
echo "'$1' is not a valid file"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
28
lib/git.zsh
28
lib/git.zsh
|
|
@ -4,19 +4,12 @@ function git_prompt_info() {
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||||
}
|
}
|
||||||
|
|
||||||
parse_git_dirty () {
|
# Checks if working tree is dirty
|
||||||
gitstat=$(git status 2>/dev/null | grep '\(# Untracked\|# Changes\|# Changed but not updated:\)')
|
parse_git_dirty() {
|
||||||
|
if [[ -n $(git status -s --ignore-submodules=dirty 2> /dev/null) ]]; then
|
||||||
if [[ $(echo ${gitstat} | grep -c "^# Changes to be committed:$") > 0 ]]; then
|
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
||||||
echo -n "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
else
|
||||||
fi
|
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
||||||
|
|
||||||
if [[ $(echo ${gitstat} | grep -c "^\(# Untracked files:\|# Changed but not updated:\|# Changes not staged for commit:\)$") > 0 ]]; then
|
|
||||||
echo -n "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ $(echo ${gitstat} | grep -v '^$' | wc -l | tr -d ' ') == 0 ]]; then
|
|
||||||
echo -n "$ZSH_THEME_GIT_PROMPT_CLEAN"
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -27,15 +20,6 @@ function git_prompt_ahead() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Will return the current branch name
|
|
||||||
# Usage example: git pull origin $(current_branch)
|
|
||||||
#
|
|
||||||
function current_branch() {
|
|
||||||
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
|
||||||
echo ${ref#refs/heads/}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Formats prompt string for current git commit short SHA
|
# Formats prompt string for current git commit short SHA
|
||||||
function git_prompt_short_sha() {
|
function git_prompt_short_sha() {
|
||||||
SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
|
SHA=$(git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
|
||||||
|
|
|
||||||
6
lib/grep.zsh
Normal file
6
lib/grep.zsh
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
#
|
||||||
|
# Color grep results
|
||||||
|
# Examples: http://rubyurl.com/ZXv
|
||||||
|
#
|
||||||
|
export GREP_OPTIONS='--color=auto'
|
||||||
|
export GREP_COLOR='1;32'
|
||||||
|
|
@ -11,8 +11,6 @@ bindkey "^[[6~" down-line-or-history
|
||||||
# make search up and down work, so partially type and hit up/down to find relevant stuff
|
# make search up and down work, so partially type and hit up/down to find relevant stuff
|
||||||
bindkey '^[[A' up-line-or-search
|
bindkey '^[[A' up-line-or-search
|
||||||
bindkey '^[[B' down-line-or-search
|
bindkey '^[[B' down-line-or-search
|
||||||
bindkey '^p' up-line-or-search
|
|
||||||
bindkey '^n' down-line-or-search
|
|
||||||
|
|
||||||
bindkey "^[[H" beginning-of-line
|
bindkey "^[[H" beginning-of-line
|
||||||
bindkey "^[[1~" beginning-of-line
|
bindkey "^[[1~" beginning-of-line
|
||||||
|
|
@ -33,6 +31,21 @@ bindkey "^[[3~" delete-char
|
||||||
bindkey "^[3;5~" delete-char
|
bindkey "^[3;5~" delete-char
|
||||||
bindkey "\e[3~" delete-char
|
bindkey "\e[3~" delete-char
|
||||||
|
|
||||||
|
# consider emacs keybindings:
|
||||||
|
|
||||||
|
#bindkey -e ## emacs key bindings
|
||||||
|
#
|
||||||
|
#bindkey '^[[A' up-line-or-search
|
||||||
|
#bindkey '^[[B' down-line-or-search
|
||||||
|
#bindkey '^[^[[C' emacs-forward-word
|
||||||
|
#bindkey '^[^[[D' emacs-backward-word
|
||||||
|
#
|
||||||
|
#bindkey -s '^X^Z' '%-^M'
|
||||||
|
#bindkey '^[e' expand-cmd-path
|
||||||
|
#bindkey '^[^I' reverse-menu-complete
|
||||||
|
#bindkey '^X^N' accept-and-infer-next-history
|
||||||
|
#bindkey '^W' kill-region
|
||||||
|
#bindkey '^I' complete-word
|
||||||
## Fix weird sequence that rxvt produces
|
## Fix weird sequence that rxvt produces
|
||||||
#bindkey -s '^[[Z' '\t'
|
#bindkey -s '^[[Z' '\t'
|
||||||
#
|
#
|
||||||
|
|
|
||||||
44
lib/misc.zsh
44
lib/misc.zsh
|
|
@ -3,53 +3,11 @@ autoload -U url-quote-magic
|
||||||
zle -N self-insert url-quote-magic
|
zle -N self-insert url-quote-magic
|
||||||
|
|
||||||
## file rename magick
|
## file rename magick
|
||||||
autoload -U zmv
|
|
||||||
bindkey "^[m" copy-prev-shell-word
|
bindkey "^[m" copy-prev-shell-word
|
||||||
|
|
||||||
## jobs
|
## jobs
|
||||||
setopt long_list_jobs
|
setopt long_list_jobs
|
||||||
|
|
||||||
## pager
|
## pager
|
||||||
export PAGER='less -R'
|
export PAGER=less
|
||||||
export LC_CTYPE=$LANG
|
export LC_CTYPE=$LANG
|
||||||
|
|
||||||
## pretty man pages
|
|
||||||
function pman() {
|
|
||||||
man $1 -t | open -f -a Preview
|
|
||||||
}
|
|
||||||
#
|
|
||||||
## pretty JSON
|
|
||||||
function pj() {
|
|
||||||
python -mjson.tool
|
|
||||||
}
|
|
||||||
|
|
||||||
## Open current directory
|
|
||||||
alias oo='open .'
|
|
||||||
|
|
||||||
## Quick-look a file (^C to close)
|
|
||||||
alias ql='qlmanage -p 2>/dev/null'
|
|
||||||
|
|
||||||
## Start a local SMTP server and dump emails sent to it to the console
|
|
||||||
alias smtpconsole='python -m smtpd -n -c DebuggingServer localhost:1025'
|
|
||||||
|
|
||||||
## Serve the current folder on port 80
|
|
||||||
alias serve_this='python -m SimpleHTTPServer'
|
|
||||||
|
|
||||||
## Highlight-aware less command
|
|
||||||
alias hl='less -R'
|
|
||||||
|
|
||||||
## Show history
|
|
||||||
alias history='fc -l 1'
|
|
||||||
|
|
||||||
## Color grep results
|
|
||||||
## Examples: http://rubyurl.com/ZXv
|
|
||||||
export GREP_OPTIONS='--color=auto'
|
|
||||||
export GREP_COLOR='1;32'
|
|
||||||
|
|
||||||
# Quick and dirty encryption
|
|
||||||
function encrypt() {
|
|
||||||
openssl des3 -a -in $1 -out $1.des3
|
|
||||||
}
|
|
||||||
function decrypt() {
|
|
||||||
openssl des3 -d -a -in $1 -out ${1%.des3}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
function wo() {
|
|
||||||
[ "$VEW_SOURCED" ] || source "$VEW_PATH"
|
|
||||||
[ -f './.venv' ] && workon `cat ./.venv` || workon $1
|
|
||||||
export VEW_SOURCED=1
|
|
||||||
}
|
|
||||||
alias deact='deactivate'
|
|
||||||
alias cdv='cd $WORKON_HOME'
|
|
||||||
|
|
||||||
function cdp () {
|
|
||||||
cd "$(python -c "import os.path as _, ${1}; \
|
|
||||||
print _.dirname(_.realpath(${1}.__file__[:-1]))"
|
|
||||||
)"
|
|
||||||
}
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
alias res='./redis-server'
|
|
||||||
alias rec='./redis-cli'
|
|
||||||
7
lib/rvm.zsh
Normal file
7
lib/rvm.zsh
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
# get the name of the branch we are on
|
||||||
|
function rvm_prompt_info() {
|
||||||
|
ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
|
||||||
|
echo "($ruby_version)"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
alias ssd='sudo supervisord'
|
|
||||||
alias ssc='sudo supervisorctl'
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
# ls colors
|
# ls colors
|
||||||
autoload colors; colors;
|
autoload colors; colors;
|
||||||
export LSCOLORS="Gxfxcxdxbxegedabagacad"
|
export LSCOLORS="Gxfxcxdxbxegedabagacad"
|
||||||
|
#export LS_COLORS
|
||||||
|
|
||||||
# Enable ls colors
|
# Enable ls colors
|
||||||
if [ "$DISABLE_LS_COLORS" != "true" ]
|
if [ "$DISABLE_LS_COLORS" != "true" ]
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,7 @@ for plugin ($plugins); do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Load all of your custom configurations from custom/
|
# Load all of your custom configurations from custom/
|
||||||
if [ -d "$ZSH/custom" ]; then
|
for config_file ($ZSH_CUSTOM/*.zsh) source $config_file
|
||||||
for config_file ($ZSH/custom/*.zsh) source $config_file
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Load the theme
|
# Load the theme
|
||||||
if [ "$ZSH_THEME" = "random" ]
|
if [ "$ZSH_THEME" = "random" ]
|
||||||
|
|
|
||||||
|
|
@ -1,109 +0,0 @@
|
||||||
#!/usr/bin/env zsh
|
|
||||||
# Copyleft 2010 zsh-syntax-highlighting contributors
|
|
||||||
# http://github.com/nicoulaj/zsh-syntax-highlighting
|
|
||||||
# All wrongs reserved.
|
|
||||||
|
|
||||||
# Token types styles.
|
|
||||||
# See http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#SEC135
|
|
||||||
ZLE_RESERVED_WORD_STYLE='fg=yellow,bold'
|
|
||||||
ZLE_ALIAS_STYLE='fg=green,bold'
|
|
||||||
ZLE_BUILTIN_STYLE='fg=green,bold'
|
|
||||||
ZLE_FUNCTION_STYLE='fg=green,bold'
|
|
||||||
ZLE_COMMAND_STYLE='fg=green,bold'
|
|
||||||
ZLE_PATH_STYLE='fg=white,underline'
|
|
||||||
ZLE_COMMAND_UNKNOWN_TOKEN_STYLE='fg=red,bold'
|
|
||||||
|
|
||||||
ZLE_HYPHEN_CLI_OPTION='fg=yellow,bold'
|
|
||||||
ZLE_DOUBLE_HYPHEN_CLI_OPTION='fg=yellow,bold'
|
|
||||||
ZLE_SINGLE_QUOTED='fg=magenta,bold'
|
|
||||||
ZLE_DOUBLE_QUOTED='fg=magenta,bold'
|
|
||||||
ZLE_BACK_QUOTED='fg=cyan,bold'
|
|
||||||
ZLE_GLOBING='fg=blue,bold'
|
|
||||||
|
|
||||||
ZLE_DEFAULT='fg=white,normal'
|
|
||||||
|
|
||||||
ZLE_TOKENS_FOLLOWED_BY_COMMANDS=('|' '||' ';' '&' '&&' 'sudo' 'start' 'time' 'strace' 'noglob' 'command' 'builtin')
|
|
||||||
|
|
||||||
_check_path() {
|
|
||||||
[[ -z $arg ]] && return 1
|
|
||||||
[[ -e $arg ]] && return 0
|
|
||||||
[[ ! -e ${arg:h} ]] && return 1
|
|
||||||
[[ ${#BUFFER} == $end_pos && -n $(print $arg*(N)) ]] && return 0
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Recolorize the current ZLE buffer.
|
|
||||||
colorize-zle-buffer() {
|
|
||||||
setopt localoptions extendedglob
|
|
||||||
region_highlight=()
|
|
||||||
colorize=true
|
|
||||||
start_pos=0
|
|
||||||
for arg in ${(z)BUFFER}; do
|
|
||||||
((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]##[[:space:]]#}}))
|
|
||||||
((end_pos=$start_pos+${#arg}))
|
|
||||||
if $colorize; then
|
|
||||||
colorize=false
|
|
||||||
res=$(LC_ALL=C builtin type -w $arg 2>/dev/null)
|
|
||||||
case $res in
|
|
||||||
*': reserved') style=$ZLE_RESERVED_WORD_STYLE;;
|
|
||||||
*': alias') style=$ZLE_ALIAS_STYLE;;
|
|
||||||
*': builtin') style=$ZLE_BUILTIN_STYLE;;
|
|
||||||
*': function') style=$ZLE_FUNCTION_STYLE;;
|
|
||||||
*': command') style=$ZLE_COMMAND_STYLE;;
|
|
||||||
*)
|
|
||||||
if _check_path; then
|
|
||||||
style=$ZLE_PATH_STYLE
|
|
||||||
else
|
|
||||||
style=$ZLE_COMMAND_UNKNOWN_TOKEN_STYLE
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
case $arg in
|
|
||||||
'--'*) style=$ZLE_DOUBLE_HYPHEN_CLI_OPTION;;
|
|
||||||
'-'*) style=$ZLE_HYPHEN_CLI_OPTION;;
|
|
||||||
"'"*"'") style=$ZLE_SINGLE_QUOTED;;
|
|
||||||
'"'*'"') style=$ZLE_DOUBLE_QUOTED;;
|
|
||||||
'`'*'`') style=$ZLE_BACK_QUOTED;;
|
|
||||||
*"*"*) style=$ZLE_GLOBING;;
|
|
||||||
*)
|
|
||||||
style=$ZLE_DEFAULT
|
|
||||||
_check_path && style=$ZLE_PATH_STYLE
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
region_highlight+=("$start_pos $end_pos $style")
|
|
||||||
[[ ${${ZLE_TOKENS_FOLLOWED_BY_COMMANDS[(r)${arg//|/\|}]:-}:+yes} = 'yes' ]] && colorize=true
|
|
||||||
start_pos=$end_pos
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
# Bind the function to ZLE events.
|
|
||||||
ZLE_COLORED_FUNCTIONS=(
|
|
||||||
self-insert
|
|
||||||
delete-char
|
|
||||||
backward-delete-char
|
|
||||||
kill-word
|
|
||||||
backward-kill-word
|
|
||||||
up-line-or-history
|
|
||||||
down-line-or-history
|
|
||||||
beginning-of-history
|
|
||||||
end-of-history
|
|
||||||
undo
|
|
||||||
redo
|
|
||||||
yank
|
|
||||||
)
|
|
||||||
|
|
||||||
for f in $ZLE_COLORED_FUNCTIONS; do
|
|
||||||
eval "$f() { zle .$f && colorize-zle-buffer } ; zle -N $f"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Expand or complete hack
|
|
||||||
|
|
||||||
# create an expansion widget which mimics the original "expand-or-complete" (you can see the default setup using "zle -l -L")
|
|
||||||
zle -C orig-expand-or-complete .expand-or-complete _main_complete
|
|
||||||
|
|
||||||
# use the orig-expand-or-complete inside the colorize function (for some reason, using the ".expand-or-complete" widget doesn't work the same)
|
|
||||||
expand-or-complete() { builtin zle orig-expand-or-complete && colorize-zle-buffer }
|
|
||||||
zle -N expand-or-complete
|
|
||||||
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
#!zsh
|
|
||||||
#
|
|
||||||
# Installation
|
|
||||||
# ------------
|
|
||||||
#
|
|
||||||
# To achieve fabfile completion nirvana:
|
|
||||||
#
|
|
||||||
# Copy this file somewhere (e.g. ~/.fab-comletion.zsh) and put the following line in your .zshrc:
|
|
||||||
#
|
|
||||||
# source ~/.fab-comletion.zsh
|
|
||||||
#
|
|
||||||
# Or, use this file as a oh-my-zsh plugin.
|
|
||||||
#
|
|
||||||
|
|
||||||
_fab_list() {
|
|
||||||
reply=(`fab --shortlist`)
|
|
||||||
}
|
|
||||||
compctl -K _fab_list fab
|
|
||||||
|
|
||||||
|
|
@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
|
||||||
# Look in ~/.oh-my-zsh/themes/
|
# Look in ~/.oh-my-zsh/themes/
|
||||||
# Optionally, if you set this to "random", it'll load a random theme each
|
# Optionally, if you set this to "random", it'll load a random theme each
|
||||||
# time that oh-my-zsh is loaded.
|
# time that oh-my-zsh is loaded.
|
||||||
export ZSH_THEME="random"
|
ZSH_THEME="robbyrussell"
|
||||||
|
|
||||||
# Example aliases
|
# Example aliases
|
||||||
# alias zshconfig="mate ~/.zshrc"
|
# alias zshconfig="mate ~/.zshrc"
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
# based on robbyrussel.zsh-theme
|
|
||||||
|
|
||||||
PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
|
|
||||||
RPROMPT="%{$fg_bold[red]%}(%D{%m-%d %H:%M})%{$reset_color%}"
|
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
if [ "x$OH_MY_ZSH_HG" = "x" ]; then
|
|
||||||
OH_MY_ZSH_HG="hg"
|
|
||||||
fi
|
|
||||||
|
|
||||||
function virtualenv_info {
|
|
||||||
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
|
|
||||||
}
|
|
||||||
|
|
||||||
function hg_prompt_info {
|
|
||||||
$OH_MY_ZSH_HG prompt --angle-brackets "\
|
|
||||||
< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
|
|
||||||
< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
|
|
||||||
%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
|
|
||||||
patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
function box_name {
|
|
||||||
[ -f ~/.box-name ] && cat ~/.box-name || hostname -s
|
|
||||||
}
|
|
||||||
|
|
||||||
PROMPT='
|
|
||||||
%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}$(box_name)%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info)
|
|
||||||
$(virtualenv_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ '
|
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
|
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
|
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
|
||||||
|
|
||||||
local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}"
|
|
||||||
RPROMPT='${return_status}%{$reset_color%}'
|
|
||||||
|
|
@ -5,7 +5,7 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
|
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
|
||||||
/usr/bin/env git clone git://github.com/sjl/oh-my-zsh.git ~/.oh-my-zsh
|
/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
|
||||||
|
|
||||||
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
|
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
|
||||||
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
|
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue