@san-siva/gitsy 1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Santhosh Siva
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,53 @@
+# gitsy
+
+A set of bash utilities for managing Git repositories with ease. Provides user-friendly commands with helpful prompts, color-coded outputs, and automation.
+
+## Available Commands
+
+- `g-co` - Checkout branch
+- `g-pull` - Pull changes from remote
+- `g-push` - Push changes to remote
+- `g-wa` - Create git worktree
+- `g-wr` - Remove git worktree
+- `g-db` - Delete branch
+- `g-dlc` - Discard last commit
+- `g-rmf` - Stash working directory
+- `g-rto` - Reset to remote branch
+- `g-cb` - Show current branch
+- `g-s` - Show git status
+- `g-diff` - Compare branches
+
+## Installation
+
+```bash
+git clone https://github.com/san-siva/gitsy.git
+cd gitsy
+
+# Add to your PATH in .bashrc or .zshrc
+export PATH="$PATH:/path/to/gitsy"
+```
+
+**Dependencies:** `git`, `figlet`, `lolcat`
+
+## Documentation
+
+For complete documentation, usage examples, and detailed command reference, visit the [gitsy documentation website](https://gitsy-56895.web.app).
+
+Quick start:
+```bash
+# Run any command with --help to see available options
+g-co --help
+```
+
+## Contributing
+
+Contributions are welcome! Please fork the repo and submit pull requests. For bugs or feature requests, open an issue on the repository.
+
+## License
+
+This project is licensed under the MIT License.
+
+## Contact
+
+Author: Santhosh Siva
+GitHub: https://github.com/san-siva

package/g-cb

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# This script returns the current branch name in a git repository.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-cb - show current branch name"
+			echo " "
+			echo "g-cb [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
+	print_banner
+	print_message "${BLUE}Fetching current branch...${NC}" 1
+	current_branch_name=$(git rev-parse --abbrev-ref HEAD)
+	if [ -z "$current_branch_name" ]; then
+		print_message "${RED}Failed to get current branch.${NC}"
+		exit 1
+	fi
+	echo "$current_branch_name" | indent
+	copy_to_clipboard "$current_branch_name" "Current branch name copied to clipboard."
+}
+
+main "$@"
+exit 0

package/g-co

@@ -0,0 +1,106 @@
+#!/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"
+
+# Default Values
+stash=false
+target_branch=
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-co - attempt to checkout to branch"
+			echo " "
+			echo "g-co [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
+}
+
+checkout_or_create_branch() {
+	local step_number=2
+	if [ "${stash}" = true ]; then
+		step_number=3
+	fi
+
+	print_message "${BLUE}Checking-out to branch ${NC}origin/${target_branch}${BLUE}.${NC}" $step_number
+
+	# Check if branch exists locally
+	if branch_exists_locally "${target_branch}"; then
+		fetch_changes "${target_branch}"
+		checkout_branch "${target_branch}" $((step_number + 1))
+		return
+	fi
+
+	print_message "${RED}Branch not found locally.${NC}"
+
+	print_message "${BLUE}Checking if branch exists on remote...${NC}" $((step_number + 1))
+	if branch_exists_on_remote "${target_branch}"; then
+		print_message "${GREEN}Branch available on remote.${NC}"
+		fetch_changes "${target_branch}"
+		checkout_branch "${target_branch}"
+		return
+	fi
+
+	print_message "${RED}Branch not found on remote.${NC}"
+
+	create_new_branch=$(prompt_user true "Create new branch?" $((step_number + 2)))
+	if [ "${create_new_branch}" = "y" ]; then
+		checkout_branch "${target_branch}" 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
+	checkout_or_create_branch
+}
+
+# Run the script
+main "$@"
+exit 0

package/g-db

@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 12-02-2025
+
+# Description:
+# A script to delete a branch locally and push the deletion to remote.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+# Default Values
+target_branch=
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-db - delete a branch locally and optionally on remote"
+			echo " "
+			echo "g-db [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help                                                             show brief help"
+			echo "--target-branch BRANCH, --target-branch=BRANCH, -t=BRANCH, -t BRANCH   specify the branch to delete"
+			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
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit 1
+			;;
+		esac
+		shift
+	done
+}
+
+
+delete_local_branch() {
+	local branch=$1
+	local step_number=3
+
+	if ! branch_exists_locally "${branch}"; then
+		print_message "${RED}Branch ${NC}${branch}${RED} does not exist locally.${NC}"
+		return 0
+	fi
+
+	current_branch=$(fetch_current_branch)
+	if [ "${branch}" = "${current_branch}" ]; then
+		print_message "${RED}Cannot delete the branch you are currently on.${NC}"
+		print_message "${RED}Please checkout to another branch first.${NC}"
+		exit 1
+	fi
+
+	print_message "${BLUE}Deleting local branch ${NC}${branch}${BLUE}...${NC}" $step_number
+
+	if ! git -c color.ui=always branch -d "${branch}" 2>&1 | indent; then
+		print_message "${RED}Failed to delete local branch ${NC}${branch}${RED}. [Fail]${NC}"
+		print_message "${PROMPT}Hint: Branch may not be fully merged. Use 'git branch -D ${branch}' to force delete.${NC}"
+		exit 1
+	fi
+
+	print_message "${GREEN}Local branch ${NC}${branch}${GREEN} deleted successfully.${NC}"
+}
+
+prompt_remote_deletion() {
+	local branch=$1
+
+	if ! branch_exists_on_remote "${branch}"; then
+		return 0
+	fi
+
+	delete_remote=$(prompt_user "true" "Delete branch on remote as well?" 5)
+	if [ "$delete_remote" = "n" ]; then
+		print_message "${BLUE}Skipping remote branch deletion.${NC}"
+		return 0
+	fi
+
+	print_message "${BLUE}Deleting remote branch ${NC}origin/${branch}${BLUE}...${NC}" 6
+	if ! git -c color.ui=always push origin --delete "${branch}" 2>&1 | indent; then
+		print_message "${RED}Failed to delete remote branch ${NC}origin/${branch}${RED}. [Fail]${NC}"
+		exit 1
+	fi
+
+	print_message "${GREEN}Remote branch ${NC}origin/${branch}${GREEN} deleted successfully.${NC}"
+}
+
+prompt_user_confirmation() {
+	local branch=$1
+	confirm=$(prompt_user "false" "Are you sure you want to delete branch ${branch}?" 2)
+	if [ "$confirm" = "n" ]; then
+		print_message "${RED}Operation cancelled by user.${NC}"
+		exit 0
+	fi
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+	check_if_target_branch_is_set "$target_branch"
+	prompt_user_confirmation "$target_branch"
+	delete_local_branch "$target_branch"
+	prompt_remote_deletion "$target_branch"
+}
+
+main "$@"
+exit 0

package/g-diff

