pygitgo 1.3.0__tar.gz → 1.4.0__tar.gz

{pygitgo-1.3.0/src/pygitgo.egg-info → pygitgo-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitgo
-Version: 1.3.0
+Version: 1.4.0
 Summary: GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management.
 Author: Huerte
 License: GPL-3.0-or-later
@@ -193,6 +193,15 @@ gitgo push -n [branch] [message]   # create new branch first
 
 If there are no new changes but unpushed commits exist, GitGo detects this and pushes without creating an empty commit.
 
+### `gitgo pull`
+
+Safely downloads updates from the remote server. It automatically stashes your messy code, pulls the updates cleanly underneath using a rebase, and then instantly puts your code back exactly how it was. 
+
+```bash
+gitgo pull             # Safely pull updates for your current branch
+gitgo pull <branch>    # Safely pull updates from a specific branch
+```
+
 ### `gitgo link`
 
 Initializes a Git repository in the current directory, connects it to a remote, and pushes. Handles already-initialized repos gracefully and pulls unrelated histories.

{pygitgo-1.3.0 → pygitgo-1.4.0}/README.md

@@ -170,6 +170,15 @@ gitgo push -n [branch] [message]   # create new branch first
 
 If there are no new changes but unpushed commits exist, GitGo detects this and pushes without creating an empty commit.
 
+### `gitgo pull`
+
+Safely downloads updates from the remote server. It automatically stashes your messy code, pulls the updates cleanly underneath using a rebase, and then instantly puts your code back exactly how it was. 
+
+```bash
+gitgo pull             # Safely pull updates for your current branch
+gitgo pull <branch>    # Safely pull updates from a specific branch
+```
+
 ### `gitgo link`
 
 Initializes a Git repository in the current directory, connects it to a remote, and pushes. Handles already-initialized repos gracefully and pulls unrelated histories.

{pygitgo-1.3.0 → pygitgo-1.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygitgo"
-version = "1.3.0"
+version = "1.4.0"
 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.4.0/src/pygitgo/commands/pull.py

@@ -0,0 +1,43 @@
+from pygitgo.utils.colors import success, warning, error, info
+from pygitgo.utils.executor import run_command
+from pygitgo.exceptions import GitCommandError
+from pygitgo.commands.git_operations import get_current_branch
+import subprocess
+import sys
+
+def pull_operation(args):
+    branch = args.branch
+
+    if not branch:
+        branch = get_current_branch()
+        info(f"No branch provided. Pulling latest updates for '{branch}'...\n")
+
+    try:
+        remote_refs = run_command(["git", "ls-remote", "--heads", "origin", branch], allow_fail=True)
+        if isinstance(remote_refs, subprocess.CalledProcessError) or not remote_refs.strip():
+            error(f"\nFailed! The branch '{branch}' does not exist on the remote server.")
+            warning("You might need to push your local branch first.\n")
+            sys.exit(1)
+
+        run_command(
+            ["git", "pull", "--rebase", "--autostash", "origin", branch], 
+            loading_msg=f"Downloading latest updates for '{branch}' (auto-saving your code)..."
+        )
+        
+        success(f"\nSuccess! Your project is now up to date with '{branch}'.\n")
+
+    except GitCommandError as e:
+        error_msg = str(e).lower()
+        if "conflict" in error_msg or "rebase in progress" in error_msg:
+            error("\nMERGE CONFLICT DETECTED!")
+            warning("Your local code clashes with the new code downloaded from the server.\n")
+            info("1. Open your code editor down below.")
+            info("2. Fix the red conflict lines in your files.")
+            info("3. Save the files.")
+            info("4. Run this command to finish:  git rebase --continue\n")
+            sys.exit(1)
+        else:
+            error("\nFailed to pull updates from the server!")
+            error("Please check your internet connection and try again.")
+            error(f"Details: {e}\n")
+            sys.exit(1)

{pygitgo-1.3.0 → pygitgo-1.4.0}/src/pygitgo/main.py

@@ -8,6 +8,7 @@ from pygitgo.exceptions import GitCommandError, GitGoError
 from pygitgo.utils.setup import ensure_first_run_setup
 from pygitgo.commands.state import state_operations
 from pygitgo.commands.undo import undo_operations
+from pygitgo.commands.pull import pull_operation
 from pygitgo.commands.jump import jump_operation
 from pygitgo.utils.executor import run_command
 from pygitgo.auth.manager import login, logout
@@ -282,6 +283,17 @@ def main():
         help="What to undo: 'commit', 'add', or 'changes'"
     )
 
+    pull_parser = subparsers.add_parser("pull", 
+        help="Safely pull the latest code without losing your changes",
+        epilog=(
+            "Examples:\n"
+            "  gitgo pull                Safely pull updates for your current branch\n"
+            "  gitgo pull main           Safely pull updates from the 'main' branch\n"
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    pull_parser.add_argument("branch", nargs="?", default=None, help="The branch to pull from (default is your current branch)")
+
     args = parser.parse_args()
 
     if args.ready:
@@ -309,6 +321,8 @@ def main():
             config_operation(args)
         elif args.command == "undo":
             undo_operations(args)
+        elif args.command == "pull":
+            pull_operation(args)
     except GitGoError as e:
         error(f"\n{e}\n")
         sys.exit(1)

{pygitgo-1.3.0 → pygitgo-1.4.0/src/pygitgo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitgo
-Version: 1.3.0
+Version: 1.4.0
 Summary: GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management.
 Author: Huerte
 License: GPL-3.0-or-later
@@ -193,6 +193,15 @@ gitgo push -n [branch] [message]   # create new branch first
 
 If there are no new changes but unpushed commits exist, GitGo detects this and pushes without creating an empty commit.
 
+### `gitgo pull`
+
+Safely downloads updates from the remote server. It automatically stashes your messy code, pulls the updates cleanly underneath using a rebase, and then instantly puts your code back exactly how it was. 
+
+```bash
+gitgo pull             # Safely pull updates for your current branch
+gitgo pull <branch>    # Safely pull updates from a specific branch
+```
+
 ### `gitgo link`
 
 Initializes a Git repository in the current directory, connects it to a remote, and pushes. Handles already-initialized repos gracefully and pulls unrelated histories.

{pygitgo-1.3.0 → pygitgo-1.4.0}/src/pygitgo.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/pygitgo/auth/ssh_utils.py
 src/pygitgo/commands/__init__.py
 src/pygitgo/commands/git_operations.py
 src/pygitgo/commands/jump.py
+src/pygitgo/commands/pull.py
 src/pygitgo/commands/state.py
 src/pygitgo/commands/undo.py
 src/pygitgo/utils/__init__.py
@@ -30,6 +31,7 @@ tests/test_git_operations.py
 tests/test_jump.py
 tests/test_main.py
 tests/test_platform.py
+tests/test_pull.py
 tests/test_setup.py
 tests/test_state.py
 tests/test_undo.py

pygitgo-1.4.0/tests/test_pull.py

@@ -0,0 +1,77 @@
+import pytest
+from unittest.mock import patch, MagicMock
+from pygitgo.commands.pull import pull_operation
+from pygitgo.exceptions import GitCommandError
+from argparse import Namespace
+import subprocess
+
+@patch("pygitgo.commands.pull.run_command")
+@patch("pygitgo.commands.pull.success")
+@patch("pygitgo.commands.pull.get_current_branch", return_value="main")
+def test_pull_operation_success_no_branch(mock_get_branch, mock_success, mock_run_command):
+    mock_run_command.side_effect = [
+        "1234567890abcdef",  
+        None                 
+    ]
+    
+    args = Namespace(branch=None)
+    pull_operation(args)
+    
+    assert mock_run_command.call_count == 2
+    mock_run_command.assert_any_call(["git", "ls-remote", "--heads", "origin", "main"], allow_fail=True)
+    mock_run_command.assert_any_call(
+        ["git", "pull", "--rebase", "--autostash", "origin", "main"], 
+        loading_msg="Downloading latest updates for 'main' (auto-saving your code)..."
+    )
+    mock_success.assert_called_once()
+
+@patch("pygitgo.commands.pull.run_command")
+@patch("pygitgo.commands.pull.success")
+def test_pull_operation_success_with_branch(mock_success, mock_run_command):
+    mock_run_command.side_effect = [
+        "1234567890abcdef",  
+        None                 
+    ]
+    
+    args = Namespace(branch="feature/test")
+    pull_operation(args)
+    
+    assert mock_run_command.call_count == 2
+    mock_run_command.assert_any_call(["git", "ls-remote", "--heads", "origin", "feature/test"], allow_fail=True)
+    mock_run_command.assert_any_call(
+        ["git", "pull", "--rebase", "--autostash", "origin", "feature/test"], 
+        loading_msg="Downloading latest updates for 'feature/test' (auto-saving your code)..."
+    )
+    mock_success.assert_called_once()
+
+@patch("pygitgo.commands.pull.sys.exit")
+@patch("pygitgo.commands.pull.error")
+@patch("pygitgo.commands.pull.run_command")
+def test_pull_operation_branch_not_found(mock_run_command, mock_error, mock_exit):
+    mock_run_command.return_value = subprocess.CalledProcessError(128, ["git", "ls-remote"])
+    
+    args = Namespace(branch="does-not-exist")
+    pull_operation(args)
+    
+    mock_exit.assert_called_once_with(1)
+    mock_error.assert_called()
+
+@patch("pygitgo.commands.pull.sys.exit")
+@patch("pygitgo.commands.pull.error")
+@patch("pygitgo.commands.pull.run_command")
+def test_pull_operation_merge_conflict(mock_run_command, mock_error, mock_exit):
+    conflict_err = GitCommandError(["git", "pull"], stderr="merge conflict in file.py")
+
+    def side_effect_fn(*args, **kwargs):
+        cmd = args[0]
+        if cmd[1] == "ls-remote":
+            return "1234567890abcdef"
+        raise conflict_err
+
+    mock_run_command.side_effect = side_effect_fn
+    
+    args = Namespace(branch="main")
+    pull_operation(args)
+    
+    mock_exit.assert_called_once_with(1)
+    mock_error.assert_any_call("\nMERGE CONFLICT DETECTED!")