From a720edb7eab4fc19b232fb16fdf534c6de69f5c4 Mon Sep 17 00:00:00 2001 From: Thomas Castiglione Date: Fri, 22 Mar 2024 16:51:59 +0800 Subject: [PATCH] stub the ref-binary ops --- DESIGN.md | 2 +- TODO.md | 2 ++ src/mutators/BinaryMutator.ts | 46 +++++++++++++++++++++++++++---- src/objects/BranchObject.svelte | 6 ++-- src/objects/RevisionObject.svelte | 3 -- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/DESIGN.md b/DESIGN.md index 9787426..e840754 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -74,7 +74,7 @@ Consequently, the commands available for a branch as displayed in the UI have po Multiple-dispatch commands: 1) "Move": Drop local branch onto revision. Sets the ref to a commit, potentially de- or re-syncing it. 2) "Track": Drop remote branch onto local of the same name. -3) "Delete": Drag any branch out, with polymorphic effect (see above). +3) "Delete": Drag almost any branch out, with polymorphic effect (see above). Displaying the branch state is a bit fuzzy. The idea is to convey the most useful bits of information at a glance, and leave the rest to tooltips or context menus. Most branches display in the diff --git a/TODO.md b/TODO.md index 990dc3d..4955dce 100644 --- a/TODO.md +++ b/TODO.md @@ -28,6 +28,8 @@ These changes may or may not be implemented in the future. - rename - delete * feat: create/delete tags? even moving them is implemented in the backend, but may be a bad idea +* feat: backout rev[s] +* feat: obslog stuff - maybe just "show historical versions" in the log? they should be immutable, and we'd want to be able to reinstate one (as a copy) * feat: more settings - log revsets * design: decide whether to remove edit menu and maybe add others diff --git a/src/mutators/BinaryMutator.ts b/src/mutators/BinaryMutator.ts index dd9ee5e..ef13283 100644 --- a/src/mutators/BinaryMutator.ts +++ b/src/mutators/BinaryMutator.ts @@ -9,6 +9,7 @@ import type { ChangeId } from "../messages/ChangeId"; import type { CommitId } from "../messages/CommitId"; import RevisionMutator from "./RevisionMutator"; import ChangeMutator from "./ChangeMutator"; +import BranchMutator from "./RefMutator"; export type RichHint = (string | ChangeId | CommitId)[]; export type Eligibility = { type: "yes", hint: RichHint } | { type: "maybe", hint: string } | { type: "no" }; @@ -37,7 +38,13 @@ export default class BinaryMutator { // can't change our view of remote branches if (from.type == "Ref" && from.ref.type == "RemoteBranch") { - return { type: "maybe", hint: "(branch is remote)" }; + if (from.ref.is_tracked && from.ref.is_absent) { + return { type: "maybe", hint: "(branch is deleted)" }; + } + // we allow deleting of all other branch types, which might be a good enough reason to move them + // else { + // return { type: "maybe", hint: "(branch is remote)" }; + // } } // can change these listed things (XXX add modes?) @@ -103,20 +110,40 @@ export default class BinaryMutator { if (this.#from.header.parent_ids.length == 1) { return { type: "yes", hint: [`Restoring changes at ${this.#from.path.relative_path} from parent `, this.#from.header.parent_ids[0]] }; } else { - return { type: "maybe", hint: "Can't restore: revision has multiple parents." }; + return { type: "maybe", hint: "Can't restore (revision has multiple parents)" }; } } } if (this.#from.type == "Ref" && this.#from.ref.type != "Tag") { - if (this.#to.type == "Revision") { + // local -> rev: set + if (this.#to.type == "Revision" && this.#from.ref.type == "LocalBranch") { if (this.#to.header.id.change.hex == this.#from.header.id.change.hex) { return { type: "no" }; } else { return { type: "yes", hint: [`Moving branch ${this.#from.ref.branch_name} to `, this.#to.header.id.change] }; } - } else if (this.#to.type == "Ref" && this.#to.ref.type != "Tag" && this.#from.ref.branch_name == this.#to.ref.branch_name) { - return { type: "yes", hint: [`Resetting branch ${this.#from.ref.branch_name} to remote`] }; + } + + // remote -> local: track + else if (this.#to.type == "Ref" && this.#to.ref.type == "LocalBranch" && + this.#from.ref.type == "RemoteBranch" && this.#from.ref.branch_name == this.#to.ref.branch_name) { + if (this.#from.ref.is_tracked) { + return { type: "maybe", hint: "(already tracked)" }; + } else { + return { type: "yes", hint: [`Tracking remote branch ${this.#from.ref.branch_name}`] }; + } + } + + // anything -> anywhere: delete + else if (this.#to.type == "Repository") { + if (this.#from.ref.type == "LocalBranch") { + return { type: "yes", hint: [`Deleting branch ${this.#from.ref.branch_name}`] }; + } else { + return { + type: "yes", hint: [`Deleting remote branch ${this.#from.ref.branch_name}@${this.#from.ref.remote_name}`] + }; + } } } @@ -168,9 +195,16 @@ export default class BinaryMutator { } if (this.#from.type == "Ref") { - if (this.#to.type == "Revision" || (this.#to.type == "Ref" && this.#to.ref.type != "Tag")) { + if (this.#to.type == "Revision") { + // point ref to revision mutate("move_ref", { to_id: this.#to.header.id, ref: this.#from.ref }); return; + } else if (this.#to.type == "Ref" && this.#from.ref.type == "RemoteBranch") { + // track remote branch with existing local + new BranchMutator(this.#from.ref).onTrack(); + } else if (this.#to.type == "Repository") { + // various kinds of total or partial deletion + new BranchMutator(this.#from.ref).onDelete(); } } diff --git a/src/objects/BranchObject.svelte b/src/objects/BranchObject.svelte index 1af04cc..778d553 100644 --- a/src/objects/BranchObject.svelte +++ b/src/objects/BranchObject.svelte @@ -68,11 +68,11 @@ } - - + + - {hint ?? label} + {dragHint ?? dropHint ?? label} diff --git a/src/objects/RevisionObject.svelte b/src/objects/RevisionObject.svelte index bda4923..01e30d6 100644 --- a/src/objects/RevisionObject.svelte +++ b/src/objects/RevisionObject.svelte @@ -1,10 +1,7 @@