decade-public/over-env
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix GitPart

Browse source
This commit is contained in:
Martinez 2015-12-26 01:50:51 +01:00
parent cd3dd70b45
commit 370ba5c576
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
render.py
View file

@ -324,19 +324,19 @@ class GitPart(Part):
if branch_name: if branch_name:
self.fragments.append("| ") self.fragments.append("| ")
count_ahead = command("git log --oneline @{u}..").count("\n") count_to_pull = command("git log --oneline ..@{u}").count("\n")
count_behind = command("git log --oneline ..@{u}").count("\n") count_to_push = command("git log --oneline @{u}..").count("\n")
git_dir = command("git rev-parse --git-dir").strip() git_dir = command("git rev-parse --git-dir").strip()
merging = os.path.exists(os.path.join(git_dir, "MERGE_HEAD")) merging = os.path.exists(os.path.join(git_dir, "MERGE_HEAD"))
untracked = command("git ls-files --other --exclude-standard").count("\n") untracked = command("git ls-files --other --exclude-standard").count("\n")
modified = command("git diff --name-only").count("\n") modified = command("git diff --name-only").count("\n")
staged = command("git diff --name-only --staged").count("\n") staged = command("git diff --name-only --staged").count("\n")
if count_ahead: if count_to_pull:
self.fragments.append("↘%d " %(count_ahead)) self.fragments.append("↘%d " %(count_to_pull))
if count_behind: if count_to_push:
self.fragments.append("↗%d " %(count_behind)) self.fragments.append("↗%d " %(count_to_push))
if merging: if merging:
self.fragments.append(style_color(COLOR_GIT_MERGE)) self.fragments.append(style_color(COLOR_GIT_MERGE))