@@ -0,0 +1,228 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 03-08-2025
+
+# Description:
+# A script to compare changes between two git branches.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+target_branch=""
+source_branch=""
+full_diff=false
+files_only=false
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-diff - compare changes between two git branches"
+			echo " "
+			echo "g-diff [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 "--source-branch BRANCH, --source-branch=BRANCH, -s=BRANCH, -s BRANCH   specify the source branch (defaults to current branch)"
+			echo "-f, --full                                                             show full diff and copy to clipboard"
+			echo "--files-only                                                           show only file names (no stats, no clipboard)"
+			exit 0
+			;;
+		-f | --full)
+			full_diff=true
+			;;
+		--files-only)
+			files_only=true
+			;;
+		-t=* | --target-branch=*)
+			target_branch="${1#*=}"
+			if [ -z "$target_branch" ]; then
+				print_message "${RED}Error: No target branch specified.${NC}"
+				exit 1
+			fi
+			;;
+		-t | --target-branch)
+			shift
+			if [ $# -gt 0 ]; then
+				target_branch="$1"
+			else
+				print_message "${RED}Error: No target branch specified.${NC}"
+				exit 1
+			fi
+			;;
+		-s=* | --source-branch=*)
+			source_branch="${1#*=}"
+			if [ -z "$source_branch" ]; then
+				print_message "${RED}Error: No source branch specified.${NC}"
+				exit 1
+			fi
+			;;
+		-s | --source-branch)
+			shift
+			if [ $# -gt 0 ]; then
+				source_branch="$1"
+			else
+				print_message "${RED}Error: No source branch specified.${NC}"
+				exit 1
+			fi
+			;;
+		*)
+			print_message "${RED}Unknown option:${NC} $1"
+			exit 1
+			;;
+		esac
+		shift
+	done
+}
+
+format_diff_output() {
+	echo ""
+	local current_file=""
+	local in_hunk=false
+	local skip_next_line=false
+
+	# Process git diff output line by line
+	git diff "${source_branch}..origin/${target_branch}" | while IFS= read -r line; do
+		if [[ "$line" =~ ^diff\ --git\ a/(.+)\ b/(.+)$ ]]; then
+			# New file section
+			if [ -n "$current_file" ]; then
+				echo ""
+			fi
+			current_file="${BASH_REMATCH[1]}"
+			echo "${BLUE}file:${NC} ${current_file}"
+
+			# Get stats for this file
+			local adds=$(git diff --numstat "${source_branch}..origin/${target_branch}" -- "$current_file" | awk '{print $1}')
+			local dels=$(git diff --numstat "${source_branch}..origin/${target_branch}" -- "$current_file" | awk '{print $2}')
+			if [ -n "$adds" ] && [ -n "$dels" ]; then
+				echo "${BLUE}stats:${NC} ${GREEN}+${adds}${NC} ${RED}-${dels}${NC}"
+			fi
+			echo "${BLUE}changes:${NC}"
+			echo ""
+			in_hunk=false
+		elif [[ "$line" =~ ^index\ .* ]]; then
+			# Skip index line
+			continue
+		elif [[ "$line" =~ ^---\  ]]; then
+			# Skip --- line
+			continue
+		elif [[ "$line" =~ ^\+\+\+\  ]]; then
+			# Skip +++ line
+			continue
+		elif [[ "$line" =~ ^@@ ]]; then
+			# Hunk header
+			in_hunk=true
+			echo "   ${line}"
+		elif $in_hunk; then
+			# Inside a hunk, show the actual changes
+			# Colorize the line
+			if [[ "$line" =~ ^\+ ]]; then
+				echo "   ${GREEN}${line}${NC}"
+			elif [[ "$line" =~ ^- ]]; then
+				echo "   ${RED}${line}${NC}"
+			else
+				echo "   ${line}"
+			fi
+		fi
+	done
+	echo ""
+}
+
+has_changes() {
+	! git diff --quiet "${source_branch}..origin/${target_branch}" 2>&1
+}
+
+show_full_diff() {
+	if has_changes; then
+		# Capture and display formatted output
+		local formatted_output=$(format_diff_output)
+		echo "$formatted_output" | indent
+
+		# Copy formatted output to clipboard (strip color codes)
+		local clipboard_content=$(sed $'s/\033\[[0-9;]*m//g' <<< "${formatted_output}")
+		copy_to_clipboard "$clipboard_content" "Formatted diff copied to clipboard."
+	else
+		print_message "${BLUE}No changes found between ${NC}${source_branch}${BLUE} and ${NC}${target_branch}${BLUE}.${NC}"
+	fi
+}
+
+show_files_only() {
+	local filenames
+	if ! filenames=$(git diff --name-only "${source_branch}..origin/${target_branch}" 2>&1); then
+		echo "$filenames" | indent
+		print_message "${RED}Failed to compare branches.${NC}"
+		exit 1
+	fi
+
+	if [ -n "$filenames" ]; then
+		echo "$filenames" | indent
+	else
+		print_message "${BLUE}No changes found between ${NC}${source_branch}${BLUE} and ${NC}${target_branch}${BLUE}.${NC}"
+	fi
+}
+
+show_stat_summary() {
+	local result
+	if ! result=$(git -c color.ui=always diff --stat "${source_branch}..origin/${target_branch}" 2>&1); then
+		echo "$result" | indent
+		print_message "${RED}Failed to compare branches.${NC}"
+		exit 1
+	fi
+
+	if [ -n "$result" ]; then
+		echo "$result" | indent
+
+		# Copy stats to clipboard (strip color codes)
+		local stats_content=$(git diff --stat "${source_branch}..origin/${target_branch}")
+		copy_to_clipboard "$stats_content" "Stats copied to clipboard."
+	else
+		print_message "${BLUE}No changes found between ${NC}${source_branch}${BLUE} and ${NC}${target_branch}${BLUE}.${NC}"
+	fi
+}
+
+compare_branches() {
+	local step_number=1
+
+	if [ -z "$source_branch" ]; then
+		print_message "${BLUE}Source branch not specified, using current branch...${NC}" $step_number
+		source_branch=$(fetch_current_branch true)
+		if [ -z "$source_branch" ]; then
+			print_message "${RED}Failed to get current branch.${NC}"
+			exit 1
+		fi
+		step_number=$((step_number + 1))
+	fi
+
+	print_message "${BLUE}Fetching latest changes for target branch ${NC}${target_branch}${BLUE}...${NC}" $step_number
+	if ! fetch_changes "${target_branch}"; then
+		print_message "${RED}Failed to fetch target branch ${NC}${target_branch}${RED}.${NC}"
+		exit 1
+	fi
+
+	step_number=$((step_number + 1))
+	print_message "${BLUE}Comparing ${NC}${source_branch}${BLUE} with ${NC}${target_branch}${BLUE}...${NC}" $step_number
+
+	if [ "$full_diff" = true ]; then
+		show_full_diff
+		return 0
+	fi
+
+	if [ "$files_only" = true ]; then
+		show_files_only
+		return 0
+	fi
+
+	show_stat_summary
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+	check_if_target_branch_is_set $target_branch
+	compare_branches
+}
+
+main "$@"
+exit 0

