nbdevAuto 0.3.75__tar.gz → 0.3.76__tar.gz

{nbdevauto-0.3.75/nbdevAuto.egg-info → nbdevauto-0.3.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdevAuto
-Version: 0.3.75
+Version: 0.3.76
 Summary: automating nbdev
 Author-email: Benedict Thekkel <bthekkel1@gmail.com>
 License-Expression: Apache-2.0

nbdevauto-0.3.76/nbdevAuto/__init__.py

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

{nbdevauto-0.3.75 → nbdevauto-0.3.76}/nbdevAuto/fleet.py

@@ -354,13 +354,20 @@ def init_new(root=None, dry_run=False):
     return new
 
 def pull_root(base):
-    "Fast-forward the superproject itself, with the advice its usual failure needs"
+    "Fast-forward the superproject itself, with the advice its failure actually needs"
     try: return _run("git", "-C", str(base), "pull", "--ff-only").strip().splitlines()[-1:]
     except StepFailed as e:
-        raise StepFailed(e.cmd, e.code, f"{e.output}\n"
-            "If it complains about submodule paths, the recorded gitlinks drifted.\n"
-            "Discard them (the update step re-advances them anyway):\n"
-            "  git checkout -- $(git diff --name-only)") from None
+        # Two failures, two fixes. Discarding gitlinks does nothing for a diverged branch,
+        # and a rebase does nothing for drifted gitlinks.
+        if "Not possible to fast-forward" in e.output:
+            hint = ("Local main and origin/main both have new commits.\n"
+                    "Replay yours on top of the remote, then re-run:\n"
+                    "  git pull --rebase && just sync")
+        else:
+            hint = ("If it complains about submodule paths, the recorded gitlinks drifted.\n"
+                    "Discard them (the update step re-advances them anyway):\n"
+                    "  git checkout -- $(git diff --name-only)")
+        raise StepFailed(e.cmd, e.code, f"{e.output}\n{hint}") from None
 
 # %% ../nbs/04_Fleet.ipynb #8fb7bc91-d79a-4c1a-bb81-e28b3a77b118
 def fleet_update(
@@ -608,7 +615,12 @@ def fleet():
     if not picked:
         print(usage())
         sys.exit(0 if sys.argv[1:2] in ([], ["-h"], ["--help"]) else 2)
-    return run_verb(*picked)
+    # `_step` has already printed the failing command's output, so a traceback on top of
+    # it only buries the hint. One line and the exit code are all that is left to say.
+    try: return run_verb(*picked)
+    except StepFailed as e:
+        console.print(f"[bold red]FAILED[/bold red] [dim]{escape(str(e))}[/dim]")
+        sys.exit(1)
 
 # %% ../nbs/04_Fleet.ipynb #7adb89c6-6788-4241-acff-53cb4566b5ce
 if __name__ == "__main__": fleet()

{nbdevauto-0.3.75 → nbdevauto-0.3.76/nbdevAuto.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbdevAuto
-Version: 0.3.75
+Version: 0.3.76
 Summary: automating nbdev
 Author-email: Benedict Thekkel <bthekkel1@gmail.com>
 License-Expression: Apache-2.0

nbdevauto-0.3.75/nbdevAuto/__init__.py

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