X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/88dbb13a387b1e3a2b45fde672179ed552c269c1..c392ff6e4918ff18841ce5827ced34857b2bd78d:/lib/vstorage/__init__.py?ds=sidebyside

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index 8d22e10c..be7b6b3f 100644
--- a/lib/vstorage/__init__.py
+++ b/lib/vstorage/__init__.py
@@ -20,6 +20,7 @@ os.environ['HGMERGE'] = "internal:merge"
 import mercurial.hg
 import mercurial.revlog
 import mercurial.util
+from mercurial.context import workingctx
 
 from vstorage.hgui import SilentUI
 
@@ -147,10 +148,18 @@ class VersionedStorage(object):
         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"):
-        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)
@@ -211,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:
@@ -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):
@@ -354,11 +363,11 @@ class VersionedStorage(object):
 
         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=''))
-            except (IndexError, LookupError) as e:
+            except (IndexError, LookupError):
                 raise DocumentNotFound(title)
 
     def page_history(self, title):