Skip to content

Restore a section from the history and tell who last changed a line - #188

Merged
markusressel merged 2 commits into
feature/historyfrom
feature/history-a4
Nov 14, 2026
Merged

markusressel merged 2 commits into
feature/historyfrom
feature/history-a4

Conversation

@markusressel

Copy link
Copy Markdown
Member

A4 of the revision history, on top of backend #101 (blame in server-info covers blame and section restore).

Restore a section

  • In an older entry's diff, a hunk under a heading offers Restore “<heading>”. This matches the web client: the section and its subsections go back to that version, and the rest of the page stays.
  • It is for editors on servers with blame only. The newest entry offers none, and neither does a hunk above the first heading.
  • On 409 section-not-found, the app says whether the section is missing in the version or in the page.

Who last changed a line

  • A tap on the author strip, or on the line numbers while the strip is shown, asks GET /document/{id}/blame/.
  • A sheet shows the author of the block, their agents, the time and a commit message other than the standard one. It also has a way into the history.
  • Lines not committed yet say "Not saved in the history yet".
  • KodeEditor 9.0.0 already has KodeEditorGutterColumn.onTap, so KodeEditor needs no change.

Tests

  • REST models with fixtures from a real backend: blame with a pending agent block, and section-not-found.
  • ViewModel, use case and Robolectric tests.
  • On the emulator against a local backend: the strip tap showed "Bob via Claude Code". The section restore of "Install" changed only that section, and the history showed the new commit.

Draft until #187 is merged to master, so that the device-test build stays unchanged.

🤖 Generated with Claude Code

markusressel and others added 2 commits November 14, 2026 05:17
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>
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>
@markusressel
markusressel marked this pull request as ready for review November 14, 2026 11:01
@markusressel
markusressel merged commit 0de8883 into feature/history Nov 14, 2026
3 checks passed
@markusressel
markusressel deleted the feature/history-a4 branch November 14, 2026 11:01
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