pygitgo 1.1.1__tar.gz → 1.2.1__tar.gz

{pygitgo-1.1.1/src/pygitgo.egg-info → pygitgo-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitgo
-Version: 1.1.1
+Version: 1.2.1
 Summary: GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management.
 Author: Huerte
 License: GPL-3.0-or-later
@@ -78,6 +78,7 @@ GitGo provides a CLI environment designed for faster and simpler Git workflows.
 - **Simplified Git Operations:** Replaces chained commands with single intuitive commands for linking, pushing, and stashing.
 - **Smart Branch Hopping:** Safely traverse branches with `jump`. Auto-stashes messy code and prevents merge conflict disasters with a Try-And-Revert safety engine.
 - **State Management:** A human-readable interface over `git stash`. States are named and listed by index so you never have to remember cryptic stash references.
+- **Custom Defaults:** Save your preferred branch name and commit message locally so you never have to type them again.
 - **SSH Auto-Setup:** Generates an SSH key, adds it to `ssh-agent`, and opens your GitHub settings automatically.
 - **HTTPS to SSH Conversion:** Silently converts the remote to SSH before pushing if your SSH is configured.
 - **Termux Compatibility:** Works natively on Android natively handling common issues like dubious ownership errors.
@@ -153,6 +154,14 @@ gitgo state list
 gitgo state load 1
 ```
 
+### 6. Custom Defaults
+Save your preferred settings so you don't have to provide them every time.
+```bash
+gitgo config set default-branch develop
+gitgo config set default-message "WIP: updates"
+gitgo config get default-branch
+```
+
 ---
 
 ## Command Reference
@@ -166,6 +175,9 @@ gitgo push [branch] [message]
 gitgo push -n [branch] [message]   # create new branch first
 ```
 
+> [!TIP]
+> Use `gitgo push -h` to see all available flags and examples.
+
 | Flag | Description |
 |------|-------------|
 | `-n`, `--new` | Create a new branch before pushing |
@@ -209,10 +221,25 @@ gitgo user login        # generate SSH key and configure Git identity
 gitgo user logout       # remove SSH keys and Git identity config
 ```
 
+### `gitgo config`
+
+Manage your GitGo defaults.
+
+```bash
+gitgo config set <key> <value>
+gitgo config get <key>
+```
+
+| Key | Description | Default |
+|-----|-------------|---------|
+| `default-branch` | The branch used for push/link | `main` |
+| `default-message` | The commit message used for push | `New Project Update` |
+
 ### Global Flags
 
 ```bash
-gitgo -h        # help
+gitgo help      # show complete manual
+gitgo <cmd> -h  # show help for a specific command
 gitgo -v        # version
 gitgo -r        # verify GitGo is ready
 ```

{pygitgo-1.1.1 → pygitgo-1.2.1}/README.md

@@ -55,6 +55,7 @@ GitGo provides a CLI environment designed for faster and simpler Git workflows.
 - **Simplified Git Operations:** Replaces chained commands with single intuitive commands for linking, pushing, and stashing.
 - **Smart Branch Hopping:** Safely traverse branches with `jump`. Auto-stashes messy code and prevents merge conflict disasters with a Try-And-Revert safety engine.
 - **State Management:** A human-readable interface over `git stash`. States are named and listed by index so you never have to remember cryptic stash references.
+- **Custom Defaults:** Save your preferred branch name and commit message locally so you never have to type them again.
 - **SSH Auto-Setup:** Generates an SSH key, adds it to `ssh-agent`, and opens your GitHub settings automatically.
 - **HTTPS to SSH Conversion:** Silently converts the remote to SSH before pushing if your SSH is configured.
 - **Termux Compatibility:** Works natively on Android natively handling common issues like dubious ownership errors.
@@ -130,6 +131,14 @@ gitgo state list
 gitgo state load 1
 ```
 
+### 6. Custom Defaults
+Save your preferred settings so you don't have to provide them every time.
+```bash
+gitgo config set default-branch develop
+gitgo config set default-message "WIP: updates"
+gitgo config get default-branch
+```
+
 ---
 
 ## Command Reference
@@ -143,6 +152,9 @@ gitgo push [branch] [message]
 gitgo push -n [branch] [message]   # create new branch first
 ```
 
+> [!TIP]
+> Use `gitgo push -h` to see all available flags and examples.
+
 | Flag | Description |
 |------|-------------|
 | `-n`, `--new` | Create a new branch before pushing |
@@ -186,10 +198,25 @@ gitgo user login        # generate SSH key and configure Git identity
 gitgo user logout       # remove SSH keys and Git identity config
 ```
 
+### `gitgo config`
+
+Manage your GitGo defaults.
+
+```bash
+gitgo config set <key> <value>
+gitgo config get <key>
+```
+
+| Key | Description | Default |
+|-----|-------------|---------|
+| `default-branch` | The branch used for push/link | `main` |
+| `default-message` | The commit message used for push | `New Project Update` |
+
 ### Global Flags
 
 ```bash
-gitgo -h        # help
+gitgo help      # show complete manual
+gitgo <cmd> -h  # show help for a specific command
 gitgo -v        # version
 gitgo -r        # verify GitGo is ready
 ```

{pygitgo-1.1.1 → pygitgo-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygitgo"
-version = "1.1.1"
+version = "1.2.1"
 description = "GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management."
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}

{pygitgo-1.1.1 → pygitgo-1.2.1}/src/pygitgo/auth/ssh_utils.py

@@ -1,5 +1,5 @@
-from pygitgo.utils.executor import run_command
 from pygitgo.utils.colors import info, success, warning, error
+from pygitgo.utils.executor import run_command
 from pygitgo.utils import platform_utils
 from pathlib import Path
 import subprocess
@@ -35,11 +35,15 @@ def ensure_github_known_host():
 def check_connection():
     ensure_github_known_host()
     result = run_command(["ssh", "-T", "git@github.com"], allow_fail=True, return_complete=True)
+    if not hasattr(result, "stderr") or not result.stderr:
+        return False
     return "successfully authenticated" in result.stderr
 
 def get_github_username():
 
     result = run_command(["ssh", "-T", "git@github.com"], allow_fail=True, return_complete=True)
+    if not hasattr(result, "stderr") or not result.stderr:
+        return None
     output = result.stderr
     
     if "Hi " in output and "!" in output:

{pygitgo-1.1.1 → pygitgo-1.2.1}/src/pygitgo/commands/git_operations.py

@@ -1,12 +1,18 @@
 from pygitgo.auth.ssh_utils import convert_https_to_ssh, is_ssh_url, check_connection
-from pygitgo.utils.executor import run_command
 from pygitgo.utils.colors import info, success, warning, error
+from pygitgo.utils.executor import run_command
+from pygitgo.utils.config import get_config
+from argparse import Namespace
 import subprocess
 import sys
 import os
 
-DEFAULT_MAIN_BRANCH = "main"
 
+def get_status_content():
+    status = run_command(["git", "status", "--porcelain"], allow_fail=True)
+    if isinstance(status, subprocess.CalledProcessError) or not status.strip():
+        sys.exit(1)
+    return status
 
 def get_current_branch():
     branch = run_command(["git", "branch", "--show-current"]).strip()
@@ -16,18 +22,28 @@ def get_current_branch():
 
 def get_main_branch():
     main_branch = run_command(['git', 'remote', 'show', 'origin'], allow_fail=True)
+    default_main_branch = get_config("default-branch", "main")
     if isinstance(main_branch, subprocess.CalledProcessError):
-        return DEFAULT_MAIN_BRANCH
+        return default_main_branch
     
-    return main_branch.split("HEAD branch:")[-1].strip().splitlines()[0].strip() if "HEAD branch:" in main_branch else DEFAULT_MAIN_BRANCH
+    return main_branch.split("HEAD branch:")[-1].strip().splitlines()[0].strip() if "HEAD branch:" in main_branch else default_main_branch
 
 def is_branch_exist(branch):
     return bool(run_command(["git", "branch", "-r", "--list", f"*/{branch}"])) or bool(run_command(["git", "branch", "--list", branch]))
 
 
 def git_new_branch(branch):
-    run_command(["git", "checkout", "-b", branch], loading_msg=f"Creating branch '{branch}'...")
-    success(f"\nBranch '{branch}' created.\n")
+    result = run_command(["git", "checkout", "-b", branch], loading_msg=f"Creating branch '{branch}'...")
+    if isinstance(result, subprocess.CalledProcessError):
+        error(f"Failed to create branch '{branch}'! It may already exist.")
+        choice = input("\nWould you like to jump to the existing branch instead? (y/n): ").strip().lower()
+        if choice == "y":
+            from pygitgo.commands.jump import jump_operation
+            jump_operation(Namespace(branch=branch))
+        else:
+            sys.exit(1)
+    else:
+        success(f"\nBranch '{branch}' created.\n")
 
     return branch
 
@@ -50,10 +66,12 @@ def git_init():
         warning("Already a git repository! Skipping init...")
         return True
     
-    result = run_command(["git", "init", "-b", DEFAULT_MAIN_BRANCH], allow_fail=True, loading_msg="Initializing git repository...")
+    default_main_branch = get_config("default-branch", "main")
+
+    result = run_command(["git", "init", "-b", default_main_branch], allow_fail=True, loading_msg="Initializing git repository...")
     if isinstance(result, subprocess.CalledProcessError):
         run_command(["git", "init"], loading_msg="Initializing git repository...")
-        run_command(["git", "checkout", "-b", DEFAULT_MAIN_BRANCH], allow_fail=True)
+        run_command(["git", "checkout", "-b", default_main_branch], allow_fail=True)
 
     success("Git repository initialized.")
     return True
@@ -134,8 +152,16 @@ def git_push(branch):
             if ssh_url:
                 run_command(["git", "remote", "set-url", "origin", ssh_url], loading_msg="Converting remote from HTTPS to SSH for secure push...")
                 success(f"Remote updated to: {ssh_url}")
-    
-    run_command(["git", "push", "-u", "origin", branch], loading_msg=f"Pushing to remote branch '{branch}'...")
+
+    try:    
+        run_command(["git", "push", "-u", "origin", branch], loading_msg=f"Pushing to remote branch '{branch}'...")
+    except (subprocess.CalledProcessError, OSError) as e:
+        error("Failed to push to remote repository!")
+        warning("Please check your network connection, remote URL, and authentication.")
+        if "rebase in progress" in str(e):
+            handle_rebase()
+        else:
+            sys.exit(1)
 
 
 def handle_rebase():

{pygitgo-1.1.1 → pygitgo-1.2.1}/src/pygitgo/commands/jump.py

@@ -1,15 +1,11 @@
 from pygitgo.commands.git_operations import (
     is_branch_exist, get_current_branch, git_new_branch, get_main_branch
 )
-from pygitgo.utils.executor import run_command
-from pygitgo.commands.state import *
 from pygitgo.utils.colors import warning, info, success, error
+from pygitgo.utils.executor import run_command
 import subprocess
 import sys
 
-def jump_operations_help():
-    warning("\nUsage: gitgo jump <branch>\n")
-    warning("branch: The name of the branch to jump to.\n")
 
 def undo_jump_operation(original_branch, stashed_code, created_branch=None):
     if created_branch:
@@ -25,12 +21,10 @@ def undo_jump_operation(original_branch, stashed_code, created_branch=None):
     success(f"\nCanceled safely!")
     success(f"You are back on your original branch '{original_branch}', and your code is totally safe.\n")
 
-def jump_operation(arguments):  
-    if len(arguments) == 0 or arguments[0] in ("-h", "--help", "help"):
-        jump_operations_help()
-        sys.exit(0)
+def jump_operation(args):  
+
 
-    target_branch = arguments[0]
+    target_branch = args.branch
 
     original_branch = get_current_branch().strip()
     

pygitgo-1.2.1/src/pygitgo/commands/state.py

@@ -0,0 +1,177 @@
+from pygitgo.utils.colors import info, highlight, error, warning, success
+from pygitgo.utils.executor import run_command
+import sys
+
+
+ALIASES = {
+    "-l": "list",
+    "-s": "save",
+    "-o": "load",
+    "-d": "delete"
+}
+
+def all_save_state():
+    output = run_command([
+        "git", "stash", "list",
+        "--date=format:%Y-%m-%d %H:%M:%S",
+        "--pretty=%gd||%cd||%s"
+    ])
+
+    if not output:
+        info("\nNo saved states found.\n")
+        sys.exit(0)
+
+    save_states = []
+
+    for line in output.splitlines():
+        try:
+            stash_ref, date, message = line.split("||", 2)
+
+            index = int(
+                stash_ref.replace("stash@{", "").replace("}", "")
+            )
+
+            save_states.append({
+                "id": index + 1,   
+                "ref": stash_ref,  
+                "date": date,
+                "message": message
+            })
+
+        except ValueError:
+            warning(f"Skipping malformed line: {line}")
+
+    return save_states
+
+
+def display_save_states():
+    save_states = all_save_state()
+
+    print("\nID | Date                | Saved State")
+    print("-" * 60)
+
+    for state in save_states:
+        highlight(
+            f"{state['id']:>2} | {state['date']} | {state['message']}"
+        )
+
+    print("-" * 60 + "\n")
+
+
+def is_number(value):
+    val = str(value).strip()
+    if val.startswith('-'):
+        return val[1:].isdigit()
+    return val.isdigit()
+    
+def validate_state_id(state_id, save_states):
+    if not is_number(state_id):
+        error("\nInvalid input. Please enter a valid state ID.\n")
+        return False
+    elif (int(state_id) - 1) < 0:
+        error("\nState ID cannot be '0' or negative. Please enter a valid state ID.\n")
+        return False
+    elif (int(state_id) - 1) >= len(save_states):
+        error("\nState ID out of range. Please enter a valid state ID.\n")
+        return False
+    return True
+
+
+def ask_state_id(save_states):
+    proceed = False
+    state_id = None
+
+    display_save_states()
+    info("\nEnter the ID (or 'q' to cancel): ")
+
+    while not proceed:
+        state_id = input(">> ").strip().lower()
+        if state_id == 'q':
+            warning("\nLoad operation cancelled by user.\n")
+            sys.exit(0)
+        proceed = validate_state_id(state_id, save_states)
+    
+    return state_id
+
+
+def state_list():
+    display_save_states()
+
+
+def load_state(state_id=None):
+    save_states = all_save_state()
+    proceed = False
+
+    if state_id:
+        if state_id.isdigit():
+            proceed = validate_state_id(state_id, save_states)
+            if not proceed:
+                sys.exit(1)
+        else:
+            error(f"\nInvalid argument '{state_id}' for load operation. Expected a state ID.\n")
+            sys.exit(1)
+    
+    if not proceed:
+        state_id = ask_state_id(save_states)
+        
+    run_command(["git", "stash", "apply", str(int(state_id) - 1)])
+
+    success(f"\nState '{save_states[int(state_id) - 1]['message']}' loaded successfully.\n")
+
+
+def save_state(state_name=None):
+    if not state_name:
+        state_name = "Auto-Save"
+
+    output = run_command(["git", "stash", "push", "-m", state_name], allow_fail=True)
+    if isinstance(output, Exception):
+        error(f"\nFailed to save state '{state_name}'.\n")
+    elif "No local changes to save" in output:
+        warning("\nNo local changes to save.\n")
+    else:
+        success(f"\nState '{state_name}' saved successfully.\n")
+
+
+def delete_state(identifier=None):
+    if not identifier:
+        state_id = ask_state_id(all_save_state())
+    else:
+        if identifier == '-a':
+            confirm = input("\nAre you sure you want to delete all saved states? (y/n): ").strip().lower()
+            if confirm.lower() == 'y':
+                run_command(["git", "stash", "clear"])
+                success("\nAll saved states deleted successfully.\n")
+                sys.exit(0)
+            else:
+                warning("\nDelete operation cancelled by user.\n")
+                sys.exit(0)
+        
+        elif not identifier.isdigit():
+            error("\nInvalid input. Please enter a valid state ID.\n")
+            sys.exit(1)
+
+        state_id = identifier
+        if not validate_state_id(state_id, all_save_state()):
+            sys.exit(1)
+    
+    run_command(["git", "stash", "drop", str(int(state_id) - 1)])
+    success(f"\nState with ID '{state_id}' deleted successfully.\n")
+
+
+
+
+def state_operations(args):
+    action = ALIASES.get(args.action, args.action)
+    identifier = getattr(args, "identifier", None)
+
+    if action == "list":
+        state_list()
+    elif action == "save":
+        save_state(identifier)
+    elif action == "load":
+        load_state(identifier)
+    elif action == "delete":
+        delete_state(identifier)
+    else:
+        error(f"\nUnknown state operation: {action}\n")
+        sys.exit(1)