Galerie mk2

[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 2d0ce82..536d08c 100644 (file)
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 # -*- encoding: utf-8 -*-
 

+import logging
+log = logging.getLogger('ral.mercurial')
+

 __author__= "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."
 __author__= "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."


@@ -7,6 +10,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 +34,11 @@ class MercurialRevision(wlrepo.Revision):
         
     @property
     def document_name(self):
         
     @property
     def document_name(self):

-        return self._docname
+        return self._docname and self._docname.decode('utf-8')

 
     @property
     def user_name(self):
 
     @property
     def user_name(self):

-        return self._username
+        return self._username and self._username.decode('utf-8')

 
     def hgrev(self):
         return self._changectx.node()
 
     def hgrev(self):
         return self._changectx.node()


@@ -43,9 +49,16 @@ class MercurialRevision(wlrepo.Revision):
     def hgbranch(self):
         return self._changectx.branch()
 
     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 __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()
 
     def __repr__(self):
         return "%s" % self._changectx.hex()
 


@@ -65,7 +78,11 @@ class MercurialRevision(wlrepo.Revision):
         a = self._changectx.ancestor(other._changectx)       
         return (a.branch() == self._changectx.branch())
 
         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):
     def merge_with(self, other, user, message):

+        message = self._library._sanitize_string(message)

         lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())
         lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())