Struct WorktreeVersionedKvStore

pub struct WorktreeVersionedKvStore<const N: usize> { /* private fields */ }

A VersionedKvStore that works within a worktree

Implementations

impl<const N: usize> WorktreeVersionedKvStore<N>

pub fn from_worktree( worktree_info: WorktreeInfo, manager: Arc<Mutex<WorktreeManager>>, ) -> Result<Self, GitKvError>

Create a new WorktreeVersionedKvStore from an existing worktree

pub fn worktree_id(&self) -> &str

Get the worktree ID

pub fn current_branch(&self) -> &str

Get the current branch

pub fn is_locked(&self) -> bool

Check if this worktree is locked

pub fn lock(&self, reason: &str) -> Result<(), GitKvError>

Lock this worktree

pub fn unlock(&self) -> Result<(), GitKvError>

Unlock this worktree

pub fn store(&self) -> &GitVersionedKvStore<N>

Get a reference to the underlying store

pub fn store_mut(&mut self) -> &mut GitVersionedKvStore<N>

Get a mutable reference to the underlying store

pub fn merge_to_main( &mut self, main_store: &mut GitVersionedKvStore<N>, commit_message: &str, ) -> Result<String, GitKvError>

Merge this worktree’s branch back to the main branch This is a convenience method that requires a target store representing the main repository

pub fn merge_to_branch( &mut self, target_store: &mut GitVersionedKvStore<N>, target_branch: &str, commit_message: &str, ) -> Result<String, GitKvError>

Merge this worktree’s branch to another target branch

pub fn merge_to_branch_with_resolver<R: ConflictResolver>( &mut self, target_store: &mut GitVersionedKvStore<N>, target_branch: &str, resolver: &R, commit_message: &str, ) -> Result<String, GitKvError>

Merge this worktree’s branch with custom conflict resolution

pub fn try_merge_to_main( &mut self, main_store: &mut GitVersionedKvStore<N>, ) -> Result<Vec<MergeConflict>, GitKvError>

Try to merge to main with conflict detection (doesn’t apply changes if conflicts exist)