2.11.22 Updating styles

.tools/push-feature-branch.sh

@@ -0,0 +1,102 @@
+#!/bin/bash
+# Purpose: Push to a feature branch and optionally to the development branch.
+# Usage: ./push-feature-branch.sh <version> <annotation> [-d|--push-to-development] [-b|--branch <branch-name>]
+# Description: This script pushes a feature branch and optionally pushes to development.
+
+# Function to print messages with a timestamp
+print_message() {
+    echo ""
+    echo "$(date +"%Y-%m-%d %H:%M:%S") - $1"
+}
+
+# Function to display help message
+show_help() {
+    echo "Usage: $0 <version> <annotation> [-d|--push-to-development] [-b|--branch <branch-name>]"
+    echo ""
+    echo "Options:"
+    echo "  -h, --help                Display this help message."
+    echo "  -d, --push-to-development Also push the feature branch to development."
+    echo "  -b, --branch              Specify the feature branch to push."
+    echo ""
+    echo "Description:"
+    echo "  This script pushes a specified feature branch and optionally merges it to the development branch."
+    echo ""
+    echo "Example:"
+    echo "  ./push-feature-branch.sh 1.0.0 "Initial commit" -b feature/my-feature -d"
+    exit 0
+}
+
+# Function to handle errors
+handle_error() {
+    print_message "Error: $1"
+    exit 1
+}
+
+# Parse options
+PUSH_DEV=false
+FEATURE_BRANCH=""
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        -h|--help) show_help ;;
+        -d|--push-to-development) PUSH_DEV=true ;;
+        -b|--branch) shift; FEATURE_BRANCH=$1 ;;
+        *) break ;;
+    esac
+    shift
+done
+
+# Check if version and annotation are passed
+if (( $# != 2 )); then
+    handle_error "Incorrect number of arguments. Usage: $0 <version> <annotation> [-d|--push-to-development] [-b|--branch <branch-name>]"
+fi
+
+# Assign arguments to variables
+VERSION=$1
+ANNOTATION=$2
+
+# Ensure a feature branch is specified
+if [ -z "$FEATURE_BRANCH" ]; then
+    handle_error "Feature branch not specified. Use -b or --branch to provide the branch name."
+fi
+
+# Verify the feature branch exists
+if ! git show-ref --verify --quiet "refs/heads/$FEATURE_BRANCH"; then
+    handle_error "Feature branch '$FEATURE_BRANCH' does not exist. You can create a new feature branch with 'git checkout -b $FEATURE_BRANCH'."
+fi
+
+# Verify 'git.sh' script exists
+GIT_SCRIPT="./git.sh"
+if [[ ! -f "$GIT_SCRIPT" ]]; then
+    handle_error "'git.sh' script not found"
+fi
+
+# Verify 'git.sh' script is executable
+if [[ ! -x "$GIT_SCRIPT" ]]; then
+    handle_error "'git.sh' script is not executable"
+fi
+
+# Call git.sh script for tagging or other operations
+print_message "Calling git.sh with tag $VERSION with annotation \"$ANNOTATION\""
+"$GIT_SCRIPT" "$VERSION" "$ANNOTATION" || handle_error "Failed to call git.sh"
+
+# Checkout the feature branch
+print_message "Checking out feature branch $FEATURE_BRANCH"
+git checkout "$FEATURE_BRANCH" || handle_error "Failed to checkout feature branch $FEATURE_BRANCH"
+
+# Push the feature branch
+print_message "Pushing feature branch $FEATURE_BRANCH to origin"
+git push origin "$FEATURE_BRANCH" || handle_error "Failed to push feature branch $FEATURE_BRANCH"
+
+# Optionally push to the development branch
+if [ "$PUSH_DEV" = true ]; then
+    print_message "Also pushing feature branch $FEATURE_BRANCH to development branch"
+    git checkout development || handle_error "Failed to checkout development branch"
+    git merge "$FEATURE_BRANCH" --no-ff -m "Merging feature branch $FEATURE_BRANCH into development" || handle_error "Failed to merge feature branch into development"
+    git push origin development || handle_error "Failed to push development branch"
+fi
+
+# Show git status
+print_message "Git status"
+git status || handle_error "Failed to show git status"
+
+print_message "Script completed successfully"