FIX: TypeError przy akceptacji Pull Requestów.

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

diff --git a/lib/wlrepo/mercurial_backend/library.py b/lib/wlrepo/mercurial_backend/library.py
index e28bd7e..cde7af9 100644 (file)
--- a/lib/wlrepo/mercurial_backend/library.py
+++ b/lib/wlrepo/mercurial_backend/library.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:33:02$"
 __doc__ = "Module documentation."
 __author__= "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:33:02$"
 __doc__ = "Module documentation."


@@ -10,7 +13,7 @@ from mercurial import ui as hgui
 from mercurial import error
 import wlrepo
 
 from mercurial import error
 import wlrepo
 

-from wlrepo.mercurial_backend import MercurialRevision
+from wlrepo.mercurial_backend.revision import MercurialRevision

 from wlrepo.mercurial_backend.document import MercurialDocument
 
 class MergeStatus(object):
 from wlrepo.mercurial_backend.document import MercurialDocument
 
 class MergeStatus(object):


@@ -70,7 +73,7 @@ class MercurialLibrary(wlrepo.Library):
 
 
     def documents(self):
 
 
     def documents(self):

-        return [ key[5:] for key in \
+        return [ key[5:].decode('utf-8') for key in \

             self._hgrepo.branchmap() if key.startswith("$doc:") ]
 
     @property
             self._hgrepo.branchmap() if key.startswith("$doc:") ]
 
     @property


@@ -92,14 +95,26 @@ class MercurialLibrary(wlrepo.Library):
         # every revision is a document
         return self._doccache[str(rev)]
 
         # every revision is a document
         return self._doccache[str(rev)]
 

-    def document(self, docid, user=None):       
-        return self.document_for_rev(self.fulldocid(docid, user))
+    def document(self, docid, user=None, rev=u'latest'):
+        rev = self._sanitize_string(rev)
+        
+        if rev != u'latest':
+            doc = self.document_for_rev(rev)
+
+            if doc.id != docid or (doc.owner != user):
+                raise wlrepo.RevisionMismatch(self.fulldocid(docid, user)+u'@'+unicode(rev))
+            
+            return doc
+        else:
+            return self.document_for_rev(self.fulldocid(docid, user))

 
     def get_revision(self, revid):
         revid = self._sanitize_string(revid)
 
 
     def get_revision(self, revid):
         revid = self._sanitize_string(revid)
 

-        try:
-            ctx = self._changectx(revid)
+        log.info("Looking up rev %r (%s)" %(revid, type(revid)) )
+
+        try:           
+            ctx = self._changectx( revid )

         except mercurial.error.RepoError, e:
             raise wlrepo.RevisionNotFound(revid)
 
         except mercurial.error.RepoError, e:
             raise wlrepo.RevisionNotFound(revid)
 


@@ -118,7 +133,6 @@ class MercurialLibrary(wlrepo.Library):
         fulldocid += u'$doc:' + docid
         return fulldocid
 
         fulldocid += u'$doc:' + docid
         return fulldocid
 

-

     def has_revision(self, revid):
         try:
             self._hgrepo[revid]
     def has_revision(self, revid):
         try:
             self._hgrepo[revid]


@@ -219,7 +233,7 @@ class MercurialLibrary(wlrepo.Library):
         name = self._sanitize_string(name)
         return self._hgrepo.branchtags()[name]    
 
         name = self._sanitize_string(name)
         return self._hgrepo.branchtags()[name]    
 

-    def _create_branch(self, name, parent=None, before_commit=None):
+    def _create_branch(self, name, parent=None, before_commit=None, message=None):

         name = self._sanitize_string(name)
 
         if self._has_branch(name): return # just exit
         name = self._sanitize_string(name)
 
         if self._has_branch(name): return # just exit


@@ -230,11 +244,16 @@ class MercurialLibrary(wlrepo.Library):
             parentrev = parent.hgrev()
 
         self._checkout(parentrev)
             parentrev = parent.hgrev()
 
         self._checkout(parentrev)

-        self._hgrepo.dirstate.setbranch(name)
+        self._set_branchname(name)

 
         if before_commit: before_commit(self)
 
 
         if before_commit: before_commit(self)
 

-        self._commit("$ADMN$ Initial commit for branch '%s'." % name, user='$library')        
+        message = message or "$ADMN$ Initial commit for branch '%s'." % name
+        self._commit(message, user='$library')
+
+    def _set_branchname(self, name):
+        name = self._sanitize_string(name)
+        self._hgrepo.dirstate.setbranch(name)

 
     def _switch_to_branch(self, branchname):
         current = self._hgrepo[None].branch()
 
     def _switch_to_branch(self, branchname):
         current = self._hgrepo[None].branch()