Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

[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 042fda2..4c072cb 100644 (file)
--- a/lib/wlrepo/mercurial_backend/library.py
+++ b/lib/wlrepo/mercurial_backend/library.py
@@ -70,7 +70,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


@@ -81,8 +81,7 @@ class MercurialLibrary(wlrepo.Library):
         if revision is None:
             raise ValueError("Revision can't be None.")
         
         if revision is None:
             raise ValueError("Revision can't be None.")
         

-        if not isinstance(revision, MercurialRevision):
-            revision = self._sanitize_string(unicode(revision))
+        if not isinstance(revision, MercurialRevision):            

             rev = self.get_revision(revision)
         else:
             rev = revision       
             rev = self.get_revision(revision)
         else:
             rev = revision       


@@ -99,8 +98,10 @@ class MercurialLibrary(wlrepo.Library):
     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)
+        print "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)
 


@@ -119,7 +120,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]