gitpush-tool 0.3.2__tar.gz → 0.3.4__tar.gz

{gitpush_tool-0.3.2/gitpush_tool.egg-info → gitpush_tool-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitpush-tool
-Version: 0.3.2
+Version: 0.3.4
 Summary: Supercharged Git push tool with automatic GitHub repo creation and pushing
 Home-page: https://github.com/inevitablegs/gitpush
 Author: Ganesh Sonawane

gitpush_tool-0.3.4/gitpush/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.4"

{gitpush_tool-0.3.2 → gitpush_tool-0.3.4}/gitpush/cli.py

@@ -461,21 +461,113 @@ def standard_git_push(commit_message, branch, remote, force=False, tags=False):
         if force:
             push_cmd.append("--force-with-lease")
             print("⚠️ Using safe force push (--force-with-lease).")
-        if tags: push_cmd.append("--tags")
-        if remote and branch: push_cmd.extend([remote, branch])
+        if tags:
+            push_cmd.append("--tags")
+        if remote and branch:
+            push_cmd.extend([remote, branch])
         
         print(f"🚀 Executing: {' '.join(push_cmd)}")
         subprocess.run(push_cmd, check=True)
         print("✅ Successfully pushed changes.")
         return True
+
     except subprocess.CalledProcessError as e:
         error_output = e.stderr.decode(errors='ignore').strip() if e.stderr else str(e)
+
         if "nothing to commit" in error_output:
             print("ℹ️ No changes to commit. Nothing to do.")
             return True
+
+        if "non-fast-forward" in error_output.lower():
+            print("\n❗ Detected non-fast-forward issue. Attempting rebase...")
+            if attempt_rebase(remote, branch):
+                print("🔁 Retrying push after rebase...")
+                return standard_git_push(commit_message, branch, remote, force, tags)
+            else:
+                print("❌ Rebase failed. Please resolve conflicts manually and re-run the push.")
+                return False
+
         print(f"❌ Push failed: {error_output}", file=sys.stderr)
         return False
 
+
+
+def has_incoming_changes(remote: str = "origin", branch: str = "main") -> bool:
+    try:
+        subprocess.run(["git", "fetch", remote], check=True, capture_output=True)
+
+        result = subprocess.run(
+            ["git", "rev-list", "--left-right", "--count", f"{remote}/{branch}...{branch}"],
+            check=True, capture_output=True, text=True
+        )
+        behind_ahead = result.stdout.strip().split()
+        if len(behind_ahead) == 2:
+            behind, ahead = map(int, behind_ahead)
+            return behind > 0
+        return False
+    except subprocess.CalledProcessError:
+        return False
+
+
+def pull_and_check_conflicts(remote: str = "origin", branch: str = "main") -> bool:
+    print("🔄 Pulling latest changes before pushing...")
+
+    try:
+        result = subprocess.run(["git", "pull", remote, branch], capture_output=True, text=True)
+
+        if "CONFLICT" in result.stdout or "CONFLICT" in result.stderr:
+            print("❗ Merge conflicts detected.")
+            return True
+        else:
+            print("✅ Pulled successfully. No conflicts.")
+            return False
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Pull failed: {e.stderr or str(e)}", file=sys.stderr)
+        return True
+
+
+
+def show_merge_conflict_details():
+    print("\n🔍 Merge Conflict Report:\n")
+
+    try:
+        result = subprocess.run(["git", "diff", "--name-only", "--diff-filter=U"], capture_output=True, text=True, check=True)
+        conflicted_files = result.stdout.strip().splitlines()
+
+        if not conflicted_files:
+            print("✅ No merge conflicts found.")
+            return
+
+        for file in conflicted_files:
+            print(f"📄 File: {file}")
+            try:
+                with open(file, 'r', encoding='utf-8') as f:
+                    lines = f.readlines()
+                    for i, line in enumerate(lines):
+                        if line.startswith("<<<<<<<") or line.startswith("=======") or line.startswith(">>>>>>>"):
+                            marker = line.strip()
+                            print(f"   ⚠️  Conflict Marker ({marker}) at line {i + 1}")
+            except Exception as e:
+                print(f"   ❌ Could not read file {file}: {str(e)}")
+
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Could not retrieve conflicted files: {str(e)}")
+
+
+def attempt_rebase(remote: str, branch: str) -> bool:
+    print("🔁 Attempting: git pull --rebase")
+    try:
+        subprocess.run(["git", "pull", "--rebase", remote, branch], check=True)
+        print("✅ Rebase completed successfully.")
+        return True
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Rebase failed: {e.stderr.decode(errors='ignore') if e.stderr else str(e)}")
+        show_merge_conflict_details()
+        return False
+
+
+
+
 # --- Main Entry Point ---
 
 def run():
@@ -532,6 +624,13 @@ def run():
              print("✅ Git repository initialized successfully.")
     
     else:
+        if has_incoming_changes(args.remote, target_branch):
+            conflicts = pull_and_check_conflicts(args.remote, target_branch)
+            if conflicts:
+                show_merge_conflict_details()
+                print("\n❌ Resolve conflicts before pushing.")
+                sys.exit(1)
+
         if not standard_git_push(
             args.commit,
             target_branch,

{gitpush_tool-0.3.2 → gitpush_tool-0.3.4/gitpush_tool.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitpush-tool
-Version: 0.3.2
+Version: 0.3.4
 Summary: Supercharged Git push tool with automatic GitHub repo creation and pushing
 Home-page: https://github.com/inevitablegs/gitpush
 Author: Ganesh Sonawane

{gitpush_tool-0.3.2 → gitpush_tool-0.3.4}/setup.py

@@ -6,7 +6,7 @@ long_description = (Path(__file__).parent / "LONG_DESCRIPTION.md").read_text(enc
 
 setup(
     name="gitpush-tool",
-    version="0.3.2",
+    version="0.3.4",
     packages=find_packages(),
     install_requires=[],
     entry_points={

gitpush_tool-0.3.2/gitpush/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.2"