Zmiana 'put' na 'post' w commit, zgodnie ze zmianami w API.

[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 219a01d..042fda2 100644 (file)
--- a/lib/wlrepo/mercurial_backend/library.py
+++ b/lib/wlrepo/mercurial_backend/library.py
@@ -10,8 +10,8 @@ from mercurial import ui as hgui
 from mercurial import error
 import wlrepo
 
 from mercurial import error
 import wlrepo
 

-from wlrepo.mercurial_backend.document import MercurialDocument

 from wlrepo.mercurial_backend import MercurialRevision
 from wlrepo.mercurial_backend import MercurialRevision

+from wlrepo.mercurial_backend.document import MercurialDocument

 
 class MergeStatus(object):
     def __init__(self, mstatus):
 
 class MergeStatus(object):
     def __init__(self, mstatus):


@@ -75,13 +75,14 @@ class MercurialLibrary(wlrepo.Library):
 
     @property
     def ospath(self):
 
     @property
     def ospath(self):

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

 
     def document_for_rev(self, revision):
         if revision is None:
             raise ValueError("Revision can't be None.")
         
         if not isinstance(revision, MercurialRevision):
 
     def document_for_rev(self, revision):
         if revision is None:
             raise ValueError("Revision can't be None.")
         
         if not isinstance(revision, MercurialRevision):

+            revision = self._sanitize_string(unicode(revision))

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


@@ -96,21 +97,26 @@ class MercurialLibrary(wlrepo.Library):
         return self.document_for_rev(self.fulldocid(docid, user))
 
     def get_revision(self, revid):
         return self.document_for_rev(self.fulldocid(docid, user))
 
     def get_revision(self, revid):

-        ctx = self._changectx(revid)
+        revid = self._sanitize_string(revid)
+
+        try:
+            ctx = self._changectx(revid)
+        except mercurial.error.RepoError, e:
+            raise wlrepo.RevisionNotFound(revid)

 
         if ctx is None:
 
         if ctx is None:

-            raise RevisionNotFound(revid)
+            raise wlrepo.RevisionNotFound(revid)

 
         if self._revcache.has_key(ctx):
             return self._revcache[ctx]
 
         return MercurialRevision(self, ctx)
 
 
         if self._revcache.has_key(ctx):
             return self._revcache[ctx]
 
         return MercurialRevision(self, ctx)
 

-    def fulldocid(self, docid, user=None):
-        fulldocid = ''
+    def fulldocid(self, docid, user=None):                
+        fulldocid = u''

         if user is not None:
         if user is not None:

-            fulldocid += '$user:' + user
-        fulldocid += '$doc:' + docid
+            fulldocid += u'$user:' + user
+        fulldocid += u'$doc:' + docid

         return fulldocid
 
 
         return fulldocid
 
 


@@ -118,18 +124,20 @@ class MercurialLibrary(wlrepo.Library):
         try:
             self._hgrepo[revid]
             return True
         try:
             self._hgrepo[revid]
             return True

-        except error.RepoError:
+        except mercurial.error.RepoError:

             return False
 
     def document_create(self, docid):
             return False
 
     def document_create(self, docid):

+        
+        

         # check if it already exists
         fullid = self.fulldocid(docid)
 
         if self.has_revision(fullid):
         # check if it already exists
         fullid = self.fulldocid(docid)
 
         if self.has_revision(fullid):

-            raise LibraryException("Document already exists!");
+            raise wlrepo.DocumentAlreadyExists(u"Document %s already exists!" % docid);

 
         # doesn't exist
 
         # doesn't exist

-        self._create_branch(fullid)
+        self._create_branch(self._sanitize_string(fullid))

         return self.document_for_rev(fullid)
 
     #
         return self.document_for_rev(fullid)
 
     #


@@ -140,11 +148,11 @@ class MercurialLibrary(wlrepo.Library):
     # Locking
     #
 
     # Locking
     #
 

-    def _lock(self, write_mode=False):
+    def lock(self, write_mode=False):

         return self._hgrepo.wlock() # no support for read/write mode yet
 
     def _transaction(self, write_mode, action):
         return self._hgrepo.wlock() # no support for read/write mode yet
 
     def _transaction(self, write_mode, action):

-        lock = self._lock(write_mode)
+        lock = self.lock(write_mode)

         try:
             return action(self)
         finally:
         try:
             return action(self)
         finally:


@@ -192,6 +200,9 @@ class MercurialLibrary(wlrepo.Library):
     def _changectx(self, nodeid):
         return self._hgrepo.changectx(nodeid)
 
     def _changectx(self, nodeid):
         return self._hgrepo.changectx(nodeid)
 

+    def _rollback(self):
+        return self._hgrepo.rollback()
+

     #
     # BASIC BRANCH routines
     #
     #
     # BASIC BRANCH routines
     #


@@ -241,10 +252,10 @@ class MercurialLibrary(wlrepo.Library):
 
     @staticmethod
     def _sanitize_string(s):
 
     @staticmethod
     def _sanitize_string(s):

-        if isinstance(s, unicode):
-            s = s.encode('utf-8')
+        if s is None:
+            return None

 
 

-        if ' ' in s:
-            raise ValueError('Whitespace is forbidden!')
+        if isinstance(s, unicode):
+            s = s.encode('utf-8')        

 
         return s
\ No newline at end of file
 
         return s
\ No newline at end of file