cflx 0.6.98

Conflux – a spec-driven parallel coding orchestrator that runs AI agents on git worktrees
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

//! Git command execution helpers.
//!
//! This module provides utilities for running Git commands,
//! organized into submodules by responsibility:
//! - `basic`: Basic git operations (run_git, status, branches, etc.)
//! - `commit`: Commit-related operations
//! - `worktree`: Worktree management
//! - `merge`: Merge operations and conflict detection

pub mod basic;
pub mod commit;
pub mod merge;
pub mod worktree;

// Re-export all public functions from submodules for backward compatibility
pub use basic::{
    branch_delete, branch_exists, check_git_repo, checkout, generate_unique_branch_name,
    get_changed_files, get_conflict_files, get_current_branch, get_current_commit, get_status,
    has_uncommitted_changes, is_head_empty_commit, run_git,
};
pub use commit::{
    add_and_commit, create_archive_wip_commit, has_changes_to_commit, list_changes_in_head,
    list_changes_with_uncommitted_files, squash_archive_wip_commits,
};
pub use merge::{
    check_merge_conflicts, first_parent_of, is_ancestor, is_merge_in_progress, merge, merge_branch,
    merge_commit_hash_by_subject_since, missing_merge_commits_since,
    presync_merge_subject_mismatches_since,
};
#[allow(unused_imports)]
pub use worktree::{
    count_commits_ahead, is_worktree, list_worktrees, run_worktree_setup, run_worktree_teardown,
    worktree_add, worktree_remove, worktree_remove_with_options, WorktreeRemoveOptions,
};