Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't decode unicode strings.
authorThomas Arendsen Hein <thomas@intevation.de>
Fri, 07 Sep 2007 16:14:51 +0200
changeset 5287 c6f932d3e0f6
parent 5286 cbec83d9b0b4
child 5288 18091102a633
Don't decode unicode strings. This does not work with python2.3 and is probably not useful anyway with 2.4.
hgext/convert/common.py file | annotate | diff | comparison | revisions
hgext/convert/subversion.py file | annotate | diff | comparison | revisions 
--- a/hgext/convert/common.py	Thu Sep 06 18:12:36 2007 -0700
+++ b/hgext/convert/common.py	Fri Sep 07 16:14:51 2007 +0200
@@ -75,6 +75,8 @@
         if not encoding:
             encoding = self.encoding or 'utf-8'
 
+        if isinstance(s, unicode):
+            return s.encode("utf-8")
         try:
             return s.decode(encoding).encode("utf-8")
         except:
--- a/hgext/convert/subversion.py	Thu Sep 06 18:12:36 2007 -0700
+++ b/hgext/convert/subversion.py	Fri Sep 07 16:14:51 2007 +0200
@@ -278,7 +278,8 @@
     def revid(self, revnum, module=None):
         if not module:
             module = self.module
-        return (u"svn:%s%s@%s" % (self.uuid, module, revnum)).decode(self.encoding)
+        return u"svn:%s%s@%s" % (self.uuid, module.decode(self.encoding),
+                                 revnum)
 
     def revnum(self, rev):
         return int(rev.split('@')[-1])
mercurial