X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2384208b1967f12992caf087dca475d70fa765a3..aee39efde819f0381a7aa65bc32145d2709cf088:/lib/wlrepo/mercurial_backend/__init__.py diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py index 6dd3c11b..f919e817 100644 --- a/lib/wlrepo/mercurial_backend/__init__.py +++ b/lib/wlrepo/mercurial_backend/__init__.py @@ -7,6 +7,9 @@ __doc__ = "Module documentation." import wlrepo from mercurial.node import nullid +from mercurial import encoding +encoding.encoding = 'utf-8' + class MercurialRevision(wlrepo.Revision): def __init__(self, lib, changectx): @@ -28,11 +31,11 @@ class MercurialRevision(wlrepo.Revision): @property def document_name(self): - return self._docname.decode('utf-8') + return self._docname and self._docname.decode('utf-8') @property def user_name(self): - return self._username.decode('utf-8') + return self._username and self._username.decode('utf-8') def hgrev(self): return self._changectx.node() @@ -72,7 +75,7 @@ class MercurialRevision(wlrepo.Revision): a = self._changectx.ancestor(other._changectx) return (a.branch() == self._changectx.branch()) - def children(self): + def has_children(self): return bool(self._library._hgrepo.changelog.children(self.hgrev())) def merge_with(self, other, user, message):