Merge branch 'master' of stigma:platforma

[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 c1d3d30..9a22395 100644 (file)
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -5,6 +5,7 @@ __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."
 
 import wlrepo
 __doc__ = "Module documentation."
 
 import wlrepo

+from mercurial.node import nullid

 
 class MercurialRevision(wlrepo.Revision):
 
 
 class MercurialRevision(wlrepo.Revision):
 


@@ -27,11 +28,11 @@ class MercurialRevision(wlrepo.Revision):
         
     @property
     def document_name(self):
         
     @property
     def document_name(self):

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

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

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

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


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

-        lock = self._library._lock(True)
+        lock = self._library.lock(True)

         try:
             self._library._checkout(self._changectx.node())
             status = self._library._merge(other._changectx.node())
         try:
             self._library._checkout(self._changectx.node())
             status = self._library._merge(other._changectx.node())

-            if status.is_clean():
+            if status.isclean():

                 self._library._commit(user=user, message=message)
                 return (True, True)
             else:
                 self._library._commit(user=user, message=message)
                 return (True, True)
             else: