@san-siva/gitsy 1.0.0

package/g-pull

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# A script to checkout branches, optionally stash changes, and manage git workflow efficiently.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+target_branch=
+do_fetch=false
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-pull - pull changes from remote branch"
+			echo " "
+			echo "g-pull [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help                                                             show brief help"
+			echo "--target-branch BRANCH, --target-branch=BRANCH, -t=BRANCH, -t BRANCH   specify the target branch"
+			echo "--stash-changes                                                        stash changes before proceeding"
+			echo "-f, --fetch                                                            fetch changes before pulling"
+			exit 0
+			;;
+		-t=* | --target-branch=*)
+			target_branch="${1#*=}"
+			if [ -z "$target_branch" ]; then
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-t | --target-branch)
+			shift
+			if [ $# -gt 0 ]; then
+				target_branch="$1"
+			else
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-f | --fetch)
+			do_fetch=true
+			;;
+		esac
+		shift
+	done
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies
+	print_banner
+	if [ -z "$target_branch" ]; then
+		target_branch=$(fetch_current_branch)
+	fi
+	if [ "$do_fetch" = "true" ]; then
+		print_message "${BLUE}Fetching changes...${NC}" 1
+		fetch_changes "$target_branch"
+		pull_changes "$target_branch" 2
+		exit 0
+	fi
+	pull_changes "$target_branch" 1
+}
+
+main "$@"
+exit 0

package/g-push

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# A script to checkout branches, optionally stash changes, and manage git workflow efficiently.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+target_branch=
+should_force_push=false
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-push - push changes to remote branch"
+			echo " "
+			echo "g-push [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help                                                             show brief help"
+			echo "--target-branch BRANCH, --target-branch=BRANCH, -t=BRANCH, -t BRANCH   specify the target branch"
+			echo "--stash-changes                                                        stash changes before proceeding"
+			echo "--force                                                                force push changes to the target branch"
+			exit 0
+			;;
+		-t=* | --target-branch=*)
+			target_branch="${1#*=}"
+			if [ -z "$target_branch" ]; then
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-t | --target-branch)
+			shift
+			if [ $# -gt 0 ]; then
+				target_branch="$1"
+			else
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-f | --force)
+			should_force_push=true
+			;;
+		esac
+		shift
+	done
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies
+	print_banner
+	if [ -z "$target_branch" ]; then
+		push_changes $(fetch_current_branch) $should_force_push 1
+		exit 0
+	fi
+	push_changes "$target_branch" $should_force_push 1
+}
+
+main "$@"
+exit 0

package/g-rmf

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# A script to clear your working directory by stashing changes.
+# The stashed changes is tagged with the current date and time.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+# Default Values
+tag_message=
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-rmf - clear your working directory by stashing changes"
+			echo " "
+			echo "g-rmf [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help                                                  show brief help"
+			echo "--message MESSAGE, --message=MESSAGE, -m=MESSAGE, -m MESSAGE   specify custom message for stash"
+			exit 0
+			;;
+		-m=* | --message=*)
+			tag_message="${1#*=}"
+			;;
+		-m | --message)
+			shift
+			if [ $# -gt 0 ]; then
+				tag_message="$1"
+			else
+				echo "${RED}Error: No message specified.$NC"
+				exit 1
+			fi
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit
+			;;
+		esac
+		shift
+	done
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+	stash_changes true 1 "$tag_message"
+}
+
+main "$@"
+exit 0

package/g-rto

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# A script to quickly reset your working directory to the latest changes from the remote branch.
+# In case you ran this command by mistake, you can use the `git stash apply` command to restore your changes.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-rto - reset to remote branch"
+			echo " "
+			echo "g-rto [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help          show brief help"
+			exit 0
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit 1
+			;;
+		esac
+		shift
+	done
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+	target_branch=$(fetch_current_branch)
+	stash_changes true 1
+	print_message ""
+
+	print_message "${BLUE}Fetching changes from remote/${target_branch}...${NC}" 2
+	fetch_changes "$target_branch"
+	print_message ""
+
+	reset_to_target_branch "$target_branch" 3
+	pull_changes "$target_branch" 4
+}
+
+main "$@"
+exit 0

package/g-s

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# This script returns the current status of the git repository.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-s - show git status"
+			echo " "
+			echo "g-s [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help          show brief help"
+			exit 0
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit 1
+			;;
+		esac
+		shift
+	done
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+	print_message "${BLUE}Fetching git status...${NC}" 1
+
+	current_branch=$(fetch_current_branch)
+
+	if ! git -c color.ui=always status 2>&1 | indent; then
+		print_message "${PROMPT}Failed to get git status. Are you in a git repository?${NC}"
+		return 1
+	else
+		print_message "${GREEN}Git status fetched successfully.${NC}" 0
+		return 0
+	fi
+}
+
+main "$@"
+exit 0

package/g-wa

@@ -0,0 +1,155 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# This script creates a new git worktree for a specified branch.
+# If the branch does not exist, it prompts the user to create it.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+# Default Values
+stash=false
+target_branch=
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-wa - create git worktree for branch"
+			echo " "
+			echo "g-wa [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help                                                             show brief help"
+			echo "--target-branch BRANCH, --target-branch=BRANCH, -t=BRANCH, -t BRANCH   specify the target branch"
+			echo "--stash-changes                                                        stash changes before proceeding"
+			exit 0
+			;;
+		-t=* | --target-branch=*)
+			target_branch="${1#*=}"
+			if [ -z "$target_branch" ]; then
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-t | --target-branch)
+			shift
+			if [ $# -gt 0 ]; then
+				target_branch="$1"
+			else
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-s | --stash-changes)
+			stash=true
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit
+			;;
+		esac
+		shift
+	done
+}
+
+try_fetching_branch() {
+	fetch_success=$(fetch_changes "${target_branch}")
+	if [ "${fetch_success}" = "false" ]; then
+		print_message "${RED}Failed to fetch changes for branch ${target_branch}. [Fail]${NC}" exit 1
+	fi
+}
+
+checkout_or_create_branch() {
+	local step_number=2
+	if [ "${stash}" = true ]; then
+		step_number=3
+	fi
+
+	# Check if branch is already checked out in another worktree
+	local existing_worktree=$(git worktree list | grep "\[${target_branch}\]" | awk '{print $1}')
+	if [ -n "$existing_worktree" ]; then
+		print_message "${RED}Branch ${NC}${target_branch}${RED} is already checked out in worktree:${NC}" $step_number
+		print_message "${GREEN}${existing_worktree}${NC}"
+		print_message "${BLUE}Navigate to it with:${NC} ${GREEN}cd ${existing_worktree}${NC}"
+		exit 0
+	fi
+
+	# Determine worktree directory based on current location
+	local worktree_dir
+	local current_dir=$(basename "$PWD")
+	local parent_dir=$(basename "$(dirname "$PWD")")
+
+	# Check if we're already in a worktree (parent directory contains worktrees)
+	if [ "$parent_dir" = "worktrees" ]; then
+		# We're in a worktree, use parent of parent for new worktrees
+		worktree_dir="../"
+	else
+		# We're in main repo, create worktrees subdirectory
+		if [ ! -d "../worktrees" ]; then
+			mkdir ../worktrees
+		fi
+		worktree_dir="../worktrees/"
+	fi
+
+	# if target_branch length is more than 20 characters, truncate it to 20 characters
+	local worktree_name=$(echo $target_branch | sed -E 's/[^[:alnum:]]/_/g' | tr '[:upper:]' '[:lower:]')
+
+	if [ ${#target_branch} -gt 30 ]; then
+		worktree_name="${worktree_name:0:30}.."
+	fi
+
+	local path="${worktree_dir}${worktree_name}"
+
+	print_message "${BLUE}Creating worktree for branch ${NC}origin/${target_branch} ${BLUE}at${NC} ${path} ${BLUE}${NC}" $step_number
+
+	if [ -d "$path" ]; then
+		print_message "${RED}Worktree path already exists. [Fail]${NC}"
+		no_of_identical_dirs=$(find "${worktree_dir}" -maxdepth 1 -type d -name "${worktree_name}*" 2>/dev/null | wc -l)
+		path="${worktree_dir}${worktree_name}_$(($no_of_identical_dirs + 1))"
+		print_message "${BLUE}Using new path: ${NC}${path}${BLUE}${NC}"
+	fi
+
+	# Check if branch exists locally
+	if git show-ref --verify --quiet "refs/heads/${target_branch}"; then
+		try_fetching_branch
+		create_worktree "${target_branch}" "${path}"
+		return
+	fi
+
+	print_message "${RED}Branch not found locally.${NC}"
+	print_message "${BLUE}Checking if branch exists on remote...${NC}" $((step_number + 1))
+
+	if git ls-remote --heads origin "${target_branch}" | grep -q "${target_branch}"; then
+		print_message "${GREEN}Branch available on remote.${NC}"
+		try_fetching_branch
+		create_worktree "${target_branch}" "${path}"
+		return
+	fi
+
+	print_message "${RED}Branch not found on remote.${NC}"
+
+	create_new_branch=$(prompt_user true "Create new branch?" $((step_number + 1)))
+	if [ "${create_new_branch}" = "y" ]; then
+		create_worktree "${target_branch}" "${path}" true
+		return
+	fi
+
+	print_message "${RED}Aborted.${NC}"
+	exit 1
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+	check_if_target_branch_is_set $target_branch
+	already_on_branch $target_branch
+	stash_changes $stash 2
+	checkout_or_create_branch
+}
+
+main "$@"
+exit 0

package/g-wr

@@ -0,0 +1,260 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 12-02-2025
+
+# Description:
+# This script removes a git worktree for a specified branch.
+# It searches through the worktrees directory and removes matching worktrees.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Default Values
+target_branch=
+worktree_name=
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-wr - remove a git worktree for a specified branch or name"
+			echo " "
+			echo "g-wr [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help                                                             show brief help"
+			echo "--target-branch BRANCH, --target-branch=BRANCH, -t=BRANCH, -t BRANCH   specify the target branch"
+			echo "--worktree-name NAME, --worktree-name=NAME, -w=NAME, -w NAME           specify the worktree directory name"
+			exit 0
+			;;
+		-t=* | --target-branch=*)
+			target_branch="${1#*=}"
+			if [ -z "$target_branch" ]; then
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-t | --target-branch)
+			shift
+			if [ $# -gt 0 ]; then
+				target_branch="$1"
+			else
+				echo "${RED}Error: No target branch specified.$NC"
+				exit 1
+			fi
+			;;
+		-w=* | --worktree-name=*)
+			worktree_name="${1#*=}"
+			if [ -z "$worktree_name" ]; then
+				echo "${RED}Error: No worktree name specified.$NC"
+				exit 1
+			fi
+			;;
+		-w | --worktree-name)
+			shift
+			if [ $# -gt 0 ]; then
+				worktree_name="$1"
+			else
+				echo "${RED}Error: No worktree name specified.$NC"
+				exit 1
+			fi
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit 1
+			;;
+		esac
+		shift
+	done
+}
+
+cd_to_main_dir() {
+	local current_dirname=$(basename "$current_dir")
+	if [ "$current_dirname" = "main" ]; then
+		return 0
+	fi
+
+	if [ -d "../main" ]; then
+		if navigate_to_dir "../main"; then
+			return 0
+		fi
+	fi
+
+	if [ -d "../../main" ]; then
+		if navigate_to_dir "../../main"; then
+			return 0
+		fi
+	fi
+
+	exit 1
+}
+
+cd_to_worktrees_dir() {
+	local current_dirname=$(basename "$current_dir")
+	if [ "$current_dirname" = "worktrees" ]; then
+		return 0
+	fi
+
+	if [ -d "../worktrees" ]; then
+		if navigate_to_dir "../worktrees"; then
+			return 0
+		fi
+	fi
+
+	if [ -d "../../worktrees" ]; then
+		if navigate_to_dir "../../worktrees"; then
+			return 0
+		fi
+	fi
+
+	print_message "${RED}Worktrees directory not found. [Fail]${NC}" 0 >&2
+	exit 1
+}
+
+find_dir_to_remove() {
+	local current_dir=$(pwd)
+
+	cd_to_worktrees_dir
+	local worktrees_dir=$(pwd)
+
+	worktree_path=""
+
+	if [ -n "$worktree_name" ]; then
+		for dir in *; do
+			if [ ! -d "$dir" ]; then
+				continue
+			fi
+
+			if [ "$dir" = "$worktree_name" ]; then
+				worktree_path="$worktrees_dir/$dir"
+				break
+			fi
+		done
+		cd_to_main_dir
+		if [ -z "$worktree_path" ]; then
+			return 1
+		fi
+		echo "$worktree_path"
+		return 0
+	fi
+
+	check_if_target_branch_is_set "$target_branch"
+
+	for dir in *; do
+		if [ ! -d "$dir" ]; then
+			continue
+		fi
+
+		if ! navigate_to_dir "$dir"; then
+			continue
+		fi
+
+		local branch=$(fetch_current_branch 2>/dev/null)
+		if [ -z "$branch" ]; then
+			navigate_to_dir "$worktrees_dir"
+			continue
+		fi
+
+		if [ "$branch" = "$target_branch" ]; then
+			worktree_path="$worktrees_dir/$dir"
+			break
+		fi
+
+		navigate_to_dir "$worktrees_dir"
+	done
+
+	cd_to_main_dir
+
+	if [ -z "$worktree_path" ]; then
+		return 1
+	fi
+
+	echo "$worktree_path"
+}
+
+check_if_worktree_is_clean() {
+	local worktree_path=$1
+
+	if ! has_uncommitted_changes "$worktree_path"; then
+		return 0
+	fi
+
+	response=$(prompt_user "false" "Your worktree has uncommitted changes. Do you want to discard them?" 3)
+	if [ "$response" = "n" ]; then
+		print_message "${RED}Skipping worktree removal.${NC}" 0
+		exit 0
+	fi
+}
+
+remove_worktree() {
+	local worktree_path=$1
+
+	print_message "${BLUE}Removing worktree at ${NC}${worktree_path}${BLUE}...${NC}" 4
+
+	if ! [ -n "$worktree_name" ]; then
+		# Try using git worktree remove first with --force flag
+		if git -c color.ui=always worktree remove --force "$worktree_path" 2>&1 | indent; then
+			# Verify the directory was actually removed
+			if [ ! -d "$worktree_path" ]; then
+				print_message "${GREEN}Worktree removed successfully using git.${NC}" 0
+				return 0
+			fi
+		fi
+		print_message "${PROMPT}Git worktree remove incomplete. Attempting manual removal...${NC}" 0
+	fi
+
+	# Fallback to rm -rf
+	if rm -rf "$worktree_path" 2>&1 | indent; then
+		if ! [ -n "$worktree_name" ]; then
+			# Also need to prune the worktree from git's records
+			git -c color.ui=always worktree prune 2>&1 | indent
+		fi
+		# Verify the directory was actually removed
+		if [ ! -d "$worktree_path" ]; then
+			print_message "${GREEN}Worktree removed successfully using rm -rf.${NC}" 0
+			return 0
+		fi
+	fi
+
+	print_message "${RED}Failed to remove worktree. [Fail]${NC}" 0
+	return 1
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+
+	if [ -n "$worktree_name" ]; then
+		print_message "${BLUE}Searching for worktree with name ${NC}${worktree_name}${BLUE}...${NC}" 1
+	else
+		print_message "${BLUE}Searching for worktree with branch ${NC}${target_branch}${BLUE}...${NC}" 1
+	fi
+
+	worktree_path=$(find_dir_to_remove)
+	if [ -z "$worktree_path" ]; then
+		if [ -n "$worktree_name" ]; then
+			print_message "${RED}No worktree found with name ${NC}${worktree_name}${RED}. [Fail]${NC}" 0
+		else
+			print_message "${RED}No worktree found for branch ${NC}${target_branch}${RED}. [Fail]${NC}" 0
+		fi
+		exit 1
+	fi
+
+	worktree_dirname=$(basename "$worktree_path")
+	if [ -n "$worktree_name" ]; then
+		print_message "${GREEN}Found worktree: ${NC}${worktree_dirname}${NC}" 2
+	else
+		print_message "${GREEN}Found worktree: ${NC}${worktree_dirname}${GREEN} at ${NC}${worktree_path}${NC}" 2
+	fi
+
+	print_message "${BLUE}Checking for uncommitted changes...${NC}" 3
+	check_if_worktree_is_clean "$worktree_path"
+
+	remove_worktree "$worktree_path"
+}
+
+main "$@"
+exit 0