Add annotation - better positioning

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

diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py
index 843bb6b..6234dc7 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)


@@ -211,7 +219,7 @@ class VersionedStorage(object):
             filectx_tip = changectx[repo_file]
             current_page_rev = filectx_tip.filerev()
         except mercurial.revlog.LookupError:
             filectx_tip = changectx[repo_file]
             current_page_rev = filectx_tip.filerev()
         except mercurial.revlog.LookupError:

-            self.repo.add([repo_file])
+            self.repo[None].add([repo_file])

             current_page_rev = -1
 
         if parent is not None and current_page_rev != parent:
             current_page_rev = -1
 
         if parent is not None and current_page_rev != parent:


@@ -263,7 +271,7 @@ class VersionedStorage(object):
             os.unlink(file_path)
         except OSError:
             pass
             os.unlink(file_path)
         except OSError:
             pass

-        self.repo.remove([repo_file])
+        self.repo[None].remove([repo_file])

         self._commit([repo_file], text, user)
 
     def page_text(self, title, revision=None):
         self._commit([repo_file], text, user)
 
     def page_text(self, title, revision=None):