X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b363e4352ce32f4518b5e5bb794635074d5f6ba6..333700b34cb944ab49d1c9243f7193d50d25ebd1:/lib/wlrepo/mercurial_backend/__init__.py diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py index 2d0ce828..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 + return self._docname and self._docname.decode('utf-8') @property def user_name(self): - return self._username + return self._username and self._username.decode('utf-8') def hgrev(self): return self._changectx.node() @@ -43,9 +46,16 @@ class MercurialRevision(wlrepo.Revision): def hgbranch(self): return self._changectx.branch() + @property + def timestamp(self): + return self._changectx.date()[0] + def __unicode__(self): return u"%s" % self._changectx.hex() + def __str__(self): + return self.__unicode__().encode('utf-8') + def __repr__(self): return "%s" % self._changectx.hex() @@ -65,6 +75,9 @@ class MercurialRevision(wlrepo.Revision): a = self._changectx.ancestor(other._changectx) return (a.branch() == self._changectx.branch()) + def has_children(self): + return bool(self._library._hgrepo.changelog.children(self.hgrev())) + def merge_with(self, other, user, message): lock = self._library.lock(True) try: