From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 24 Oct 2011 17:24:44 +0000 (+0200)
Subject: GitRepository: make branch, path and base_dir read only properties
X-Git-Tag: debian/0.6.0_git20111202~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27c58973d980bd0fce9502b535c703d2209e25db;p=tools%2Fgit-buildpackage.git

GitRepository: make branch, path and base_dir read only properties
---

diff --git a/gbp/git.py b/gbp/git.py
index d7c3910..d84114b 100644
--- a/gbp/git.py
+++ b/gbp/git.py
@@ -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)