fastws-cli 0.0.4__tar.gz → 0.0.5__tar.gz

{fastws_cli-0.0.4 → fastws_cli-0.0.5}/CHANGELOG.md

@@ -1,6 +1,6 @@
 <!-- do not remove -->
 
-## 0.0.4
+## 0.0.5
 
 ### New Features
 

{fastws_cli-0.0.4/fastws_cli.egg-info → fastws_cli-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.4
+Version: 0.0.5
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License: Apache-2.0
@@ -66,6 +66,7 @@ Show uncommitted changes and unpushed commits:
 
 ```bash
 ws-status
+ws-status --branches
 ```
 
 ### `ws-branches`

{fastws_cli-0.0.4 → fastws_cli-0.0.5}/README.md

@@ -45,6 +45,7 @@ Show uncommitted changes and unpushed commits:
 
 ```bash
 ws-status
+ws-status --branches
 ```
 
 ### `ws-branches`

{fastws_cli-0.0.4 → fastws_cli-0.0.5}/fastws/__init__.py

@@ -1,4 +1,5 @@
-__version__ = "0.0.4"
+__version__ = "0.0.5"
+
 
 
 from .core import *

{fastws_cli-0.0.4 → fastws_cli-0.0.5}/fastws/core.py

@@ -254,8 +254,9 @@ def ws_pull_cli(
 
 def ws_status(
     repos_file: str = "repos.txt",  # File containing repo list
+    branches: bool = False,  # Show unpushed commit details
 ):
-    "Show uncommitted changes and unpushed commits across repos."
+    "Show uncommitted changes and optionally unpushed commit details across repos."
     repos = _load_repos(repos_file)
     for repo in repos:
         d = _repo_dir(repo)
@@ -265,18 +266,22 @@ def ws_status(
         changes = g.status('-s') or ""
         if isinstance(changes, list): changes = "\n".join(changes)
         unpushed = ""
-        try: unpushed = g.log('--branches', '--not', '--remotes', format='%h %s') or ""
+        try:
+            if branches: unpushed = g.log('--branches', '--not', '--remotes', format='%h %s') or ""
+            elif (branch := g.branch(show_current=True).strip()) in ('main', 'master'):
+                unpushed = g.log('@{upstream}..HEAD', '-1', format='%h %s') or ""
         except Exception: pass
         if isinstance(unpushed, list): unpushed = "\n".join(unpushed)
         if changes or unpushed:
             print(f"\n=== {d} ===")
             if changes: print(changes)
-            if unpushed: print(unpushed)
+            if unpushed: print(unpushed if branches else "unpushed commits")
 
 @call_parse
 def ws_status_cli(
     repos_file: str = "repos.txt",  # File containing repo list
-): ws_status(repos_file)
+    branches: bool = False,  # Show unpushed commit details
+): ws_status(repos_file, branches)
 
 def ws_branches(
     repos_file: str = "repos.txt",  # File containing repo list

{fastws_cli-0.0.4 → fastws_cli-0.0.5/fastws_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastws-cli
-Version: 0.0.4
+Version: 0.0.5
 Summary: Fast workspace tools for multi-repo management
 Author: Jeremy Howard
 License: Apache-2.0
@@ -66,6 +66,7 @@ Show uncommitted changes and unpushed commits:
 
 ```bash
 ws-status
+ws-status --branches
 ```
 
 ### `ws-branches`

{fastws_cli-0.0.4 → fastws_cli-0.0.5}/tests/test_sync.py

@@ -166,3 +166,62 @@ def test_ws_add_updates_repos_then_runs_sync(tmp_path, monkeypatch):
 
     assert (tmp_path/"repos.txt").read_text() == "AnswerDotAI/existing\nanswerdotai/fastws\n"
     assert calls == [(str(tmp_path), "repos.txt", "pyproject.toml", "pyproject.tmpl")]
+
+
+def test_ws_status_summarizes_unpushed_commits_by_default(tmp_path, monkeypatch, capsys):
+    (tmp_path/"repo1").mkdir()
+
+    class FakeGit:
+        exists = True
+        def __init__(self, d): pass
+        def branch(self, **kwargs): return "main"
+        def status(self, *args): return ""
+        def log(self, *args, **kwargs): return "abc first commit"
+
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(core, "_load_repos", lambda repos_file="repos.txt": ["AnswerDotAI/repo1"])
+    monkeypatch.setattr(core, "Git", FakeGit)
+
+    core.ws_status()
+    out = capsys.readouterr().out
+
+    assert "unpushed commits" in out
+    assert "abc first commit" not in out
+
+
+def test_ws_status_ignores_unpushed_commits_off_main_by_default(tmp_path, monkeypatch, capsys):
+    (tmp_path/"repo1").mkdir()
+
+    class FakeGit:
+        exists = True
+        def __init__(self, d): pass
+        def branch(self, **kwargs): return "feature"
+        def status(self, *args): return ""
+        def log(self, *args, **kwargs): return "abc first commit"
+
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(core, "_load_repos", lambda repos_file="repos.txt": ["AnswerDotAI/repo1"])
+    monkeypatch.setattr(core, "Git", FakeGit)
+
+    core.ws_status()
+
+    assert capsys.readouterr().out == ""
+
+
+def test_ws_status_shows_unpushed_commits_with_branches_flag(tmp_path, monkeypatch, capsys):
+    (tmp_path/"repo1").mkdir()
+
+    class FakeGit:
+        exists = True
+        def __init__(self, d): pass
+        def branch(self, **kwargs): return "feature"
+        def status(self, *args): return ""
+        def log(self, *args, **kwargs): return "abc first commit"
+
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(core, "_load_repos", lambda repos_file="repos.txt": ["AnswerDotAI/repo1"])
+    monkeypatch.setattr(core, "Git", FakeGit)
+
+    core.ws_status(branches=True)
+
+    assert "abc first commit" in capsys.readouterr().out