Skip to content

Undo a single change from the history - #186

Merged
markusressel merged 1 commit into
feature/historyfrom
history-revert
Nov 14, 2026
Merged

markusressel merged 1 commit into
feature/historyfrom
history-revert

Conversation

@markusressel

Copy link
Copy Markdown
Member

A3 of the shared history concept, plus feature flags. It needs MkDocsEditor-Backend#99 (revert), #98 (feature flags) and #100, and goes into feature/history.

  • Undo: editors on a server with revert get "Undo this change" on every entry except the first version, which the backend refuses (400). The confirm dialog names the people and agents and the time; the entry's diff is open above it.
    • 200: "Change undone", and the list reloads with the new "Revert …" entry.
    • 409 revert-conflict: "Can't undo: later changes in Setup are in the way." (the headings come from details.headings).
    • 409 nothing-to-revert: "This change is not in the page anymore."
  • Feature flags: a new ServerFeatures cache reads features from server-info per server; QrCodesSupport now uses it too.
    • The "History" menu entry needs history.
    • The changes since the last visit need changes, so an older server is never asked.
    • Undo needs revert.
    • So feature/history is safe on a backend without them.
  • Entries from the last minute read "just now".

Tests: models from real revert answers (200, both 409s), the ViewModel (undo, conflict, gone), UI (undo button, none on the first version), the history menu entry only with the feature, and no change requests without changes.

Emulator test against a local backend from master (b7dd3ae): undo with a conflict shows the toast, and a clean undo creates "Revert 5a5db06809d8 on guide/setup.md" and changes the file.

🤖 Generated with Claude Code

Editors on a server with revert get "Undo this change" on every entry but
the first version. Later changes stay; a conflict names the sections where
they are in the way. The history menu entry and the changes since the last
visit only show on servers that have them, read from server-info features.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@markusressel
markusressel merged commit cf4c909 into feature/history Nov 14, 2026
3 checks passed
@markusressel
markusressel deleted the history-revert branch November 14, 2026 03:48
markusressel added a commit that referenced this pull request Nov 14, 2026
…changed a line (#187)

* Add a REST client for the revision history (#183)

Models follow a real backend answer: authors who are not accounts come
with empty strings, and times carry the committer's offset.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

* Show the revision history of a page (#184)

The editor menu opens the history: who changed the page and when, with
agents and the changed headings. An entry opens to the inline diff of its
commit with the changed words marked, a hunk opens the editor there, and
editors can restore an older version.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

* Tell what changed in a page since the last visit (#185)

* Tell what changed in a page since the last visit

On opening a page, a banner names who changed it since the account last
looked and where; it opens the changes hunk by hunk, and a hunk goes to its
place in the page. The server keeps the seen mark, set with the token of
the shown answer and again on leaving, so the own edits are no news later.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Fix what the emulator test against a real backend found

- The changes since the last visit were asked for inside a state update,
  which runs again when the state changed meanwhile: each run marked the
  page seen, so the shown answer was always empty. Leaving the page no
  longer marks it on ON_STOP either, which the screen gets while opening.
- The account itself is left out of the names of the banner.
- In the history an agent goes with its own person: "Bob via Claude Code,
  Anna" instead of "Bob, Anna via Claude Code".
- Lines with little in common get no word marks.
- A commit time a little ahead of the device clock reads as now.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

* Undo a single change from the history (#186)

Editors on a server with revert get "Undo this change" on every entry but
the first version. Later changes stay; a conflict names the sections where
they are in the way. The history menu entry and the changes since the last
visit only show on servers that have them, read from server-info features.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

* Restore a section from the history and tell who last changed a line (#188)

* Restore a single section from the history

A hunk under a heading of an older version offers to restore that section,
on servers with blame (which covers section restore), like the web client.
A section missing in the version or in the page is said in words. Adds the
REST client for blame as well.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Tell who last changed a line and when

A tap on the author strip, or on the line numbers next to it, asks the
server's blame and shows the author of the lines around it, their agents,
the time and the message of the change, with a way into the history.
Lines not committed yet say so instead of a time.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant