# -*- 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'
-class RepositoryDoesNotExist(Exception):
- pass
+def clearpath(path):
+ return unicode(path).encode("utf-8")
class Repository(object):
"""Abstrakcja repozytorium Mercurial. DziaĆa z Mercurial w wersji 1.3.1."""
return localrepo.localrepository(self.ui, path, create=1)
raise RepositoryDoesNotExist("Repository %s does not exist." % path)
- def file_list(self, branch='default'):
+ def file_list(self, branch):
return self.in_branch(lambda: self._file_list(), branch)
def _file_list(self):
return list(self.repo[None])
- def get_file(self, path, branch='default'):
+ def get_file(self, path, branch):
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.")
+
return self.repo.wread(path)
-
- def add_file(self, path, value, branch='default'):
+
+ def file_exists(self, path, branch):
+ 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):
+ 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):
- return self.repo.wwrite(path, value.encode('utf-8'), [])
+ path = clearpath(path)
+ self._write_file(path, value)
+ return self.repo.add( [path] )
def _commit(self, message, user=None):
return self.repo.commit(text=message, user=user)
- def commit(self, message, user=None, branch='default'):
+ def commit(self, message, branch, user=None):
return self.in_branch(lambda: self._commit(message, key=key, user=user), branch)
- def in_branch(self, action, bname='default'):
+ def in_branch(self, action, bname):
wlock = self.repo.wlock()
try:
old = self._switch_to_branch(bname)
except KeyError, ke:
raise RepositoryException("Can't switch to branch '%s': no such branch." % bname , ke)
except util.Abort, ae:
- raise repositoryException("Can't switch to branch '%s': %s" % (bname, ae.message), ae)
+ raise RepositoryException("Can't switch to branch '%s': %s" % (bname, ae.message), ae)
finally:
wlock.release()
def __init__(self, msg, cause=None):
Exception.__init__(self, msg)
self.cause = cause
+
+class RepositoryDoesNotExist(RepositoryException):
+ pass