Improvements for AZDO_BRANCH scenario (#31)

* Add a wait for ADO helper extension install before checkout
* Check if branch has already been switched

Author: markphip

src/external-repository/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "External Git Repository in Codespace",
     "id": "external-repository",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "description": "Configures Codespace to work with an external Git repository",
     "options": {
         "gitProvider": {

src/external-repository/scripts/setup-user.sh

@@ -11,8 +11,28 @@ checkout_branch() {
     if [[ "${AZDO_BRANCH}" == "" ]]; then
         return
     fi
-    echo "Checking out branch ${AZDO_BRANCH}"
     cd ${1}
+
+    # Get the current branch name
+    CURRENT_BRANCH=$(git branch --show-current)
+    if [[ "${CURRENT_BRANCH}" == "${AZDO_BRANCH}" ]]; then
+        echo "Already on branch ${AZDO_BRANCH}"
+        return
+    fi
+
+    echo "Checking out branch ${AZDO_BRANCH}"
+    
+    if [ ! -f ${HOME}/ado-auth-helper ]; then
+        echo "Waiting up to 180 seconds for ado-auth-helper extension to be installed"
+    fi    
+    # Wait up to 3 minutes for the ado-auth-helper to be installed
+    for i in {1..180}; do
+        if [ -f ${HOME}/ado-auth-helper ]; then
+            break
+        fi
+        sleep 1
+    done
+
     # fetch the branch named AZDO_BRANCH
     git fetch origin ${AZDO_BRANCH}
     git checkout ${AZDO_BRANCH}

test/external-repository/branch-install.sh

@@ -6,6 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
+touch ${HOME}/ado-auth-helper
 check "git-config" grep "ado-auth-helper" <(cat /tmp/branch-repos/.git/config)
 check "branch" grep "joshaber/parallel-execution-schema" <(git -C /tmp/branch-repos branch --show-current)