[meld/meld-3-14] vcview: Hack for bad handling of unicode commit messages (bgo#755030)



commit d0bf386c54c8dc1746fdbeffec0a88814b5c0f92
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Oct 4 09:15:48 2015 +1000

    vcview: Hack for bad handling of unicode commit messages (bgo#755030)
    
    This is a minimal work around for the 3.14 branch; this code is gone in
    master.

 meld/vcview.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vcview.py b/meld/vcview.py
index 15cf795..a08c43f 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -660,7 +660,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                 return '"%s"' % s if len(s.split()) > 1 else s
             return " ".join(quote(tok) for tok in command)
 
-        msg = shelljoin(command)
+        msg = misc.fallback_decode(shelljoin(command), ['utf-8'], lossy=True)
         yield "[%s] %s" % (self.label_text, msg.replace("\n", "\t"))
         def relpath(pbase, p):
             kill = 0


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