Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
meishi125478
ohmyzsh
提交
01261d47
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,体验更适合开发者的 AI 搜索 >>
提交
01261d47
编写于
3月 08, 2014
作者:
R
Robby Russell
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2556 from chrisjones-brack3t/fix/git-prompt-1-9
git-prompt (gitstatus.py) plugin fix
上级
0e10ebb9
c397000b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
51 addition
and
37 deletion
+51
-37
plugins/git-prompt/gitstatus.py
plugins/git-prompt/gitstatus.py
+51
-37
未找到文件。
plugins/git-prompt/gitstatus.py
浏览文件 @
01261d47
#!/usr/bin/env python
# -*- coding: UTF-8 -*-
from
subprocess
import
Popen
,
PIPE
import
re
# change those symbols to whatever you prefer
symbols
=
{
'ahead of'
:
'↑'
,
'behind'
:
'↓'
,
'staged'
:
'♦'
,
'changed'
:
'‣'
,
'untracked'
:
'…'
,
'clean'
:
'⚡'
,
'unmerged'
:
'≠'
,
'sha1'
:
':'
}
from
subprocess
import
Popen
,
PIPE
symbols
=
{
'ahead of'
:
'↑'
,
'behind'
:
'↓'
,
'staged'
:
'♦'
,
'changed'
:
'‣'
,
'untracked'
:
'…'
,
'clean'
:
'⚡'
,
'unmerged'
:
'≠'
,
'sha1'
:
':'
}
output
,
error
=
Popen
([
'git'
,
'status'
],
stdout
=
PIPE
,
stderr
=
PIPE
).
communicate
()
output
,
error
=
Popen
(
[
'git'
,
'status'
],
stdout
=
PIPE
,
stderr
=
PIPE
).
communicate
()
if
error
:
import
sys
sys
.
exit
(
0
)
import
sys
sys
.
exit
(
0
)
lines
=
output
.
splitlines
()
import
re
behead_re
=
re
.
compile
(
r
"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit"
)
behead_re
=
re
.
compile
(
r
"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit"
)
diverge_re
=
re
.
compile
(
r
"^# and have (\d+) and (\d+) different"
)
status
=
''
...
...
@@ -23,46 +33,50 @@ changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
untracked
=
re
.
compile
(
r
'^# Untracked files:$'
,
re
.
MULTILINE
)
unmerged
=
re
.
compile
(
r
'^# Unmerged paths:$'
,
re
.
MULTILINE
)
def
execute
(
*
command
):
out
,
err
=
Popen
(
stdout
=
PIPE
,
stderr
=
PIPE
,
*
command
).
communicate
()
if
not
err
:
nb
=
len
(
out
.
splitlines
())
else
:
nb
=
'?'
return
nb
out
,
err
=
Popen
(
stdout
=
PIPE
,
stderr
=
PIPE
,
*
command
).
communicate
()
if
not
err
:
nb
=
len
(
out
.
splitlines
())
else
:
nb
=
'?'
return
nb
if
staged
.
search
(
output
):
nb
=
execute
([
'git'
,
'diff'
,
'--staged'
,
'--name-only'
,
'--diff-filter=ACDMRT'
])
status
+=
'%s%s'
%
(
symbols
[
'staged'
],
nb
)
nb
=
execute
(
[
'git'
,
'diff'
,
'--staged'
,
'--name-only'
,
'--diff-filter=ACDMRT'
])
status
+=
'%s%s'
%
(
symbols
[
'staged'
],
nb
)
if
unmerged
.
search
(
output
):
nb
=
execute
([
'git'
,
'diff'
,
'--staged'
,
'--name-only'
,
'--diff-filter=U'
])
status
+=
'%s%s'
%
(
symbols
[
'unmerged'
],
nb
)
nb
=
execute
([
'git'
,
'diff'
,
'--staged'
,
'--name-only'
,
'--diff-filter=U'
])
status
+=
'%s%s'
%
(
symbols
[
'unmerged'
],
nb
)
if
changed
.
search
(
output
):
nb
=
execute
([
'git'
,
'diff'
,
'--name-only'
,
'--diff-filter=ACDMRT'
])
status
+=
'%s%s'
%
(
symbols
[
'changed'
],
nb
)
nb
=
execute
([
'git'
,
'diff'
,
'--name-only'
,
'--diff-filter=ACDMRT'
])
status
+=
'%s%s'
%
(
symbols
[
'changed'
],
nb
)
if
untracked
.
search
(
output
):
## nb = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
## status += "%s" % (symbols['untracked']*(nb//3 + 1), )
status
+=
symbols
[
'untracked'
]
status
+=
symbols
[
'untracked'
]
if
status
==
''
:
status
=
symbols
[
'clean'
]
status
=
symbols
[
'clean'
]
remote
=
''
bline
=
lines
[
0
]
if
bline
.
find
(
'Not currently on any branch'
)
!=
-
1
:
branch
=
symbols
[
'sha1'
]
+
Popen
([
'git'
,
'rev-parse'
,
'--short'
,
'HEAD'
],
stdout
=
PIPE
).
communicate
()[
0
][:
-
1
]
branch
=
symbols
[
'sha1'
]
+
Popen
([
'git'
,
'rev-parse'
,
'--short'
,
'HEAD'
],
stdout
=
PIPE
).
communicate
()[
0
][:
-
1
]
else
:
branch
=
bline
.
split
(
' '
)[
3
]
bstatusline
=
lines
[
1
]
match
=
behead_re
.
match
(
bstatusline
)
if
match
:
remote
=
symbols
[
match
.
groups
()[
0
]]
remote
+=
match
.
groups
()[
2
]
elif
lines
[
2
:]:
div_match
=
diverge_re
.
match
(
lines
[
2
])
if
div_match
:
remote
=
"{behind}{1}{ahead of}{0}"
.
format
(
*
div_match
.
groups
(),
**
symbols
)
print
'
\n
'
.
join
([
branch
,
remote
,
status
])
branch
=
bline
.
split
(
' '
)[
-
1
]
bstatusline
=
lines
[
1
]
match
=
behead_re
.
match
(
bstatusline
)
if
match
:
remote
=
symbols
[
match
.
groups
()[
0
]]
remote
+=
match
.
groups
()[
2
]
elif
lines
[
2
:]:
div_match
=
diverge_re
.
match
(
lines
[
2
])
if
div_match
:
remote
=
"{behind}{1}{ahead of}{0}"
.
format
(
*
div_match
.
groups
(),
**
symbols
)
print
(
'
\n
'
.
join
([
branch
,
remote
,
status
]))
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录