Address CodeRabbit's latest review round

- _stage_one: KeyboardInterrupt derives from BaseException, so the prior
  `except Exception` skipped restoration on Ctrl-C during staging. Switch
  to try/finally with a staged_ok flag so restoration always runs on any
  failure, including Ctrl-C.
- Fix a misplaced quote in the "no patch file" warning so the project name
  lands inside the quoted `dfetch diff` command, matching update_patch.py.
- Catch OSError alongside RuntimeError when stepping the interactive TUI
  (single- and multi-project) so a patch file that goes missing mid-review
  doesn't leave the terminal stuck in raw mode.
- interactive_helper.py: reject trailing tokens after REPEAT instead of
  silently ignoring them; terminate the driven dfetch process if _drive
  raises instead of leaking it.
- Demo scripts: resolve demo-magic.sh and workspace paths from the
  script's own directory (BASH_SOURCE) instead of the caller's cwd; use a
  unique mktemp workspace instead of a fixed directory name so a
  pre-existing directory of that name can't collide with the cleanup
  trap's rm -rf; preserve the replay command's exit status through
  cleanup.
- Remove an unnecessary inline pylint suppression in svn_steps.py (other
  step files import `then` from behave without it).
- Clarify that replay-patches stages "eligible selected projects" (skips
  ones with no patches or local changes), not unconditionally all of them.

Verified: all 724 unit tests, the git and SVN replay-patches BDD
scenarios, and both demo scripts end-to-end (exit 0, no leftover
directories) still pass; ruff/pylint/mypy/pydocstyle/bandit clean.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01A7miizBGMoLEXXZxuq6XUJ

Author: claude

dfetch/commands/replay_patches.py