package/g-dlc

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+
+# Author: Santhosh Siva
+# Date Created: 12-02-2025
+
+# Description:
+# A script to discard the last commit with optional force mode.
+
+source "$(dirname "${BASH_SOURCE[0]}")/utils"
+
+# Default Values
+force_mode=false
+
+set_flags() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-h | --help)
+			echo "g-dlc - discard the last commit"
+			echo " "
+			echo "g-dlc [options]"
+			echo " "
+			echo "options:"
+			echo "-h, --help      show brief help"
+			echo "-f, --force     force discard without checking uncommitted changes"
+			exit 0
+			;;
+		-f=* | --force=*)
+			if [ "${1#*=}" = "true" ]; then
+				force_mode=true
+			fi
+			;;
+		-f | --force)
+			shift
+			if [ $# -gt 0 ] && [ "$1" = "true" ]; then
+				force_mode=true
+			else
+				# If no argument or not 'true', treat -f as a flag
+				force_mode=true
+				continue
+			fi
+			;;
+		*)
+			echo "${RED}Unknown option:${NC} $1"
+			exit 1
+			;;
+		esac
+		shift
+	done
+}
+
+prompt_user_confirmation() {
+	local step_number=1
+	if [ "$force_mode" = "true" ]; then
+		confirm=$(prompt_user "false" "Are you sure you want to discard the last commit? (this action cannot be undone)" $step_number)
+	else
+		confirm=$(prompt_user "false" "Are you sure you want to discard the last commit?" $step_number)
+	fi
+
+	if [ "$confirm" = "n" ]; then
+		print_message "${RED}Operation cancelled by user.${NC}" 0
+		exit 0
+	fi
+}
+
+verify_no_uncommitted_changes() {
+	if [ "$force_mode" = "false" ]; then
+		print_message "${BLUE}Checking for uncommitted changes...${NC}" 2
+		if has_uncommitted_changes "."; then
+			print_message "${RED}Error: There are uncommitted changes in your working directory.${NC}" 0
+			print_message "${RED}Please commit or stash your changes before discarding the last commit.${NC}" 0
+			exit 1
+		fi
+		print_message "${GREEN}No uncommitted changes found.${NC}" 0
+	fi
+}
+
+discard_last_commit() {
+	print_message "${BLUE}Discarding the last commit...${NC}" 3
+
+	if [ "$force_mode" = "true" ]; then
+		reset_output=$(git -c color.ui=always reset --hard --no-recurse-submodules HEAD~1 2>&1)
+	else
+		reset_output=$(git -c color.ui=always reset --soft --no-recurse-submodules HEAD~1 2>&1)
+	fi
+	reset_exit_code=$?
+
+	if [ -n "$reset_output" ]; then
+		echo "$reset_output" | indent
+	fi
+	if [ $reset_exit_code -ne 0 ]; then
+		print_message "${RED}Failed to discard the last commit. [Fail]${NC}" 0
+		exit 1
+	fi
+
+	print_message "${GREEN}Last commit discarded successfully.${NC}" 0
+}
+
+main() {
+	set_flags "$@"
+	validate_dependencies git figlet lolcat
+	print_banner
+
+	prompt_user_confirmation
+	verify_no_uncommitted_changes
+	discard_last_commit
+}
+
+main "$@"
+exit 0