X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cd69a086aa9ce06b83f277b24e2992238654c320..d798a69cb177ba4dabd2d917e1da6ab94707aa7d:/lib/hg.py diff --git a/lib/hg.py b/lib/hg.py index 6dd6e0cb..07ec9a79 100644 --- a/lib/hg.py +++ b/lib/hg.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- import os -import codecs -from mercurial import localrepo, ui, match, node, encoding, util +from mercurial import localrepo, ui, encoding, util import mercurial.merge, mercurial.error encoding.encoding = 'utf-8' - +def clearpath(path): + return unicode(path).encode("utf-8") class Repository(object): """Abstrakcja repozytorium Mercurial. Działa z Mercurial w wersji 1.3.1.""" @@ -44,6 +44,8 @@ class Repository(object): return self.in_branch(lambda: self._get_file(path), branch) def _get_file(self, path): + path = clearpath(path) + if not self._file_exists(path): raise RepositoryException("File not availble in this branch.") @@ -53,18 +55,21 @@ class Repository(object): return self.in_branch(lambda: self._file_exists(path), branch) def _file_exists(self, path): + path = clearpath(path) return self.repo.dirstate[path] != "?" def write_file(self, path, value, branch): return self.in_branch(lambda: self._write_file(path, value), branch) - def _write_file(self, path, value): + def _write_file(self, path, value): + path = clearpath(path) return self.repo.wwrite(path, value, []) def add_file(self, path, value, branch): return self.in_branch(lambda: self._add_file(path, value), branch) def _add_file(self, path, value): + path = clearpath(path) self._write_file(path, value) return self.repo.add( [path] )