From c9fafcecbe1dc339d2cfe4a90854a26bab13dd4e Mon Sep 17 00:00:00 2001
From: felix <felix@ordrin.com>
Date: Tue, 8 May 2012 16:20:08 -0400
Subject: [PATCH 1/2] added in support for branches in git module (now takes
 optional "branch")

---
 library/git | 64 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/library/git b/library/git
index 7e9c77e0fb..cbbb55851c 100755
--- a/library/git
+++ b/library/git
@@ -28,6 +28,7 @@ try:
 except ImportError:
     import simplejson as json
 import os
+import re
 import sys
 import shlex
 import subprocess
@@ -68,6 +69,7 @@ for x in items:
 
 dest = params['dest']
 repo = params['repo']
+branch  = params.get('branch')
 version = params.get('version', 'HEAD')
 
 # ===========================================
@@ -80,7 +82,7 @@ def get_version(dest):
    sha = sha[0].split()[1]
    return sha
 
-def clone(repo, dest):
+def clone(repo, dest, branch):
    ''' makes a new git repo if it does not already exist '''
    try:
        os.makedirs(dest)
@@ -88,6 +90,15 @@ def clone(repo, dest):
        pass
    cmd = "git clone %s %s" % (repo, dest)
    cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+   (out, err) = cmd.communicate()
+   rc = cmd.returncode
+   
+   if branch is None or rc != 0: 
+     return (out, err)
+
+   os.chdir(dest)
+   cmd = "git checkout -b %s origin/%s" % (branch, branch) 
+   cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    return cmd.communicate()
 
 def reset(dest):
@@ -103,14 +114,48 @@ def reset(dest):
    rc = cmd.returncode
    return (rc, out, err)
 
-def pull(repo, dest):
-   ''' updates repo from remote sources '''
-   os.chdir(dest)
-   cmd = "git pull -u origin"
+def switchLocalBranch( branch ):
+   cmd = "git checkout %s" % branch
    cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    return cmd.communicate()
 
-def switchver(version, dest):
+def pull(repo, dest, branch):
+   ''' updates repo from remote sources '''
+   os.chdir(dest)
+   cmd = "git branch -a"
+   cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+   (gbranch_out, gbranch_err) = cmd.communicate()
+
+   try:
+      m = re.search( '^\* (\S+|\(no branch\))$', gbranch_out, flags=re.M )
+      cur_branch = m.group(1)
+      m = re.search( '\s+remotes/origin/HEAD -> origin/(\S+)', gbranch_out, flags=re.M )
+      default_branch = m.group(1)
+   except:
+      fail_json(msg="could not determine branch data - received: %s" % gbranch_out)
+
+   if branch is None:
+      if cur_branch != default_branch:
+         (out, err) = switchLocalBranch( default_branch )
+
+      cmd = "git pull -u origin"
+
+   elif branch == cur_branch:
+      cmd = "git pull -u origin"
+
+   else:
+      m = re.search( '^\s+%s$' % branch, gbranch_out, flags=re.M ) #see if we've already checked it out
+      if m is None:
+         cmd = "git checkout -b %s origin/%s" % (branch, branch)
+
+      else:
+         (out, err) = switchLocalBranch( branch )
+         cmd = "git pull -u origin"
+
+   cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+   return cmd.communicate()
+
+def switchver(version, dest, branch):
    ''' once pulled, switch to a particular SHA or tag '''
    os.chdir(dest)
    if version != 'HEAD':
@@ -118,6 +163,7 @@ def switchver(version, dest):
    else:
       # is there a better way to do this?
       cmd = "git rebase origin"
+
    cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    (out, err) = cmd.communicate()
    return (out, err)
@@ -132,14 +178,14 @@ out, err, status = (None, None, None)
 
 before = None
 if not os.path.exists(gitconfig):
-   (out, err) = clone(repo, dest)
+   (out, err) = clone(repo, dest, branch)
 else:
    # else do a pull   
    before = get_version(dest)
    (rc, out, err) = reset(dest)
    if rc != 0:
       fail_json(out=out, err=err)
-   (out, err) = pull(repo, dest)
+   (out, err) = pull(repo, dest, branch)
 
 # handle errors from clone or pull
 
@@ -149,7 +195,7 @@ if out.find('error') != -1:
 # switch to version specified regardless of whether
 # we cloned or pulled
 
-(out, err) = switchver(version, dest)
+(out, err) = switchver(version, dest, branch)
 if err.find('error') != -1:
    fail_json(out=out, err=err)
 

From 7ee6ae3663460e78d06d078259138f63a56de6c8 Mon Sep 17 00:00:00 2001
From: felix <felix@ordrin.com>
Date: Tue, 8 May 2012 16:24:29 -0400
Subject: [PATCH 2/2] removed unecessary branch addition from switchver

---
 library/git | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/git b/library/git
index cbbb55851c..38c211af44 100755
--- a/library/git
+++ b/library/git
@@ -155,7 +155,7 @@ def pull(repo, dest, branch):
    cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    return cmd.communicate()
 
-def switchver(version, dest, branch):
+def switchver(version, dest):
    ''' once pulled, switch to a particular SHA or tag '''
    os.chdir(dest)
    if version != 'HEAD':
@@ -163,7 +163,6 @@ def switchver(version, dest, branch):
    else:
       # is there a better way to do this?
       cmd = "git rebase origin"
-
    cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    (out, err) = cmd.communicate()
    return (out, err)
@@ -195,7 +194,7 @@ if out.find('error') != -1:
 # switch to version specified regardless of whether
 # we cloned or pulled
 
-(out, err) = switchver(version, dest, branch)
+(out, err) = switchver(version, dest)
 if err.find('error') != -1:
    fail_json(out=out, err=err)