gitnc 0.1.3__tar.gz → 0.1.5__tar.gz

{gitnc-0.1.3 → gitnc-0.1.5}/CLAUDE.md

@@ -56,7 +56,13 @@ Menu chrome is composed once and stays mounted, so `action_set_theme` / `_load_s
 
 **Text selection colors:** selected text in the commit message box (Shift+arrows in the `TextArea`) is painted from `UITheme.text_selection_background` / `text_selection_foreground`, which `css_variables()` emits as Textual's own `$input-selection-background` / `$input-selection-foreground` — the variables `TextArea` and `Input` already read, so there is no selection CSS in the app. Unlike the chrome fields these are optional: an empty value emits nothing and leaves Textual's derived default (`$primary` lightened, at 40% over the background), because that default is fine in most themes and can't be written as a `$ref` `_resolve_refs()` understands. It is not fine in midnight-commander, where primary and background are both blue and a selection all but vanished; that theme sets `$warning` / `$background`, mcedit's dark-blue-on-cyan marked block. Set the selection through these fields, not through `variables`: `get_theme()` lets a `variables` entry win, so a second copy there would silently override the field.
 
-**Committing:** `action_commit_files()` asks twice, and the two questions are different. The first — only when a target still has unstaged changes — is `Stage N file(s) for commit?`, listing the `git add` commands that would run. The second always comes, after the message dialog: `_confirm_commit()` shows `Commit N file(s)?` over the commands from `GIT.commit_with_selection_commands()`, which is the last point at which the files going into the commit are visible before `commit_with_selection` walks the submodules and commits. The command list comes from that method rather than being rebuilt in `app.py` so the popup and the executor can't drift apart, and the message inside it is cut to `_commit_message_subject()` — its first line, marked with `TRUNCATION_MARKER` when there is more — because the popup renders one command per row and a multi-line `-m` argument would break that. N on it doesn't cancel: `_show_confirm()`'s `on_cancel` reopens the message editor — `CommitDialog`, or the external editor the settings name — on the message just written, so backing out of the confirmation costs nothing. That and the startup submodule question (see *Starting inside a submodule*), whose N still has to start the app, are the only callers of `on_cancel`; every other caller wants the default, which hands focus back to the active view.
+**Warning notification color:** a `notify(..., severity="warning")` toast — today only the up-front branch-prefix warning (see *Committing*) — takes its text and left bar from `UITheme.warning_notification`, emitted as `$warning-notification` and applied by the `Toast.-warning` rules in the app `CSS`. It is a field of its own for the same reason the chrome colors are: Textual paints that bar in `$warning`, which is midnight-commander's cyan menu bar color and doesn't read as a warning there, so that theme sets a red (`#FF5555`) while every other theme keeps the default `$warning`.
+
+**Committing:** `action_commit_files()` asks twice, and the two questions are different. The first — only when a target still has unstaged changes — is `Stage N file(s) for commit?`, listing the `git add` commands that would run. The second always comes, after the message dialog: `_confirm_commit()` shows `Commit N file(s)?` over the commands from `GIT.commit_with_selection_commands()`, which is the last point at which the files going into the commit are visible before `commit_with_selection` walks the submodules and commits. The command list comes from that method rather than being rebuilt in `app.py` so the popup and the executor can't drift apart, and the message inside it is cut to `_commit_message_subject()` — its first line, marked with `TRUNCATION_MARKER` when there is more — because the popup renders one command per row and a multi-line `-m` argument would break that. N on it doesn't cancel: `_show_confirm()`'s `on_cancel` reopens the message editor — `CommitDialog`, or the external editor the settings name — on the message just written, so backing out of the confirmation costs nothing. That, the prefix warning below, which reopens the message the same way, and the startup submodule question (see *Starting inside a submodule*), whose N still has to start the app, are the only callers of `on_cancel`; every other caller wants the default, which hands focus back to the active view.
+
+A message prefixed with a branch the settings warn against gets a question of its own first: `_commit_result()` goes through `_confirm_commit_prefix()`, which — when the message starts with `<name>:` for a name in the `commit_prefix_warn_branches` setting — asks `Warning: commit message is prefixed with branch '…'. Continue?` over the message's subject line, and only on Y moves on to `Commit N file(s)?`. N reopens the message, the same way back the commit confirmation offers. It is a separate dialog rather than a row under the commands because a row only has to be overlooked. The setting is the *Warn on prefix* text row under the branch-prefix checkbox, a space- or comma-separated list read by `_branch_names()`. The check is on the message rather than the checked-out branch, because the prefill is editable and the prefix can have been typed by hand, and it comes after the editor because that is where the message is final whichever editor wrote it. `_begin_commit_message()` raises the same text — both come from `_commit_prefix_warning()` — as a warning notification when the prefill it is about to open already carries a listed prefix, so the user hears about it before writing the message around it.
+
+The row under it, *Warn on prefix not matching* (`commit_prefix_require_pattern`), is the opposite check through the same two places: an optional regular expression the message has to *start with*. `_starts_with_pattern()` is `re.match`, which anchors at the start and stops where the pattern does, so the setting describes the prefix alone — no `^`, no trailing `.*`. `_commit_prefix_warning()` collects both checks into one sentence (`… is prefixed with branch 'x' and does not start with a prefix matching '…'`), so a message that trips both is still asked about once. The pattern is quoted through `_escape_markup()`, because the confirm prompt and the toast both render markup and a character class would be read as a tag. A pattern that doesn't compile is reported as a warning of its own rather than skipped — a check that silently stopped checking looks exactly like a message that passed — and `SettingsDialog._prefix_pattern_hint()` says so under the row while it is being typed. Up front the pattern is only applied to a non-empty prefill: with the branch-prefix setting off nothing has been written yet, and the warning would fire on every commit.
 
 Cancelling the message dialog rolls the index back to where the flow found it. Both halves of the mutation are undone: `_restore_externals()` re-stages the files it unstaged, and `_unstage_pending()` unstages what the stage confirmation added, from the `_pending_commit_staged` list `_begin_commit_message()` was handed. Without the second half the files stayed staged, so a second `C` on the same selection found nothing left to stage and skipped straight past `Stage N file(s) for commit?` — the question never came back. Only entries that had *nothing* staged before go on that list (`not code.has_staged_changes`): an entry that was already partly staged had its index state built by the user, and `git restore --staged` would throw that away instead of putting it back. `_commit_submit()` clears the list without running it — the files it staged are the files it just committed.
 

