Skip to content

history: what the person did is whatever the host says the person did #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foxnne merged 3 commits into from
Oct 19, 2026
Merged

history: what the person did is whatever the host says the person did #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d13891
history: going back is a step, so an edit after it loses nothing
foxnne Oct 19, 2026
a76c57b
history: what the person did is whatever the host says the person did
foxnne Oct 19, 2026
78508c4
merge main into history/person-is-the-hosts
foxnne Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/commands.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ pub fn targetFile(path: []const u8, call: *sdk.Command.Call) !*File {
return file;
}

/// Commands running now: an edit made with none running is the person's (`History.person`).
/// Pixi's commands running now: the person's activity is told with the answer of the one that acts
/// on a sprite (`bind`, `targetFile`). Whose an edit is, is the host's (`Host.author`).
pub var running: u32 = 0;
/// The person's activity on the sprite the running command acts on, taken by `targetFile` and
/// told with the command's answer (`bind`).
Expand Down
4 changes: 2 additions & 2 deletions src/internal/History.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ pub fn append(self: *History, change: Change) !void {
// fizzy hears of every edit, to show the command that made it.
file.finishReveal();
runtime.state().host.documentEdited(file.id);
if (commands.running == 0) {
if (runtime.state().host.author().kind == .person) {
self.person.edits += 1;
self.person.note(std.meta.activeTag(change));
}
Expand Down Expand Up @@ -512,7 +512,7 @@ pub fn undoRedo(self: *History, file: *pixi.internal.File, action: Action) !void
if (active_stack.items.len == 0) return;
defer runtime.state().host.documentEdited(file.id);
if (action == .undo and !self.keeping) self.went_back_by = runtime.state().host.acted();
if (commands.running == 0 and !self.keeping) {
if (runtime.state().host.author().kind == .person and !self.keeping) {
switch (action) {
.undo => self.person.undone += 1,
.redo => self.person.redone += 1,
Expand Down
Loading