Mercurial > hg > mutable-history
changeset 339:3853061e7fea stable
[obsolete] convert json unicode into string before creating an obsolete marker
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 06 Jul 2012 16:25:06 +0200 |
parents | b922d144f93d |
children | 37b543215187 |
files | hgext/obsolete.py |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/obsolete.py +++ b/hgext/obsolete.py @@ -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))