Merge lp:~brunogirin/charms/precise/python-django/repos-branch into lp:~charmers/charms/precise/python-django/trunk

[Bruno Girin]

Added support for a repos_branch option to support cloning a given branch out of the repository. The option currently supports git. It should get ignored for bzr and svn as both specify the branch in the URL. I did not implement anything for Mercurial as I don't use it at all and have no idea how it handles branches.

[Brandon Holtsclaw (imbrandon)]

Looks good to me, merging.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-01-29 15:37:24 +0000
+++ config.yaml	2013-01-29 15:37:24 +0000
@@ -8,6 +8,14 @@
         type: string
         default: ""
         description: The vcs url to checkout.
+    repos_branch:
+        type: string
+        default: ""
+        description: |
+          The repo branch to pull out from. If empty, it will pull out the
+          default branch or trunk (such as origin/master with git).
+          Note that this setting is ignored for bzr and svn as the branch is
+          specified in the URL for both of them.
     repos_username:
         type: string
         default: ""

=== modified file 'hooks/install'
--- hooks/install	2013-01-29 15:37:24 +0000
+++ hooks/install	2013-01-29 15:37:24 +0000
@@ -4,6 +4,7 @@
 source $(dirname "$0")/common.incl
 
 REPOS_URL=$(config-get repos_url)
+REPOS_BRANCH=$(config-get repos_branch)
 REPOS_USERNAME=$(config-get repos_username)
 REPOS_PASSWORD=$(config-get repos_password)
 EXTRA_DEB_PKGS=$(config-get extra_deb_pkgs)
@@ -37,7 +38,11 @@
 	    hg clone ${REPOS_URL} ${UNIT_DIR}
 	    ;;
 	git)
-	    git clone ${REPOS_URL} ${UNIT_DIR}
+	    if [ -n "$REPOS_BRANCH" ]; then
+	        git clone ${REPOS_URL} -b ${REPOS_BRANCH} ${UNIT_DIR}
+        else
+    	    git clone ${REPOS_URL} ${UNIT_DIR}
+	    fi
 	    ;;
     bzr)
 	    bzr branch ${REPOS_URL} ${UNIT_DIR}