X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c392ff6e4918ff18841ce5827ced34857b2bd78d..210e62452e0e9f26f3e006c874b66ac44005d492:/lib/vstorage/__init__.py?ds=sidebyside diff --git a/lib/vstorage/__init__.py b/lib/vstorage/__init__.py index be7b6b3f..2708ed79 100644 --- a/lib/vstorage/__init__.py +++ b/lib/vstorage/__init__.py @@ -20,7 +20,6 @@ os.environ['HGMERGE'] = "internal:merge" import mercurial.hg import mercurial.revlog import mercurial.util -from mercurial.context import workingctx from vstorage.hgui import SilentUI @@ -163,7 +162,7 @@ class VersionedStorage(object): def _file_to_title(self, filename): assert filename.startswith(self.repo_prefix) - name = filename[len(self.repo_prefix):].strip('/').split('.', 1)[0] + name = filename[len(self.repo_prefix):].strip('/').rsplit('.', 1)[0] return urlunquote(name) def __contains__(self, title): @@ -220,7 +219,7 @@ class VersionedStorage(object): filectx_tip = changectx[repo_file] current_page_rev = filectx_tip.filerev() except mercurial.revlog.LookupError: - workingctx(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: @@ -272,7 +271,7 @@ class VersionedStorage(object): os.unlink(file_path) except OSError: pass - workingctx(self.repo).remove([repo_file]) + self.repo[None].remove([repo_file]) self._commit([repo_file], text, user) def page_text(self, title, revision=None): @@ -334,42 +333,28 @@ class VersionedStorage(object): return guess_mime(self._file_path(title)) def _find_filectx(self, title, rev=None): - """Find the last revision in which the file existed.""" - tip = self._changectx() # start with tip - - def tree_search(tip, repo_file): - logging.info("Searching for %r", repo_file) - current = tip - visited = set() - - stack = [current] - visited.add(current) - - while repo_file not in current: - if not stack: - raise LookupError - - 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 - - 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): + """ + Find the revision of the file in repo. + Only look for files still existing in repo's tip. + """ + tip = self._changectx() + file = self._title_to_file(title) + logging.info('Looking for %s', file) + if file in tip: + fctx = tip[file] + else: + file = self._title_to_file(title, type='') + logging.info('.xml not found, trying plain') + if file in tip: + fctx = tip[file] + else: raise DocumentNotFound(title) + if rev is not None: + fctx = fctx.filectx(rev) + fctx.filerev() + return fctx + def page_history(self, title): """Iterate over the page's history."""