linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge c4342b0f22 into 6b3c953775

Browse source
This commit is contained in:
ryneeverett 2014-02-26 02:29:30 -05:00
commit 0c83a3f747
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/git-prompt/gitstatus.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
# -*- coding: UTF-8 -*- # -*- coding: UTF-8 -*-
# change those symbols to whatever you prefer # change those symbols to whatever you prefer
@ -18,7 +18,7 @@ behead_re = re.compile(r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) com
diverge_re = re.compile(r"^# and have (\d+) and (\d+) different") diverge_re = re.compile(r"^# and have (\d+) and (\d+) different")
status = '' status = ''
staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE) staged = re.compile(b'^# Changes to be committed:$', re.MULTILINE)
changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE) changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE)
untracked = re.compile(r'^# Untracked files:$', re.MULTILINE) untracked = re.compile(r'^# Untracked files:$', re.MULTILINE)
unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE) unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE)
@ -64,5 +64,4 @@ else:
if div_match: if div_match:
remote = "{behind}{1}{ahead of}{0}".format(*div_match.groups(), **symbols) remote = "{behind}{1}{ahead of}{0}".format(*div_match.groups(), **symbols)
print '\n'.join([branch,remote,status]) print ('\n'.join([branch,remote,status]))