[meld] vc.bzr: Replace bzr output with unicode arrows... just because



commit abe21f2dbb0a63d82392037d4ca422ab897c047b
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun May 25 06:39:50 2014 +1000

    vc.bzr: Replace bzr output with unicode arrows... just because

 meld/vc/bzr.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 294a4ea..f07fc5f 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -42,7 +42,6 @@ class Vc(_vc.CachedVc):
     VC_DIR = ".bzr"
     PATCH_INDEX_RE = "^=== modified file '(.*)' (.*)$"
     CONFLICT_RE = "conflict in (.*)$"
-    #RENAMED_RE = u"^(.*) ⇒ (.*)$"
     RENAMED_RE = u"^(.*) => (.*)$"
 
 
@@ -189,9 +188,9 @@ class Vc(_vc.CachedVc):
             if _vc.STATE_RENAMED in states:
                 real_path_match = re.search(self.RENAMED_RE, name)
                 if real_path_match is not None:
-                    meta.append(name)
                     old_name = real_path_match.group(1)
                     name = real_path_match.group(2)
+                    meta.append("%s ➡ %s" % (old_name, name))
 
             path = os.path.join(branch_root, name)
             if old_name:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]