# HG changeset patch # User Pierre-Yves David # Date 1341584706 -7200 # Node ID 3853061e7fea664dab70c0c1c0dae383db0b8ddf # Parent b922d144f93d218aecdb1be4db93c998f44ed6a7 [obsolete] convert json unicode into string before creating an obsolete marker diff -r b922d144f93d -r 3853061e7fea hgext/obsolete.py --- 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))