Fixed '%m' token always being displayed in Python 3.

djl · Dec 28, 2012 · a3c2da6 · a3c2da6
1 parent f1cf541
commit a3c2da6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@
 ------------------
 
 * Fixed: '%m' token in Bazaar when working dir has modified and untracked files
+* Fixed: '%u' token always being shown in Python 3.
 * Changed: Better handling of '%a' and '%m' token in Subversion
 
 

diff --git a/bin/vcprompt b/bin/vcprompt
@@ -269,16 +269,16 @@ def bzr(options):
         output, returncode = popen('bzr status --short')
 
         if returncode == 0:
-            if output == '':
-                modified = ''
-                untracked = ''
-            else:
+            if output:
                 for line in output.splitlines():
                     line = line.strip()
                     if line.startswith('M'):
                         modified = options.modified
                     elif line.startswith('?'):
                         untracked = options.untracked
+            else:
+                modified = ''
+                untracked = ''
 
     # formatting
     return {
@@ -509,10 +509,10 @@ def git(options):
         output, returncode = popen('git ls-files --other --exclude-standard')
 
         if returncode == 0:
-            if output == '':
-                untracked = ''
-            else:
+            if output:
                 untracked = options.untracked
+            else:
+                untracked = ''
 
     # staged files
     if '%a' in options.format:
@@ -567,10 +567,10 @@ def hg(options):
         output, returncode = popen('hg status --modified')
 
         if returncode == 0:
-            if output == '':
-                modified = ''
-            else:
+            if output:
                 modified = options.modified
+            else:
+                modified = ''
 
     # untracked
     if '%u' in options.format: