diff options
author | Guido Günther <agx@sigxcpu.org> | 2011-10-24 19:24:44 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2011-10-26 09:45:10 +0200 |
commit | 27c58973d980bd0fce9502b535c703d2209e25db (patch) | |
tree | 1a193e3964c9f2c0e8ab169066af6411d6441c2c | |
parent | 416268a64772d4f1c40e43ac0ceaa46aa20d2ce3 (diff) |
GitRepository: make branch, path and base_dir read only properties
-rw-r--r-- | gbp/git.py | 15 | ||||
-rwxr-xr-x | git-buildpackage | 2 |
2 files changed, 12 insertions, 5 deletions
@@ -89,7 +89,7 @@ class GitRepository(object): """ def __init__(self, path): - self.path = os.path.abspath(path) + self._path = os.path.abspath(path) try: out, ret = self.__git_getoutput('rev-parse', ['--show-cdup']) if ret or out != ['\n']: @@ -175,12 +175,14 @@ class GitRepository(object): """ GitCommand(command, args, extra_env=extra_env, cwd=self.path)() + @property + def path(self): + return self._path + + @property def base_dir(self): """ Get the base of the repository. - - @return: The base of the git repository - @rtype: string. """ return os.path.join(self.path, '.git') @@ -298,6 +300,11 @@ class GitRepository(object): args += [ commit ] if commit else [] self._git_command("tag", args) + @property + def branch(self): + """The currently checked out branch""" + return self.get_branch() + def get_branch(self): """on what branch is the current working copy""" for line in self.__git_getoutput('branch', [ '--no-color' ])[0]: diff --git a/git-buildpackage b/git-buildpackage index beed984..33ea19a 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -516,7 +516,7 @@ def main(argv): if options.prebuild: RunAtCommand(options.prebuild, shell=True, - extra_env={'GBP_GIT_DIR': repo.base_dir(), + extra_env={'GBP_GIT_DIR': repo.base_dir, 'GBP_BUILD_DIR': build_dir})(dir=build_dir) setup_pbuilder(options) |