{gitnc-0.1.3 → gitnc-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gitnc
-Version: 0.1.3
+Version: 0.1.5
 Summary: GitNightCommander — a TUI git log browser built with Textual
 Project-URL: Homepage, https://github.com/thomashyldgaard/GitNightCommander
 Project-URL: Source, https://github.com/thomashyldgaard/GitNightCommander

{gitnc-0.1.3 → gitnc-0.1.5}/README.md

@@ -92,6 +92,7 @@ first use, so no manual venv activation is needed for the commands below.
 
 ```sh
 hatch build              # sdist + wheel into dist/
+hatch run rebuild        # same, removing the old artifacts from dist/ first
 ```
 
 The artifacts land in `dist/` as `gitnc-<version>-py3-none-any.whl` and
@@ -272,6 +273,19 @@ Options -> Settings configures the things it uses:
 - **Use branch name as prefix in commit messages** — prefills the message with
   `<branch>: `, and puts that prefix in front of a drafted message that does not
   already start with the branch name.
+- **Warn on prefix** — branch names, separated by spaces or commas, that should
+  not end up in front of a commit message (e.g. `master main`). A message that
+  starts with `<name>:` is asked about in a confirmation of its own before the
+  `Commit N file(s)?` one: `Y` continues, `N` puts you back in the message to
+  change it. When the branch prefix setting prefills such a name, the same
+  warning also pops up as the message editor opens.
+- **Warn on prefix not matching** — optional; a regular expression the commit
+  message must start with (e.g. `[A-Z]+-\d+:` for a ticket number). It describes
+  the prefix only — it is matched at the start of the message, so no `^` and no
+  trailing `.*` are needed. A message that does not start with a match gets the
+  same confirmation and the same up-front warning as **Warn on prefix**; when
+  both settings object, the one question names both. A pattern that does not
+  compile is flagged in the settings dialog and reported in that question.
 - **Commit message editor** — where the message is written:
   - **Built-in editor** (the default) is the commit dialog described above.
   - **$EDITOR** runs the editor named by the `EDITOR` environment variable;

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/app.py

@@ -10,7 +10,7 @@ import subprocess
 import tempfile
 import textwrap
 import threading
-from collections.abc import Callable, Mapping
+from collections.abc import Callable, Iterable, Mapping
 from contextlib import ExitStack
 from dataclasses import dataclass
 from pathlib import Path
@@ -815,6 +815,41 @@ def _caret_markup(text: str, *, column: int, style: str) -> str:
     return f"{_escape_markup(head)}[{style}]{_escape_markup(cell)}[/{style}]{_escape_markup(tail)}"
 
 
+def _branch_names(text: str) -> list[str]:
+    """The branch names in a settings value that lists several, separated by
+    spaces or commas — neither of which a branch name can contain."""
+    return [name for name in re.split(r"[\s,]+", text) if name]
+
+
+def _warned_commit_prefix(message: str, branches: Iterable[str]) -> str:
+    """Whichever of `branches` the message is prefixed with, or "".
+
+    The message is what is checked, not the branch that is checked out: the
+    prefill is editable, so the prefix can have been removed since — or typed
+    in by hand with the prefix setting off.
+    """
+    return next((branch for branch in branches if message.startswith(f"{branch}:")), "")
+
+
+def _is_valid_pattern(pattern: str) -> bool:
+    """Whether `pattern` compiles as a regular expression."""
+    try:
+        re.compile(pattern)
+    except re.error:
+        return False
+    return True
+
+
+def _starts_with_pattern(message: str, pattern: str) -> bool:
+    """Whether `message` starts with something `pattern` matches.
+
+    `re.match` anchors at the start and stops where the pattern does, so the
+    setting describes the prefix alone — no `^` in front, and no `.*` behind
+    it for the rest of the message.
+    """
+    return re.match(pattern, message) is not None
+
+
 def _setting_str(settings: Mapping[str, object], key: str, default: str) -> str:
     """`settings[key]` when it holds a string, else `default`.
 
@@ -897,6 +932,8 @@ class SettingsValues(NamedTuple):
     parse_suggestions: bool = False
     editor: str = COMMIT_EDITOR_BUILTIN
     editor_command: str = ""
+    prefix_warn_branches: str = ""
+    prefix_require_pattern: str = ""
 
 
 # Rows of the settings dialog, in the order they are drawn. The checkbox rows
@@ -906,14 +943,16 @@ class SettingsValues(NamedTuple):
 # Experimental heading.
 SETTINGS_ROW_BRANCH = 0
 SETTINGS_ROW_PREFIX = 1
-SETTINGS_ROW_EDITOR_BUILTIN = 2
-SETTINGS_ROW_EDITOR_ENVIRONMENT = 3
-SETTINGS_ROW_EDITOR_COMMAND = 4
-SETTINGS_ROW_EDITOR_COMMAND_LINE = 5
-SETTINGS_ROW_COMMAND = 6
-SETTINGS_ROW_PROMPT = 7
-SETTINGS_ROW_PARSE = 8
-SETTINGS_ROW_COUNT = 9
+SETTINGS_ROW_PREFIX_WARN = 2
+SETTINGS_ROW_PREFIX_PATTERN = 3
+SETTINGS_ROW_EDITOR_BUILTIN = 4
+SETTINGS_ROW_EDITOR_ENVIRONMENT = 5
+SETTINGS_ROW_EDITOR_COMMAND = 6
+SETTINGS_ROW_EDITOR_COMMAND_LINE = 7
+SETTINGS_ROW_COMMAND = 8
+SETTINGS_ROW_PROMPT = 9
+SETTINGS_ROW_PARSE = 10
+SETTINGS_ROW_COUNT = 11
 
 # Which editor each radio row selects.
 SETTINGS_EDITOR_ROWS: dict[int, str] = {
@@ -1284,6 +1323,8 @@ class SettingsDialog(ModalScreen["SettingsValues | None"]):
     # rows differ only by their label and the value they carry.
     TEXT_ROWS: ClassVar[dict[int, str]] = {
         SETTINGS_ROW_BRANCH: "_default_branch",
+        SETTINGS_ROW_PREFIX_WARN: "_prefix_warn_branches",
+        SETTINGS_ROW_PREFIX_PATTERN: "_prefix_require_pattern",
         SETTINGS_ROW_EDITOR_COMMAND_LINE: "_editor_command",
         SETTINGS_ROW_COMMAND: "_draft_command",
         SETTINGS_ROW_PROMPT: "_draft_prompt",
@@ -1303,11 +1344,15 @@ class SettingsDialog(ModalScreen["SettingsValues | None"]):
         parse_suggestions: bool = False,
         editor: str = COMMIT_EDITOR_BUILTIN,
         editor_command: str = "",
+        prefix_warn_branches: str = "",
+        prefix_require_pattern: str = "",
     ) -> None:
         super().__init__()
         self._cursor: int = 0
         self._default_branch: str = default_branch
         self._branch_prefix: bool = branch_prefix
+        self._prefix_warn_branches: str = prefix_warn_branches
+        self._prefix_require_pattern: str = prefix_require_pattern
         self._draft_command: str = draft_command
         self._draft_prompt: str = draft_prompt
         self._parse_suggestions: bool = parse_suggestions
@@ -1522,6 +1567,18 @@ class SettingsDialog(ModalScreen["SettingsValues | None"]):
                 "Use branch name as prefix in commit messages",
             )
         )
+        lines.append(self._text_row(SETTINGS_ROW_PREFIX_WARN, "      Warn on prefix: "))
+        lines.append(
+            f"[{theme.dialog_hint}]"
+            "    (branch names, separated by spaces, e.g. master main)"
+            f"[/{theme.dialog_hint}]"
+        )
+        lines.append(
+            self._text_row(SETTINGS_ROW_PREFIX_PATTERN, "      Warn on prefix not matching: ")
+        )
+        lines.append(
+            f"[{theme.dialog_hint}]    ({self._prefix_pattern_hint()})[/{theme.dialog_hint}]"
+        )
         lines.append("")
         lines.append(self._section_header("Commit message editor"))
         lines.append("")
@@ -1568,6 +1625,15 @@ class SettingsDialog(ModalScreen["SettingsValues | None"]):
             # values are already recorded, so there is simply nothing to paint.
             pass
 
+    def _prefix_pattern_hint(self) -> str:
+        """The line under the required-prefix row: what goes in it, or that
+        what is in it won't compile — said here, while it is being typed,
+        rather than first at the next commit."""
+        if not _is_valid_pattern(self._prefix_require_pattern):
+            return "not a valid regular expression"
+        example = _escape_markup(r"[A-Z]+-\d+:")
+        return f"optional regular expression for the start of the message, e.g. {example}"
+
     def _key_hint(self) -> str:
         """The key line under the dialog, which is not the same in a framed
         field: the arrows belong to the caret there, and Tab is what leaves."""
@@ -1600,6 +1666,8 @@ class SettingsDialog(ModalScreen["SettingsValues | None"]):
             parse_suggestions=self._parse_suggestions,
             editor=self._editor,
             editor_command=self._editor_command,
+            prefix_warn_branches=self._prefix_warn_branches,
+            prefix_require_pattern=self._prefix_require_pattern,
         )
 
 
@@ -2641,6 +2709,15 @@ class GitNightCommanderApp(App):
     ]
 
     CSS = """
+    /* Warning notifications take the theme's own color for them instead of
+       $warning, which a theme may have spent on its chrome. */
+    Toast.-warning {
+        border-left: outer $warning-notification;
+        color: $warning-notification;
+    }
+    Toast.-warning .toast--title {
+        color: $warning-notification;
+    }
     Screen {
         layout: horizontal;
         layers: default overlay;
@@ -4014,6 +4091,14 @@ class GitNightCommanderApp(App):
         self._pending_commit_targets = list(targets)
         branch = self._commit_branch_prefix()
         prefill = f"{branch}: " if branch else ""
+        # Only a prefill is checked: with nothing written yet there is no
+        # prefix to judge, and the required pattern would fail every time.
+        warning = self._commit_prefix_warning(prefill) if prefill else ""
+        if warning:
+            # Up front as well as in the question asked after the message:
+            # the prefix is already known here, and this is before the
+            # message has been written around it.
+            self.notify(warning, severity="warning")
         self._edit_commit_message(prefill)
 
     def _edit_commit_message(self, message: str) -> None:
@@ -4287,7 +4372,30 @@ class GitNightCommanderApp(App):
         if message is None:
             self._commit_cancel()
         else:
+            self._confirm_commit_prefix(message)
+
+    def _confirm_commit_prefix(self, message: str) -> None:
+        """Ask about a prefix the settings warn against — a listed branch,
+        or one the required pattern doesn't match — before the commit
+        confirmation rather than as a row inside it.
+
+        A question of its own has to be answered; a row under a list of
+        commands only has to be overlooked. It comes here rather than on the
+        message dialog because this is where the message is final, whichever
+        editor wrote it. Y goes on to the commit confirmation, N reopens the
+        message — the same way back that confirmation offers — and a message
+        without such a prefix goes straight through.
+        """
+        warning = self._commit_prefix_warning(message)
+        if not warning:
             self._confirm_commit(message)
+            return
+        self._show_confirm(
+            f"{warning}. Continue?",
+            [_commit_message_subject(message)],
+            lambda: self._confirm_commit(message),
+            lambda: self._edit_commit_message(message),
+        )
 
     def _confirm_commit(self, message: str) -> None:
         """Show what the commit will run and ask before running it.
@@ -4315,6 +4423,37 @@ class GitNightCommanderApp(App):
             fill_height=True,
         )
 
+    def _commit_prefix_warning(self, message: str) -> str:
+        """The warning for a message whose prefix the settings object to, or
+        "" when they don't: it starts with a branch named in
+        `commit_prefix_warn_branches`, or it doesn't start with what the
+        `commit_prefix_require_pattern` regular expression asks for. Both
+        are reported when both apply.
+
+        One text for the notification the message editor opens with and the
+        question asked once the message is written, so the two can't drift.
+        The pattern is quoted with its brackets escaped, because both of
+        those render markup and a character class would be read as a tag.
+        """
+        settings = self._load_settings()
+        problems: list[str] = []
+        branches = _branch_names(_setting_str(settings, "commit_prefix_warn_branches", ""))
+        branch = _warned_commit_prefix(message, branches)
+        if branch:
+            problems.append(f"is prefixed with branch '{branch}'")
+        pattern = _setting_str(settings, "commit_prefix_require_pattern", "")
+        if pattern.strip():
+            quoted = _escape_markup(pattern)
+            if not _is_valid_pattern(pattern):
+                # Said rather than skipped: a check that silently stopped
+                # checking would look exactly like a message that passed.
+                problems.append(f"can't be checked against invalid pattern '{quoted}'")
+            elif not _starts_with_pattern(message, pattern):
+                problems.append(f"does not start with a prefix matching '{quoted}'")
+        if not problems:
+            return ""
+        return f"Warning: commit message {' and '.join(problems)}"
+
     def _commit_submit(self, message: str) -> None:
         result = self.git.commit_with_selection(self._pending_commit_targets, message)
         self._pending_commit_targets = []
@@ -4575,6 +4714,8 @@ class GitNightCommanderApp(App):
                 parse_suggestions=bool(settings.get("commit_draft_parse_suggestions", False)),
                 editor=_setting_str(settings, "commit_editor", COMMIT_EDITOR_BUILTIN),
                 editor_command=_setting_str(settings, "commit_editor_command", ""),
+                prefix_warn_branches=_setting_str(settings, "commit_prefix_warn_branches", ""),
+                prefix_require_pattern=_setting_str(settings, "commit_prefix_require_pattern", ""),
             ),
             callback=self._settings_result,
         )
@@ -4592,6 +4733,8 @@ class GitNightCommanderApp(App):
         settings["commit_draft_parse_suggestions"] = values.parse_suggestions
         settings["commit_editor"] = values.editor
         settings["commit_editor_command"] = values.editor_command
+        settings["commit_prefix_warn_branches"] = values.prefix_warn_branches
+        settings["commit_prefix_require_pattern"] = values.prefix_require_pattern
         if not self._save_settings(settings):
             self.notify("Settings saved (could not write to disk)")
         else:

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/atom-one-dark.yaml

@@ -89,6 +89,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/atom-one-light.yaml

@@ -89,6 +89,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/catppuccin-frappe.yaml

@@ -97,6 +97,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/catppuccin-latte.yaml

@@ -90,6 +90,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/catppuccin-macchiato.yaml

@@ -97,6 +97,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/catppuccin-mocha.yaml

@@ -97,6 +97,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/dracula.yaml

@@ -90,6 +90,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/flexoki.yaml

@@ -92,6 +92,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/gruvbox.yaml

@@ -91,6 +91,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/midnight-commander.yaml

@@ -93,6 +93,13 @@ menu_bar_foreground: $background
 footer_background: $warning
 footer_foreground: $background
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge. $warning is this theme's cyan — the color of the menu bar,
+# which reads as chrome rather than as a warning — so the toast gets a red
+# of its own.
+warning_notification: '#FF5555'
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/monokai.yaml

@@ -91,6 +91,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/nord.yaml

@@ -95,6 +95,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/rose-pine-dawn.yaml

@@ -96,6 +96,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/rose-pine-moon.yaml

@@ -96,6 +96,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/rose-pine.yaml

@@ -96,6 +96,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/solarized-dark.yaml

@@ -93,6 +93,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/solarized-light.yaml

@@ -93,6 +93,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/textual-ansi.yaml

@@ -99,6 +99,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/textual-dark.yaml

@@ -89,6 +89,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/textual-light.yaml

@@ -90,6 +90,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/themes/tokyo-night.yaml

@@ -90,6 +90,11 @@ menu_bar_foreground: $foreground
 footer_background: $panel
 footer_foreground: $foreground
 
+# Warning notifications (the toast that says a commit message is about to be
+# prefixed with a branch the settings warn against): its text and the bar on
+# its left edge.
+warning_notification: $warning
+
 # CSS variables emitted for the file-list cursor and multi-selection.
 # Values may reference Textual palette variables with `$name` (e.g. `$primary`).
 # References are resolved against this theme's own fields when the CSS is generated.

{gitnc-0.1.3 → gitnc-0.1.5}/gitnc/ui_theme.py

@@ -117,6 +117,13 @@ class UITheme:
     footer_background: str = "$panel"
     footer_foreground: str = "$foreground"
 
+    # CSS-side color of a warning notification: the toast's text and the bar
+    # on its left edge. The default is the palette's own warning role, which
+    # is what Textual paints that bar in anyway; a theme that has spent
+    # $warning on something else (midnight-commander's cyan chrome) names a
+    # color that still reads as a warning.
+    warning_notification: str = "$warning"
+
     # CSS-side palette for the file list cursor + multi-selection.
     cursor_row_background: str = "$primary"
     cursor_row_foreground: str = "$foreground"
@@ -184,6 +191,7 @@ class UITheme:
             "menu-bar-foreground": self._resolve_refs(self.menu_bar_foreground),
             "footer-background": self._resolve_refs(self.footer_background),
             "footer-foreground": self._resolve_refs(self.footer_foreground),
+            "warning-notification": self._resolve_refs(self.warning_notification),
             "cursor-row-background": self._resolve_refs(self.cursor_row_background),
             "cursor-row-foreground": self._resolve_refs(self.cursor_row_foreground),
             "selected-file-background": self._resolve_refs(self.selected_file_background),

{gitnc-0.1.3 → gitnc-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "gitnc"
-version = "0.1.3"
+version = "0.1.5"
 description = "GitNightCommander — a TUI git log browser built with Textual"
 requires-python = ">=3.12"
 dependencies = [
@@ -44,6 +44,7 @@ fmt = [
     "ruff format gitnc tests",
 ]
 start = "python -m gitnc {args}"
+rebuild = "hatch build --clean {args}"
 
 [tool.ruff]
 line-length = 100

{gitnc-0.1.3 → gitnc-0.1.5}/tests/test_app.py

@@ -346,6 +346,8 @@ try:
         SETTINGS_ROW_EDITOR_COMMAND_LINE,
         SETTINGS_ROW_EDITOR_ENVIRONMENT,
         SETTINGS_ROW_PARSE,
+        SETTINGS_ROW_PREFIX_PATTERN,
+        SETTINGS_ROW_PREFIX_WARN,
         SETTINGS_ROW_PROMPT,
         SETTINGS_SECTION_WIDTH,
         SHORTCUT_ALIASES,
@@ -441,6 +443,8 @@ except ModuleNotFoundError as exc:
         SETTINGS_ROW_EDITOR_COMMAND_LINE,
         SETTINGS_ROW_EDITOR_ENVIRONMENT,
         SETTINGS_ROW_PARSE,
+        SETTINGS_ROW_PREFIX_PATTERN,
+        SETTINGS_ROW_PREFIX_WARN,
         SETTINGS_ROW_PROMPT,
         SETTINGS_SECTION_WIDTH,
         SHORTCUT_ALIASES,
@@ -3394,6 +3398,77 @@ class TestSettingsDialog(unittest.TestCase):
         self.assertEqual(dialog.get_values().draft_prompt, "a ")
         self.assertFalse(dialog.get_values().branch_prefix)
 
+    def test_the_warned_prefixes_are_typed_under_the_prefix_checkbox(self):
+        dialog = SettingsDialog(prefix_warn_branches="master")
+        for _ in range(SETTINGS_ROW_PREFIX_WARN):
+            dialog.on_key(_key_event("down"))
+        self.assertEqual(dialog._cursor, SETTINGS_ROW_PREFIX_WARN)
+
+        for key, character in (("space", None), ("m", "m")):
+            dialog.on_key(_key_event(key, character=character))
+
+        self.assertEqual(dialog.get_values().prefix_warn_branches, "master m")
+        self.assertFalse(dialog.get_values().branch_prefix)
+
+    def test_the_warned_prefixes_round_trip_through_the_settings_file(self):
+        app = _mock_app()
+        with patch.object(
+            app, "_load_settings", return_value={"commit_prefix_warn_branches": "master main"}
+        ):
+            app.action_settings()
+        values = _pushed_screen(app).get_values()
+        self.assertEqual(values.prefix_warn_branches, "master main")
+
+        saved: dict[str, object] = {}
+        with (
+            patch.object(app, "_load_settings", return_value={}),
+            patch.object(app, "_save_settings", side_effect=lambda s: saved.update(s) or True),
+        ):
+            app._settings_result(values)
+
+        self.assertEqual(saved["commit_prefix_warn_branches"], "master main")
+
+    def test_the_required_prefix_pattern_is_typed_under_the_warned_prefixes(self):
+        dialog = SettingsDialog(prefix_require_pattern="[A-Z]+")
+        for _ in range(SETTINGS_ROW_PREFIX_PATTERN):
+            dialog.on_key(_key_event("down"))
+        self.assertEqual(dialog._cursor, SETTINGS_ROW_PREFIX_PATTERN)
+        self.assertEqual(SETTINGS_ROW_PREFIX_PATTERN, SETTINGS_ROW_PREFIX_WARN + 1)
+
+        for key, character in (("minus", "-"), ("1", "1")):
+            dialog.on_key(_key_event(key, character=character))
+
+        self.assertEqual(dialog.get_values().prefix_require_pattern, "[A-Z]+-1")
+        self.assertEqual(dialog.get_values().prefix_warn_branches, "")
+
+    def test_the_required_prefix_pattern_hint_says_when_it_does_not_compile(self):
+        self.assertIn("optional", SettingsDialog()._prefix_pattern_hint())
+        self.assertIn(
+            "optional", SettingsDialog(prefix_require_pattern="[A-Z]+:")._prefix_pattern_hint()
+        )
+        self.assertEqual(
+            SettingsDialog(prefix_require_pattern="[A-Z")._prefix_pattern_hint(),
+            "not a valid regular expression",
+        )
+
+    def test_the_required_prefix_pattern_round_trips_through_the_settings_file(self):
+        app = _mock_app()
+        with patch.object(
+            app, "_load_settings", return_value={"commit_prefix_require_pattern": r"[A-Z]+-\d+:"}
+        ):
+            app.action_settings()
+        values = _pushed_screen(app).get_values()
+        self.assertEqual(values.prefix_require_pattern, r"[A-Z]+-\d+:")
+
+        saved: dict[str, object] = {}
+        with (
+            patch.object(app, "_load_settings", return_value={}),
+            patch.object(app, "_save_settings", side_effect=lambda s: saved.update(s) or True),
+        ):
+            app._settings_result(values)
+
+        self.assertEqual(saved["commit_prefix_require_pattern"], r"[A-Z]+-\d+:")
+
     def test_cursor_wraps_over_every_row(self):
         dialog = SettingsDialog()
 
@@ -4681,6 +4756,7 @@ class TestUIThemeCssVariables(unittest.TestCase):
         "menu-bar-foreground",
         "footer-background",
         "footer-foreground",
+        "warning-notification",
         "cursor-row-background",
         "cursor-row-foreground",
         "selected-file-background",
@@ -4722,6 +4798,28 @@ class TestUIThemeCssVariables(unittest.TestCase):
             self.assertNotIn("$", variables[field_name])
 
 
+class TestWarningNotificationThemeColor(unittest.TestCase):
+    """A warning toast is painted from the theme's `warning_notification`
+    field rather than from `$warning`, which a theme may use for chrome."""
+
+    def test_the_default_is_the_palette_warning_role(self):
+        from gitnc.ui_theme import UITheme
+
+        theme = UITheme(name="plain", primary="#123456", warning="#abcdef")
+
+        self.assertEqual(theme.css_variables()["warning-notification"], "#abcdef")
+
+    def test_midnight_commander_warns_in_red_not_in_its_chrome_cyan(self):
+        css_vars = MIDNIGHT_COMMANDER_THEME.css_variables()
+
+        self.assertEqual(css_vars["warning-notification"], "#FF5555")
+        self.assertNotEqual(css_vars["warning-notification"], MIDNIGHT_COMMANDER_THEME.warning)
+
+    def test_the_app_css_paints_warning_toasts_from_the_variable(self):
+        self.assertIn("border-left: outer $warning-notification;", GitNightCommanderApp.CSS)
+        self.assertIn("color: $warning-notification;", GitNightCommanderApp.CSS)
+
+
 class TestTextSelectionThemeColors(unittest.TestCase):
     """Selected text in the commit message box takes its colors from the
     theme's text selection fields, emitted as Textual's own
@@ -5195,6 +5293,210 @@ class TestCommitFlow(unittest.TestCase):
         self.assertTrue(dialogs.pushed[-1].fill_height)
         app.git.commit.assert_not_called()
 
+    def _warned_app(self):
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        app, dialogs, _ = self._app([entry], staged={"pkg/a.py"})
+        app._load_settings = MagicMock(return_value={"commit_prefix_warn_branches": "main, master"})
+        app.action_commit_files()
+        return app, dialogs
+
+    def test_a_warned_prefix_is_asked_about_before_the_commit_confirmation(self):
+        app, dialogs = self._warned_app()
+
+        dialogs._resolve("master: fix x")
+
+        self.assertEqual(
+            dialogs.prompt(),
+            "Warning: commit message is prefixed with branch 'master'. Continue?",
+        )
+        self.assertEqual(dialogs.commands(), ["master: fix x"])
+        app.git.commit.assert_not_called()
+
+    def test_accepting_the_prefix_warning_goes_on_to_the_commit_confirmation(self):
+        app, dialogs = self._warned_app()
+        dialogs._resolve("master: fix x")
+
+        dialogs.confirm()
+
+        self.assertEqual(dialogs.prompt(), "Commit 1 file(s)?")
+        self.assertEqual(dialogs.commands(), ["git commit -m master: fix x"])
+        app.git.commit.assert_not_called()
+
+    def test_declining_the_prefix_warning_reopens_the_message(self):
+        app, dialogs = self._warned_app()
+        dialogs._resolve("master: fix x")
+
+        dialogs.cancel()
+
+        reopened = dialogs.pushed[-1]
+        self.assertIsInstance(reopened, CommitDialog)
+        self.assertEqual(reopened.prefill, "master: fix x")
+        app.git.commit.assert_not_called()
+
+    def test_a_warned_prefix_is_announced_when_the_message_editor_opens(self):
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        app, dialogs, _ = self._app([entry], staged={"pkg/a.py"}, branch="master")
+        app._load_settings = MagicMock(
+            return_value={
+                "branch_prefix_in_commits": True,
+                "commit_prefix_warn_branches": "master",
+            }
+        )
+
+        with patch.object(app, "notify") as notify:
+            app.action_commit_files()
+
+        self.assertEqual(self._commit_screen(dialogs).prefill, "master: ")
+        notify.assert_called_once_with(
+            "Warning: commit message is prefixed with branch 'master'", severity="warning"
+        )
+
+    def test_an_unlisted_prefix_opens_the_message_editor_quietly(self):
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        app, dialogs, _ = self._app([entry], staged={"pkg/a.py"}, branch="feature")
+        app._load_settings = MagicMock(
+            return_value={
+                "branch_prefix_in_commits": True,
+                "commit_prefix_warn_branches": "master",
+            }
+        )
+
+        with patch.object(app, "notify") as notify:
+            app.action_commit_files()
+
+        self.assertEqual(self._commit_screen(dialogs).prefill, "feature: ")
+        notify.assert_not_called()
+
+    def _pattern_app(self, pattern: str, **settings: Any):
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        app, dialogs, _ = self._app([entry], staged={"pkg/a.py"})
+        app._load_settings = MagicMock(
+            return_value={"commit_prefix_require_pattern": pattern, **settings}
+        )
+        app.action_commit_files()
+        return app, dialogs
+
+    def test_a_message_missing_the_required_prefix_is_asked_about(self):
+        app, dialogs = self._pattern_app(r"[A-Z]+-\d+:")
+
+        dialogs._resolve("fix x")
+
+        self.assertEqual(
+            dialogs.prompt(),
+            "Warning: commit message does not start with a prefix matching"
+            r" '\[A-Z]+-\d+:'. Continue?",
+        )
+        self.assertEqual(dialogs.commands(), ["fix x"])
+        app.git.commit.assert_not_called()
+
+    def test_declining_the_required_prefix_warning_reopens_the_message(self):
+        _, dialogs = self._pattern_app(r"\w+-\d+:")
+        dialogs._resolve("fix x")
+
+        dialogs.cancel()
+
+        reopened = dialogs.pushed[-1]
+        self.assertIsInstance(reopened, CommitDialog)
+        self.assertEqual(reopened.prefill, "fix x")
+
+    def test_the_required_pattern_covers_only_the_start_of_the_message(self):
+        """No `.*` needed for the rest of the message, and a match further
+        in doesn't count as a prefix."""
+        for message, accepted in (
+            ("ABC-12: fix x\n\nbody", True),
+            ("ABC-12:", True),
+            ("fix ABC-12: x", False),
+            ("\nABC-12: x", False),
+        ):
+            with self.subTest(message=message):
+                _, dialogs = self._pattern_app(r"[A-Z]+-\d+:")
+
+                dialogs._resolve(message)
+
+                self.assertEqual(dialogs.prompt() == "Commit 1 file(s)?", accepted)
+
+    def test_a_blank_required_pattern_checks_nothing(self):
+        _, dialogs = self._pattern_app("  ")
+
+        dialogs._resolve("fix x")
+
+        self.assertEqual(dialogs.prompt(), "Commit 1 file(s)?")
+
+    def test_an_invalid_required_pattern_is_reported_instead_of_skipped(self):
+        _, dialogs = self._pattern_app("[A-Z")
+
+        dialogs._resolve("fix x")
+
+        self.assertEqual(
+            dialogs.prompt(),
+            r"Warning: commit message can't be checked against invalid pattern '\[A-Z'."
+            " Continue?",
+        )
+
+    def test_a_warned_branch_and_a_missing_prefix_are_reported_together(self):
+        _, dialogs = self._pattern_app(r"\d+:", commit_prefix_warn_branches="master")
+
+        dialogs._resolve("master: fix x")
+
+        self.assertEqual(
+            dialogs.prompt(),
+            "Warning: commit message is prefixed with branch 'master'"
+            r" and does not start with a prefix matching '\d+:'. Continue?",
+        )
+
+    def test_a_prefill_missing_the_required_prefix_is_announced_up_front(self):
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        for branch, warned in (("feature", True), ("ABC-12", False)):
+            with self.subTest(branch=branch):
+                app, _, _ = self._app([entry], staged={"pkg/a.py"}, branch=branch)
+                app._load_settings = MagicMock(
+                    return_value={
+                        "branch_prefix_in_commits": True,
+                        "commit_prefix_require_pattern": r"[A-Z]+-\d+:",
+                    }
+                )
+
+                with patch.object(app, "notify") as notify:
+                    app.action_commit_files()
+
+                if warned:
+                    notify.assert_called_once_with(
+                        "Warning: commit message does not start with a prefix matching"
+                        r" '\[A-Z]+-\d+:'",
+                        severity="warning",
+                    )
+                else:
+                    notify.assert_not_called()
+
+    def test_an_empty_prefill_is_not_checked_against_the_required_pattern(self):
+        """Nothing has been written yet, so there is no prefix to judge."""
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        app, dialogs, _ = self._app([entry], staged={"pkg/a.py"})
+        app._load_settings = MagicMock(return_value={"commit_prefix_require_pattern": r"\d+:"})
+
+        with patch.object(app, "notify") as notify:
+            app.action_commit_files()
+
+        self.assertEqual(self._commit_screen(dialogs).prefill, "")
+        notify.assert_not_called()
+
+    def test_other_prefixes_go_straight_to_the_commit_confirmation(self):
+        """Only a whole listed name followed by the colon counts — not a
+        branch that merely starts with one, and not the name mid-message."""
+        entry = GitEntry(GitCode.MODIFIED_UNMODIFIED, "pkg/a.py")
+        for message in ("master-fix: x", "feature: merge master: x", "masterful change"):
+            with self.subTest(message=message):
+                app, dialogs, _ = self._app([entry], staged={"pkg/a.py"})
+                app._load_settings = MagicMock(
+                    return_value={"commit_prefix_warn_branches": "master"}
+                )
+                app.action_commit_files()
+
+                dialogs._resolve(message)
+
+                self.assertEqual(dialogs.prompt(), "Commit 1 file(s)?")
+                self.assertEqual(dialogs.commands(), [f"git commit -m {message}"])
+
     def test_the_confirmation_shows_only_the_subject_of_a_long_message(self):
         """The popup renders one command per row, so a multi-line `-m` has to
         be cut down to its first line — marked as cut."""