Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
meishi125478
ohmyzsh
提交
eced76e0
O
ohmyzsh
项目概览
meishi125478
/
ohmyzsh
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
ohmyzsh
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eced76e0
编写于
12月 14, 2014
作者:
R
Robby Russell
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
上级
311f3630
00ec11d3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
16 addition
and
16 deletion
+16
-16
lib/git.zsh
lib/git.zsh
+1
-1
plugins/mercurial/mercurial.plugin.zsh
plugins/mercurial/mercurial.plugin.zsh
+1
-1
plugins/svn-fast-info/svn-fast-info.plugin.zsh
plugins/svn-fast-info/svn-fast-info.plugin.zsh
+6
-6
plugins/svn/svn.plugin.zsh
plugins/svn/svn.plugin.zsh
+2
-2
themes/agnoster.zsh-theme
themes/agnoster.zsh-theme
+2
-2
themes/bureau.zsh-theme
themes/bureau.zsh-theme
+1
-1
themes/mortalscumbag.zsh-theme
themes/mortalscumbag.zsh-theme
+3
-3
未找到文件。
lib/git.zsh
浏览文件 @
eced76e0
...
...
@@ -78,7 +78,7 @@ function git_prompt_long_sha() {
git_prompt_status
()
{
INDEX
=
$(
command
git status
--porcelain
-b
2> /dev/null
)
STATUS
=
""
if
$(
echo
"
$INDEX
"
|
grep
-E
'^\?\? '
&> /dev/null
)
;
then
if
$(
echo
"
$INDEX
"
|
command
grep
-E
'^\?\? '
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS
"
fi
if
$(
echo
"
$INDEX
"
|
grep
'^A '
&> /dev/null
)
;
then
...
...
plugins/mercurial/mercurial.plugin.zsh
浏览文件 @
eced76e0
...
...
@@ -42,7 +42,7 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_SU
function
hg_dirty_choose
{
if
[
$(
in_hg
)
]
;
then
hg status 2> /dev/null |
grep
-Eq
'^\s*[ACDIM!?L]'
hg status 2> /dev/null |
command
grep
-Eq
'^\s*[ACDIM!?L]'
if
[
$pipestatus
[
-1
]
-eq
0
]
;
then
# Grep exits with 0 when "One or more lines were selected", return "dirty".
echo
$1
...
...
plugins/svn-fast-info/svn-fast-info.plugin.zsh
浏览文件 @
eced76e0
...
...
@@ -63,11 +63,11 @@ function svn_current_revision() {
function
svn_status_info
()
{
local
svn_status_string
=
"
$ZSH_THEME_SVN_PROMPT_CLEAN
"
local
svn_status
=
"
$(
svn status 2> /dev/null
)
"
;
if
grep
-E
'^\s*A'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_ADDITIONS
:-
+
}
"
;
fi
if
grep
-E
'^\s*D'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_DELETIONS
:-
✖
}
"
;
fi
if
grep
-E
'^\s*M'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_MODIFICATIONS
:-
✎
}
"
;
fi
if
grep
-E
'^\s*[R~]'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_REPLACEMENTS
:-
∿
}
"
;
fi
if
grep
-E
'^\s*\?'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_UNTRACKED
:-
?
}
"
;
fi
if
grep
-E
'^\s*[CI!L]'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_DIRTY
:-
'!'
}
"
;
fi
if
command
grep
-E
'^\s*A'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_ADDITIONS
:-
+
}
"
;
fi
if
command
grep
-E
'^\s*D'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_DELETIONS
:-
✖
}
"
;
fi
if
command
grep
-E
'^\s*M'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_MODIFICATIONS
:-
✎
}
"
;
fi
if
command
grep
-E
'^\s*[R~]'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_REPLACEMENTS
:-
∿
}
"
;
fi
if
command
grep
-E
'^\s*\?'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_UNTRACKED
:-
?
}
"
;
fi
if
command
grep
-E
'^\s*[CI!L]'
&> /dev/null
<<<
$svn_status
;
then
svn_status_string
=
"
$svn_status_string
${
ZSH_THEME_SVN_PROMPT_DIRTY
:-
'!'
}
"
;
fi
echo
$svn_status_string
}
plugins/svn/svn.plugin.zsh
浏览文件 @
eced76e0
...
...
@@ -61,7 +61,7 @@ function svn_get_rev_nr() {
function
svn_dirty_choose
()
{
if
in_svn
;
then
root
=
`
svn info 2> /dev/null |
sed
-n
's/^Working Copy Root Path: //p'
`
if
$(
svn status
$root
2> /dev/null |
grep
-Eq
'^\s*[ACDIM!?L]'
)
;
then
if
$(
svn status
$root
2> /dev/null |
command
grep
-Eq
'^\s*[ACDIM!?L]'
)
;
then
# Grep exits with 0 when "One or more lines were selected", return "dirty".
echo
$1
else
...
...
@@ -78,7 +78,7 @@ function svn_dirty() {
function
svn_dirty_choose_pwd
()
{
if
in_svn
;
then
root
=
$PWD
if
$(
svn status
$root
2> /dev/null |
grep
-Eq
'^\s*[ACDIM!?L]'
)
;
then
if
$(
svn status
$root
2> /dev/null |
command
grep
-Eq
'^\s*[ACDIM!?L]'
)
;
then
# Grep exits with 0 when "One or more lines were selected", return "dirty".
echo
$1
else
...
...
themes/agnoster.zsh-theme
浏览文件 @
eced76e0
...
...
@@ -123,10 +123,10 @@ prompt_hg() {
st
=
""
rev
=
$(
hg
id
-n
2>/dev/null |
sed
's/[^-0-9]//g'
)
branch
=
$(
hg
id
-b
2>/dev/null
)
if
`
hg st |
grep
-
E
q
"^
\?
"
`
;
then
if
`
hg st |
grep
-q
"^
\?
"
`
;
then
prompt_segment red black
st
=
'±'
elif
`
hg st |
grep
-
E
q
"^(M|A)"
`
;
then
elif
`
hg st |
grep
-q
"^(M|A)"
`
;
then
prompt_segment yellow black
st
=
'±'
else
...
...
themes/bureau.zsh-theme
浏览文件 @
eced76e0
...
...
@@ -31,7 +31,7 @@ bureau_git_status () {
if $(echo "$_INDEX" | grep '^.[MTD] ' &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
fi
if $(echo "$_INDEX" | grep -E '^\?\? ' &> /dev/null); then
if $(echo "$_INDEX" |
command
grep -E '^\?\? ' &> /dev/null); then
_STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
fi
if $(echo "$_INDEX" | grep '^UU ' &> /dev/null); then
...
...
themes/mortalscumbag.zsh-theme
浏览文件 @
eced76e0
...
...
@@ -10,12 +10,12 @@ function my_git_prompt() {
fi
# is anything staged?
if $(echo "$INDEX" | grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then
if $(echo "$INDEX" |
command
grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
fi
# is anything unstaged?
if $(echo "$INDEX" | grep -E -e '^[ MARC][MD] ' &> /dev/null); then
if $(echo "$INDEX" |
command
grep -E -e '^[ MARC][MD] ' &> /dev/null); then
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
fi
...
...
@@ -25,7 +25,7 @@ function my_git_prompt() {
fi
# is anything unmerged?
if $(echo "$INDEX" | grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then
if $(echo "$INDEX" |
command
grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
fi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录