@san-siva/gitsy 1.0.1 → 1.0.2

package/README.md

@@ -1,5 +1,6 @@
 # gitsy
 
+![gitsy in action](images/demo.png)
 A set of bash utilities for managing Git repositories with ease. Provides user-friendly commands with helpful prompts, color-coded outputs, and automation.
 
 ## Documentation
@@ -22,7 +23,7 @@ For complete documentation, usage examples, and detailed command reference, visi
 | `g-co` | Checkout branch with optional stashing |
 | `g-pull` | Pull changes from remote branch |
 | `g-push` | Push changes to remote (supports force push) |
-| `g-wa` | Create git worktree for a branch |
+| `g-wa` | Create git worktree with automatic repository restructuring |
 | `g-wr` | Remove git worktree |
 | `g-db` | Delete branch locally and remotely |
 | `g-dlc` | Discard last commit |
@@ -99,6 +100,34 @@ g-co -t feature-branch
 g-wa -t new-feature
 ```
 
+### Understanding g-wa: Worktree Management
+
+`g-wa` intelligently manages git worktrees with automatic repository restructuring:
+
+**First-time setup:**
+- Automatically detects if your repository needs restructuring
+- Moves your repository into a `main` subdirectory
+- Creates a `worktrees` directory for branch isolation
+- Provides clear step-by-step feedback throughout the process
+
+**Structure after setup:**
+```
+your-repo/
+├── main/           # Your default branch (main/master)
+└── worktrees/      # All feature branch worktrees
+    ├── feature_1/
+    ├── feature_2/
+    └── bugfix_abc/
+```
+
+**Key features:**
+- Only creates worktrees from the default branch (main/master)
+- Automatically sanitizes branch names for directory creation
+- Converts paths to absolute paths for clarity
+- Checks for existing worktrees to prevent duplicates
+- Prompts to create new branches if they don't exist
+- Automatically pushes new branches to remote
+
 **Pull latest changes:**
 ```bash
 g-pull
@@ -122,8 +151,9 @@ For complete command documentation and advanced usage examples, visit the [gitsy
 - **Color-coded output** - Easy-to-read, colorful terminal output powered by lolcat
 - **Safety checks** - Built-in validations prevent common git mistakes
 - **Automation** - Streamlines complex git workflows into single commands
-- **Worktree management** - Simplified git worktree creation and removal
+- **Intelligent worktree management** - Automatic repository restructuring for seamless worktree workflows
 - **Branch operations** - Quick branch switching, creation, and deletion
+- **Step-by-step feedback** - Clear progress indicators show exactly what's happening
 
 ## Contributing
 

package/{g-cb → bin/g-cb}

@@ -29,6 +29,7 @@ set_flags() {
 			exit 0
 			;;
 		*)
+			echo ""
 			echo "${RED}Unknown option:${NC} $1"
 			exit 1
 			;;
@@ -44,7 +45,8 @@ main() {
 	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}"
+		print_message "" -1
+		print_message "${RED}Failed to get current branch.${NC}" -1
 		exit 1
 	fi
 	echo "$current_branch_name" | indent

package/{g-co → bin/g-co}

@@ -37,6 +37,7 @@ set_flags() {
 		-t=* | --target-branch=*)
 			target_branch="${1#*=}"
 			if [ -z "$target_branch" ]; then
+				echo ""
 				echo "${RED}Error: No target branch specified.$NC"
 				exit 1
 			fi
@@ -46,6 +47,7 @@ set_flags() {
 			if [ $# -gt 0 ]; then
 				target_branch="$1"
 			else
+				echo ""
 				echo "${RED}Error: No target branch specified.$NC"
 				exit 1
 			fi
@@ -95,7 +97,8 @@ checkout_or_create_branch() {
 		return
 	fi
 
-	print_message "${RED}Aborted.${NC}"
+	print_message "" -1
+	print_message "${RED}Aborted.${NC}" -1
 	exit 1
 }
 

package/{g-db → bin/g-db}

@@ -35,6 +35,7 @@ set_flags() {
 		-t=* | --target-branch=*)
 			target_branch="${1#*=}"
 			if [ -z "$target_branch" ]; then
+				echo ""
 				echo "${RED}Error: No target branch specified.$NC"
 				exit 1
 			fi
@@ -44,11 +45,13 @@ set_flags() {
 			if [ $# -gt 0 ]; then
 				target_branch="$1"
 			else
+				echo ""
 				echo "${RED}Error: No target branch specified.$NC"
 				exit 1
 			fi
 			;;
 		*)
+			echo ""
 			echo "${RED}Unknown option:${NC} $1"
 			exit 1
 			;;
@@ -67,18 +70,20 @@ delete_local_branch() {
 		return 0
 	fi
 
-	current_branch=$(fetch_current_branch)
+	current_branch=$(get_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}"
+		print_message "" -1
+		print_message "${RED}Cannot delete the branch you are currently on.${NC}" -1
+		print_message "${RED}Please checkout to another branch first.${NC}" -1
 		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}"
+		print_message "" -1
+		print_message "${RED}Failed to delete local branch ${NC}${branch}${RED}. [Fail]${NC}" -1
+		print_message "${PROMPT}Hint: Branch may not be fully merged. Use 'git branch -D ${branch}' to force delete.${NC}" -1
 		exit 1
 	fi
 
@@ -100,7 +105,8 @@ prompt_remote_deletion() {
 
 	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}"
+		print_message "" -1
+		print_message "${RED}Failed to delete remote branch ${NC}origin/${branch}${RED}. [Fail]${NC}" -1
 		exit 1
 	fi
 

package/{g-diff → bin/g-diff}

@@ -46,7 +46,8 @@ set_flags() {
 		-t=* | --target-branch=*)
 			target_branch="${1#*=}"
 			if [ -z "$target_branch" ]; then
-				print_message "${RED}Error: No target branch specified.${NC}"
+				print_message "" -1
+				print_message "${RED}Error: No target branch specified.${NC}" -1
 				exit 1
 			fi
 			;;
@@ -55,14 +56,16 @@ set_flags() {
 			if [ $# -gt 0 ]; then
 				target_branch="$1"
 			else
-				print_message "${RED}Error: No target branch specified.${NC}"
+				print_message "" -1
+				print_message "${RED}Error: No target branch specified.${NC}" -1
 				exit 1
 			fi
 			;;
 		-s=* | --source-branch=*)
 			source_branch="${1#*=}"
 			if [ -z "$source_branch" ]; then
-				print_message "${RED}Error: No source branch specified.${NC}"
+				print_message "" -1
+				print_message "${RED}Error: No source branch specified.${NC}" -1
 				exit 1
 			fi
 			;;
@@ -71,12 +74,14 @@ set_flags() {
 			if [ $# -gt 0 ]; then
 				source_branch="$1"
 			else
-				print_message "${RED}Error: No source branch specified.${NC}"
+				print_message "" -1
+				print_message "${RED}Error: No source branch specified.${NC}" -1
 				exit 1
 			fi
 			;;
 		*)
-			print_message "${RED}Unknown option:${NC} $1"
+			print_message "" -1
+			print_message "${RED}Unknown option:${NC} $1" -1
 			exit 1
 			;;
 		esac
@@ -159,7 +164,8 @@ 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}"
+		print_message "" -1
+		print_message "${RED}Failed to compare branches.${NC}" -1
 		exit 1
 	fi
 
@@ -174,7 +180,8 @@ 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}"
+		print_message "" -1
+		print_message "${RED}Failed to compare branches.${NC}" -1
 		exit 1
 	fi
 
@@ -194,9 +201,10 @@ compare_branches() {
 
 	if [ -z "$source_branch" ]; then
 		print_message "${BLUE}Source branch not specified, using current branch...${NC}" $step_number
-		source_branch=$(fetch_current_branch true)
+		source_branch=$(get_current_branch true)
 		if [ -z "$source_branch" ]; then
-			print_message "${RED}Failed to get current branch.${NC}"
+			print_message "" -1
+			print_message "${RED}Failed to get current branch.${NC}" -1
 			exit 1
 		fi
 		step_number=$((step_number + 1))
@@ -204,7 +212,8 @@ compare_branches() {
 
 	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}"
+		print_message "" -1
+		print_message "${RED}Failed to fetch target branch ${NC}${target_branch}${RED}.${NC}" -1
 		exit 1
 	fi
 

package/{g-dlc → bin/g-dlc}

@@ -48,6 +48,7 @@ set_flags() {
 			fi
 			;;
 		*)
+			echo ""
 			echo "${RED}Unknown option:${NC} $1"
 			exit 1
 			;;
@@ -74,8 +75,9 @@ 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
+			print_message "" -1
+			print_message "${RED}Error: There are uncommitted changes in your working directory.${NC}" -1
+			print_message "${RED}Please commit or stash your changes before discarding the last commit.${NC}" -1
 			exit 1
 		fi
 		print_message "${GREEN}No uncommitted changes found.${NC}" 0
@@ -96,7 +98,8 @@ discard_last_commit() {
 		echo "$reset_output" | indent
 	fi
 	if [ $reset_exit_code -ne 0 ]; then
-		print_message "${RED}Failed to discard the last commit. [Fail]${NC}" 0
+		print_message "" -1
+		print_message "${RED}Failed to discard the last commit. [Fail]${NC}" -1
 		exit 1
 	fi
 

package/{g-pull → bin/g-pull}

@@ -63,7 +63,7 @@ main() {
 	validate_dependencies
 	print_banner
 	if [ -z "$target_branch" ]; then
-		target_branch=$(fetch_current_branch)
+		target_branch=$(get_current_branch)
 	fi
 	if [ "$do_fetch" = "true" ]; then
 		print_message "${BLUE}Fetching changes...${NC}" 1

package/{g-push → bin/g-push}

@@ -37,6 +37,7 @@ set_flags() {
 		-t=* | --target-branch=*)
 			target_branch="${1#*=}"
 			if [ -z "$target_branch" ]; then
+				echo ""
 				echo "${RED}Error: No target branch specified.$NC"
 				exit 1
 			fi
@@ -46,6 +47,7 @@ set_flags() {
 			if [ $# -gt 0 ]; then
 				target_branch="$1"
 			else
+				echo ""
 				echo "${RED}Error: No target branch specified.$NC"
 				exit 1
 			fi
@@ -63,7 +65,7 @@ main() {
 	validate_dependencies
 	print_banner
 	if [ -z "$target_branch" ]; then
-		push_changes $(fetch_current_branch) $should_force_push 1
+		push_changes $(get_current_branch) $should_force_push 1
 		exit 0
 	fi
 	push_changes "$target_branch" $should_force_push 1

package/{g-rmf → bin/g-rmf}

@@ -41,6 +41,7 @@ set_flags() {
 			if [ $# -gt 0 ]; then
 				tag_message="$1"
 			else
+				echo ""
 				echo "${RED}Error: No message specified.$NC"
 				exit 1
 			fi

package/{g-rto → bin/g-rto}

@@ -30,6 +30,7 @@ set_flags() {
 			exit 0
 			;;
 		*)
+			echo ""
 			echo "${RED}Unknown option:${NC} $1"
 			exit 1
 			;;
@@ -42,7 +43,7 @@ main() {
 	set_flags "$@"
 	validate_dependencies git figlet lolcat
 	print_banner
-	target_branch=$(fetch_current_branch)
+	target_branch=$(get_current_branch)
 	stash_changes true 1
 	print_message ""
 

package/{g-s → bin/g-s}

@@ -29,6 +29,7 @@ set_flags() {
 			exit 0
 			;;
 		*)
+			echo ""
 			echo "${RED}Unknown option:${NC} $1"
 			exit 1
 			;;
@@ -43,7 +44,7 @@ main() {
 	print_banner
 	print_message "${BLUE}Fetching git status...${NC}" 1
 
-	current_branch=$(fetch_current_branch)
+	current_branch=$(get_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}"