securegit 0.8.5

Zero-trust git replacement with 12 built-in security scanners, LLM redteam bridge, universal undo, durable backups, and a 50-tool MCP server
Documentation 
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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169

use crate::cli::UI;
use crate::ops::oplog;
use crate::ops::utils::short_oid;
use anyhow::{bail, Result};
use std::path::Path;

pub fn execute(
    path: &Path,
    commit_ref: &str,
    abort: bool,
    continue_revert: bool,
    skip: bool,
    no_commit: bool,
    ui: &UI,
) -> Result<()> {
    let desc = if abort {
        "abort revert".to_string()
    } else if continue_revert {
        "continue revert".to_string()
    } else if skip {
        "skip revert".to_string()
    } else {
        format!("revert {}", commit_ref)
    };
    oplog::with_oplog(path, "revert", &desc, || {
        execute_inner(
            path,
            commit_ref,
            abort,
            continue_revert,
            skip,
            no_commit,
            ui,
        )
    })
}

fn execute_inner(
    path: &Path,
    commit_ref: &str,
    abort: bool,
    continue_revert: bool,
    skip: bool,
    no_commit: bool,
    ui: &UI,
) -> Result<()> {
    let repo = crate::ops::open_repo(path)?;

    if abort {
        if repo.state() != git2::RepositoryState::RevertSequence
            && repo.state() != git2::RepositoryState::Revert
        {
            bail!("No revert in progress to abort.");
        }
        repo.cleanup_state()?;
        let head = repo.head()?.peel_to_commit()?;
        repo.reset(head.as_object(), git2::ResetType::Hard, None)?;
        ui.success("Revert aborted");
        return Ok(());
    }

    if skip {
        if repo.state() != git2::RepositoryState::RevertSequence
            && repo.state() != git2::RepositoryState::Revert
        {
            bail!("No revert in progress to skip.");
        }
        let head = repo.head()?.peel_to_commit()?;
        repo.reset(head.as_object(), git2::ResetType::Hard, None)?;
        repo.cleanup_state()?;
        ui.success("Revert skipped");
        return Ok(());
    }

    if continue_revert {
        if repo.state() != git2::RepositoryState::RevertSequence
            && repo.state() != git2::RepositoryState::Revert
        {
            bail!("No revert in progress to continue.");
        }
        let index = repo.index()?;
        if index.has_conflicts() {
            bail!("Conflicts still exist. Resolve them before continuing.");
        }
        let mut index = repo.index()?;
        let tree_oid = index.write_tree()?;
        let tree = repo.find_tree(tree_oid)?;
        let sig = repo.signature().map_err(|_| {
            anyhow::anyhow!(
                "Author identity not configured. Run:\n  \
                 git config user.name \"Your Name\"\n  \
                 git config user.email \"you@example.com\""
            )
        })?;
        let head_commit = repo.head()?.peel_to_commit()?;
        repo.commit(
            Some("HEAD"),
            &sig,
            &sig,
            "revert (continued)",
            &tree,
            &[&head_commit],
        )?;
        repo.cleanup_state()?;
        ui.success("Revert continued and committed");
        return Ok(());
    }

    let obj = repo.revparse_single(commit_ref)?;
    let commit = obj.peel_to_commit()?;

    repo.revert(&commit, None)?;

    let index = repo.index()?;
    if index.has_conflicts() {
        let hash = short_oid(&commit.id());
        let _ = crate::ops::conflicts::record_conflicts(path, &hash, "revert", commit_ref);
        ui.warning(format!("Revert of {} had conflicts", hash));
        ui.info("Resolve conflicts, then run: securegit revert --continue");
        ui.info("Or abort with: securegit revert --abort");
        return Ok(());
    }

    if no_commit {
        repo.cleanup_state()?;
        let hash = short_oid(&commit.id());
        ui.success(format!(
            "Revert of {} applied to index (not committed)",
            hash
        ));
        return Ok(());
    }

    // Auto-commit when clean
    let mut index = repo.index()?;
    let tree_oid = index.write_tree()?;
    let tree = repo.find_tree(tree_oid)?;
    let sig = repo.signature().map_err(|_| {
        anyhow::anyhow!(
            "Author identity not configured. Run:\n  \
             git config user.name \"Your Name\"\n  \
             git config user.email \"you@example.com\""
        )
    })?;
    let head_commit = repo.head()?.peel_to_commit()?;

    let msg = format!(
        "Revert \"{}\"\n\nThis reverts commit {}.",
        commit.summary().unwrap_or(""),
        commit.id()
    );
    match repo.commit(Some("HEAD"), &sig, &sig, &msg, &tree, &[&head_commit]) {
        Ok(_) => {
            repo.cleanup_state()?;
            let hash = short_oid(&commit.id());
            ui.success(format!(
                "Reverted [{}] \"{}\"",
                hash,
                commit.summary().unwrap_or("")
            ));
        }
        Err(e) => {
            let _ = repo.cleanup_state();
            bail!("Revert commit failed: {}", e);
        }
    }

    Ok(())
}