Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[obsolete] convert json unicode into string before creating an obsolete marker stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Fri, 06 Jul 2012 16:25:06 +0200
branchstable
changeset 339 3853061e7fea
parent 338 b922d144f93d
child 340 37b543215187
[obsolete] convert json unicode into string before creating an obsolete marker
hgext/obsolete.py file | annotate | diff | comparison | revisions 
--- a/hgext/obsolete.py	Fri Jul 06 15:39:01 2012 +0200
+++ b/hgext/obsolete.py	Fri Jul 06 16:25:06 2012 +0200
@@ -617,9 +617,11 @@
                         pass
 
                 oldmark['date'] = '%i %i' % tuple(oldmark['date'])
+                meta = dict((k.encode('utf-8'), v.encode('utf-8'))
+                             for k, v in oldmark.iteritems())
                 try:
                     store.create(bin(oldobject), [bin(n) for n in oldsubjects],
-                                 0, oldmark)
+                                 0, meta)
                 except ValueError:
                     repo.ui.write_err("invalid marker %s -> %s\n"
                                  % (oldobject, oldsubjects))
evolve