X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5780495e13ec2d55bc2dee96dec372a9ea395462..c392ff6e4918ff18841ce5827ced34857b2bd78d:/lib/vstorage/__init__.py

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index aeb7338a..be7b6b3f 100644
--- a/lib/vstorage/__init__.py
+++ b/lib/vstorage/__init__.py
@@ -18,9 +18,11 @@ os.environ['HGENCODING'] = 'utf-8'
 os.environ['HGMERGE'] = "internal:merge"
 
 import mercurial.hg
-import mercurial.ui
 import mercurial.revlog
 import mercurial.util
+from mercurial.context import workingctx
+
+from vstorage.hgui import SilentUI
 
 
 def urlquote(url, safe='/'):
@@ -129,10 +131,7 @@ class VersionedStorage(object):
             os.makedirs(self.path)
         self.repo_path = find_repo_path(self.path)
 
-        self.ui = mercurial.ui.ui()
-        self.ui.quiet = True
-        self.ui._report_untrusted = False
-        self.ui.setconfig('ui', 'interactive', False)
+        self.ui = SilentUI()
 
         if self.repo_path is None:
             self.repo_path = self.path
@@ -148,11 +147,19 @@ class VersionedStorage(object):
         """Close and reopen the repo, to make sure we are up to date."""
         self.repo = mercurial.hg.repository(self.ui, self.repo_path)
 
-    def _file_path(self, title):
-        return os.path.join(self.path, urlquote(title, safe=''))
+    def _file_path(self, title, type='.xml'):
+        """ Return plain version if exists in repo, add extension otherwise. """
+        path = os.path.join(self.path, urlquote(title, safe=''))
+        if type and self._title_to_file(title, '') not in self.repo['tip']:
+            path += type
+        return path
 
     def _title_to_file(self, title, type=".xml"):
-        return os.path.join(self.repo_prefix, urlquote(title, safe='')) + type
+        """ Return plain version if exists in repo, add extension otherwise. """
+        path = os.path.join(self.repo_prefix, urlquote(title, safe=''))
+        if type and path not in self.repo['tip']:
+            path += type
+        return path
 
     def _file_to_title(self, filename):
         assert filename.startswith(self.repo_prefix)
@@ -160,7 +167,7 @@ class VersionedStorage(object):
         return urlunquote(name)
 
     def __contains__(self, title):
-        return urlquote(title) in self.repo['tip']
+        return self._title_to_file(title) in self.repo['tip']
 
     def __iter__(self):
         return self.all_pages()
@@ -213,7 +220,7 @@ class VersionedStorage(object):
             filectx_tip = changectx[repo_file]
             current_page_rev = filectx_tip.filerev()
         except mercurial.revlog.LookupError:
-            self.repo.add([repo_file])
+            workingctx(self.repo).add([repo_file])
             current_page_rev = -1
 
         if parent is not None and current_page_rev != parent:
@@ -221,6 +228,8 @@ class VersionedStorage(object):
             author = '<wiki>'
             comment = msg.encode('utf-8')
 
+        logger.debug("Commiting %r", repo_file)
+
         self._commit([repo_file], comment, author)
 
     def save_data(self, title, data, **kwargs):
@@ -263,7 +272,7 @@ class VersionedStorage(object):
             os.unlink(file_path)
         except OSError:
             pass
-        self.repo.remove([repo_file])
+        workingctx(self.repo).remove([repo_file])
         self._commit([repo_file], text, user)
 
     def page_text(self, title, revision=None):
@@ -326,33 +335,40 @@ class VersionedStorage(object):
 
     def _find_filectx(self, title, rev=None):
         """Find the last revision in which the file existed."""
-        repo_file = self._title_to_file(title)
-        changectx = self._changectx()  # start with tip
-        visited = set()
+        tip = self._changectx()  # start with tip
 
-        stack = [changectx]
-        visited.add(changectx)
+        def tree_search(tip, repo_file):
+            logging.info("Searching for %r", repo_file)
+            current = tip
+            visited = set()
 
-        while repo_file not in changectx:
-            if not stack:
-                raise DocumentNotFound(title)
+            stack = [current]
+            visited.add(current)
 
-            changectx = stack.pop()
-            for parent in changectx.parents():
-                if parent not in visited:
-                    stack.append(parent)
-                    visited.add(parent)
+            while repo_file not in current:
+                if not stack:
+                    raise LookupError
 
-        try:
-            fctx = changectx[repo_file]
+                current = stack.pop()
+                for parent in current.parents():
+                    if parent not in visited:
+                        stack.append(parent)
+                        visited.add(parent)
 
+            fctx = current[repo_file]
             if rev is not None:
                 fctx = fctx.filectx(rev)
                 fctx.filerev()
-
             return fctx
-        except (IndexError, LookupError) as e:
-            raise DocumentNotFound(title)
+
+        try:
+            return tree_search(tip, self._title_to_file(title))
+        except (IndexError, LookupError):
+            logging.info("XML file not found, trying plain")
+            try:
+                return tree_search(tip, self._title_to_file(title, type=''))
+            except (IndexError, LookupError):
+                raise DocumentNotFound(title)
 
     def page_history(self, title):
         """Iterate over the page's history."""
@@ -433,3 +449,12 @@ class VersionedStorage(object):
         for filename in modified + added + removed + deleted:
             if filename.startswith(self.repo_prefix):
                 yield self._file_to_title(filename)
+
+    def revert(self, pageid, rev, **commit_args):
+        """ Make the given version of page the current version (reverting changes). """
+
+        # Find the old version
+        fctx = self._find_filectx(pageid, rev)
+
+        # Restore the contents
+        self.save_data(pageid, fctx.data(), **commit_args)