@@ -265,8 +265,8 @@ def _can_review_project(
     if not subproject.patch:
         logger.print_warning_line(
             project_name,
-            'skipped - there is no patch file, use "dfetch diff"'
-            f" {project_name} to create one",
+            f'skipped - there is no patch file, use "dfetch diff {project_name}"'
+            " to create one",
         )
         return False
     if not subproject.on_disk_version():
@@ -361,6 +361,7 @@ def _stage_one(
     def _ignored() -> list[str]:
         return list(superproject.ignored_files(project.destination))
 
+    staged_ok = False
     try:
         subproject.update(
             force=True,
@@ -370,14 +371,15 @@ def _ignored() -> list[str]:
         )
         if git_super is not None:
             git_super.add_path(subproject.local_path)
-    except Exception:
-        try:
-            _restore_project(
-                superproject, git_super, subproject, project.name, False, _ignored
-            )
-        finally:
-            Path(subproject.metadata_path).write_bytes(saved_metadata)
-        raise
+        staged_ok = True
+    finally:
+        if not staged_ok:
+            try:
+                _restore_project(
+                    superproject, git_super, subproject, project.name, False, _ignored
+                )
+            finally:
+                Path(subproject.metadata_path).write_bytes(saved_metadata)
     state = _ProjectState(
         name=project.name,
         local_path=subproject.local_path,
@@ -540,7 +542,7 @@ def _step_tui(patches: list[str], local_path: str, project_name: str) -> None:
             raise
         try:
             current, done = _apply_step(key, current, total, patches, local_path)
-        except RuntimeError:
+        except (RuntimeError, OSError):
             screen.clear()
             raise
         if done:
@@ -606,7 +608,7 @@ def _step_tui_multi(states: list[_ProjectState]) -> None:
             raise
         try:
             focused, done = _handle_tui_multi_key(key, focused, states)
-        except RuntimeError:
+        except (RuntimeError, OSError):
             screen.clear()
             raise
         if done:

doc/generate-casts/interactive_helper.py

@@ -116,7 +116,9 @@ def _parse_line(tokens: list[str], lineno: int) -> list[Keystroke]:
         if pos < len(tokens):
             if tokens[pos] != "REPEAT":
                 raise ValueError("expected REPEAT")
-            repeat = int(tokens[pos + 1])
+            repeat, pos = int(tokens[pos + 1]), pos + 2
+        if pos != len(tokens):
+            raise ValueError("unexpected trailing tokens")
     except (IndexError, ValueError) as exc:
         raise ValueError(f"line {lineno}: malformed keystroke: {tokens!r}") from exc
 
@@ -216,7 +218,11 @@ def _drive(child: pexpect.spawn, keystrokes: list[Keystroke]) -> None:
     )
     dfetch_child.logfile_read = sys.stdout
 
-    _drive(dfetch_child, keystrokes)
-    dfetch_child.expect(pexpect.EOF)
+    try:
+        _drive(dfetch_child, keystrokes)
+        dfetch_child.expect(pexpect.EOF)
+    finally:
+        if dfetch_child.isalive():
+            dfetch_child.terminate(force=True)
     dfetch_child.close()
     sys.exit(dfetch_child.exitstatus or 0)

doc/generate-casts/replay-patches-demo.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
-source ./demo-magic/demo-magic.sh
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$DIR/demo-magic/demo-magic.sh"
 
 PROMPT_TIMEOUT=1
 
-# Copy example manifest
-mkdir review-patch
-pushd review-patch || exit 1
+WORKDIR="$(mktemp -d "$DIR/review-patch.XXXXXX")"
+trap 'popd 2>/dev/null; rm -rf "$WORKDIR"' EXIT
+pushd "$WORKDIR" || { echo 'pushd failed' >&2; exit 1; }
 
 git init
-cp -r ../update/* .
+cp -r "$DIR/update"/* .
 git add .
 git commit -m "Initial commit"
 
@@ -47,11 +48,11 @@ pe "cat patches/cpputest.patch"
 # the scenes so recording doesn't block on "Press Enter to restore..."
 p "dfetch replay-patches cpputest"
 echo '' | dfetch replay-patches cpputest
+status=$?
 
 PROMPT_TIMEOUT=3
 wait
 
 pei ""
 
-popd || exit 1
-rm -rf review-patch
+exit "$status"

doc/generate-casts/replay-patches-multi-demo.sh

@@ -10,12 +10,12 @@ source "$DIR/demo-magic/demo-magic.sh"
 
 PROMPT_TIMEOUT=1
 
-mkdir replay-patches-multi
-trap 'popd 2>/dev/null; rm -rf replay-patches-multi' EXIT
-pushd replay-patches-multi || { echo 'pushd failed' >&2; exit 1; }
+WORKDIR="$(mktemp -d "$DIR/replay-patches-multi.XXXXXX")"
+trap 'popd 2>/dev/null; rm -rf "$WORKDIR"' EXIT
+pushd "$WORKDIR" || { echo 'pushd failed' >&2; exit 1; }
 
 git init
-cp -r ../update/* .
+cp -r "$DIR/update"/* .
 git add .
 git commit -m "Initial commit"
 
@@ -69,12 +69,12 @@ KEYSTROKES
 )
 
 p "dfetch replay-patches --interactive cpputest jsmn"
-echo "$KEYSTROKES" | python3 ../interactive_helper.py replay-patches --interactive cpputest jsmn
+echo "$KEYSTROKES" | python3 "$DIR/interactive_helper.py" replay-patches --interactive cpputest jsmn
+status=$?
 
 PROMPT_TIMEOUT=3
 wait
 
 pei ""
 
-popd || { echo 'popd failed' >&2; exit 1; }
-rm -rf replay-patches-multi
+exit "$status"

doc/howto/patching.rst

@@ -319,9 +319,10 @@ un-applied:
 **Replaying multiple projects at once**
 
 When you call ``replay-patches`` with two or more project names (or with no
-names to select all), *dfetch* stages all of them together and presents a single
-pause.  You can limit the patches applied to a specific project with the
-``name:N`` shorthand:
+names to select all), *dfetch* stages all eligible selected projects together
+and presents a single pause.  Projects that have no patches or can't be safely
+replayed are skipped with a warning.  You can limit the patches applied to a
+specific project with the ``name:N`` shorthand:
 
 .. code-block:: console
 

features/replay-patches-in-git.feature

@@ -82,7 +82,7 @@ Feature: Replay patches in git
             """
             Dfetch (0.14.0)
               SomeProject:
-              > skipped - there is no patch file, use "dfetch diff" SomeProject to create one
+              > skipped - there is no patch file, use "dfetch diff SomeProject" to create one
             """
 
     Scenario: A warning is shown when the project has uncommitted local changes

features/steps/svn_steps.py

@@ -7,7 +7,7 @@
 import pathlib
 import subprocess
 
-from behave import given, then  # pylint: disable=no-name-in-module
+from behave import given, then
 
 from dfetch.util.util import in_directory
 from features.steps.generic_steps import call_command, extend_file, generate_file