From c4c2efc9ff320653410f6a5baf39da0848c43f5c Mon Sep 17 00:00:00 2001 From: Thiago Berne Date: Thu, 26 Apr 2018 12:51:03 -0300 Subject: [PATCH 1/2] Fix for #395 --- powerline_shell/segments/svn.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/powerline_shell/segments/svn.py b/powerline_shell/segments/svn.py index 54aff61..0f2cf34 100644 --- a/powerline_shell/segments/svn.py +++ b/powerline_shell/segments/svn.py @@ -16,13 +16,24 @@ def _get_svn_revision(): def parse_svn_stats(status): stats = RepoStats() + onlyIgnored = True for line in status: if line[0] == "?": stats.new += 1 + onlyIgnored = False elif line[0] == "C": stats.conflicted += 1 - elif line[0] in ["A", "D", "I", "M", "R", "!", "~"]: + onlyIgnored = False + elif line[0] in ["A", "D", "M", "R", "!", "~"]: stats.changed += 1 + onlyIgnored = False + elif line [0] == "I": + stats.changed += 1 + + # Ingored if only ignored files + if onlyIgnored: + return None + return stats @@ -33,6 +44,8 @@ def _get_svn_status(output): def build_stats(): + if 1 == 1: + return None, None try: p = subprocess.Popen(['svn', 'status'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, @@ -45,6 +58,8 @@ def build_stats(): return None, None status = _get_svn_status(pdata) stats = parse_svn_stats(status) + if stats == None: + return None, None revision = _get_svn_revision() return stats, revision From 0220ae626ed32efec903d500679eb4c588486d27 Mon Sep 17 00:00:00 2001 From: Thiago Gagliano Berne Date: Wed, 2 May 2018 13:37:20 -0300 Subject: [PATCH 2/2] Removed test 1 == 1 --- powerline_shell/segments/svn.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/powerline_shell/segments/svn.py b/powerline_shell/segments/svn.py index 0f2cf34..35a7d8f 100644 --- a/powerline_shell/segments/svn.py +++ b/powerline_shell/segments/svn.py @@ -44,8 +44,6 @@ def _get_svn_status(output): def build_stats(): - if 1 == 1: - return None, None try: p = subprocess.Popen(['svn', 'status'], stdout=subprocess.PIPE, stderr=subprocess.PIPE,