From c524d74994f95747d1ba31c5b297410debd23955 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 4 Aug 2010 16:41:42 +0200 Subject: [PATCH] fix vstorage for files without extension --- lib/vstorage/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py index 843bb6b7..84d8ee7b 100644 --- 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'): - 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) -- 2.20.1