Fixes #756: problem with save form

[redakcja.git] / lib / vstorage / __init__.py

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index 8d22e10..84d8ee7 100644 (file)
--- a/lib/vstorage/__init__.py
+++ b/lib/vstorage/__init__.py
@@ -147,10 +147,18 @@ class VersionedStorage(object):
         self.repo = mercurial.hg.repository(self.ui, self.repo_path)
 
     def _file_path(self, title, type='.xml'):
         self.repo = mercurial.hg.repository(self.ui, self.repo_path)
 
     def _file_path(self, title, type='.xml'):

-        return os.path.join(self.path, urlquote(title, safe='')) + type
+        """ 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"):
 
     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)
 
     def _file_to_title(self, filename):
         assert filename.startswith(self.repo_prefix)


@@ -354,11 +362,11 @@ class VersionedStorage(object):
 
         try:
             return tree_search(tip, self._title_to_file(title))
 
         try:
             return tree_search(tip, self._title_to_file(title))

-        except (IndexError, LookupError) as e:
+        except (IndexError, LookupError):

             logging.info("XML file not found, trying plain")
             try:
                 return tree_search(tip, self._title_to_file(title, type=''))
             logging.info("XML file not found, trying plain")
             try:
                 return tree_search(tip, self._title_to_file(title, type=''))

-            except (IndexError, LookupError) as e:
+            except (IndexError, LookupError):

                 raise DocumentNotFound(title)
 
     def page_history(self, title):
                 raise DocumentNotFound(title)
 
     def page_history(self, title):