Podwyższenie wymaganej wersji biblioteki librarian do 1.2.5 (wydanej dzisiaj).

[redakcja.git] / lib / wlrepo / mercurial_backend / __init__.py

diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py
index f0d3d07..f919e81 100644 (file)
--- 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
 
 import wlrepo
 from mercurial.node import nullid
 

+from mercurial import encoding
+encoding.encoding = 'utf-8'
+

 class MercurialRevision(wlrepo.Revision):
 
     def __init__(self, lib, changectx):
 class MercurialRevision(wlrepo.Revision):
 
     def __init__(self, lib, changectx):


@@ -28,11 +31,11 @@ class MercurialRevision(wlrepo.Revision):
         
     @property
     def document_name(self):
         
     @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):
 
     @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()
 
     def hgrev(self):
         return self._changectx.node()


@@ -73,9 +76,7 @@ class MercurialRevision(wlrepo.Revision):
         return (a.branch() == self._changectx.branch())
 
     def has_children(self):
         return (a.branch() == self._changectx.branch())
 
     def has_children(self):

-        children = self._library._hgrepo.changelog.children(self.hgrev())
-        print "C:", children, bool(children)
-        return bool(children)
+        return bool(self._library._hgrepo.changelog.children(self.hgrev()))

 
     def merge_with(self, other, user, message):
         lock = self._library.lock(True)
 
     def merge_with(self, other, user, message):
         lock = self._library.lock(True)