diffler_core/vcs.rs
1//! Backend-agnostic VCS interface. Everything above this trait consumes
2//! `dyn Vcs`; only the `git` and `repo` modules (and test fixtures) may
3//! import git2.
4
5use std::path::{Path, PathBuf};
6
7use thiserror::Error;
8
9use crate::model::{DiffModel, HunkId};
10
11#[derive(Debug, Error)]
12pub enum VcsError {
13 // acceptable for M1; rework when a second backend lands
14 #[error(transparent)]
15 Git(#[from] git2::Error),
16 #[error("repository has no working directory")]
17 NoWorkdir,
18 /// Domain refusal, e.g. discarding a file with staged changes.
19 #[error("{0}")]
20 Rejected(String),
21 #[error(transparent)]
22 Io(#[from] std::io::Error),
23}
24
25#[derive(Debug, Clone, PartialEq, Eq)]
26pub struct HeadInfo {
27 /// Branch shorthand; `None` when HEAD is detached.
28 pub branch: Option<String>,
29 /// Abbreviated commit id; empty on an unborn branch.
30 pub oid7: String,
31 /// First line of the HEAD commit message; empty on an unborn branch.
32 pub subject: String,
33 /// Upstream branch shorthand, if configured.
34 pub upstream: Option<String>,
35 /// Commits on HEAD the upstream lacks, so work that exists only here is
36 /// visible without running `git status`. Zero without an upstream.
37 pub ahead: usize,
38 /// Commits on the upstream that HEAD lacks.
39 pub behind: usize,
40}
41
42#[derive(Debug, Clone, PartialEq, Eq)]
43pub struct LogEntry {
44 pub oid: String,
45 pub oid7: String,
46 /// Shorthand names of references pointing at this commit.
47 pub refs: Vec<String>,
48 pub subject: String,
49 pub author: String,
50 pub time_unix: i64,
51}
52
53#[derive(Debug, Clone, PartialEq, Eq)]
54pub struct BranchInfo {
55 pub name: String,
56 pub is_head: bool,
57 /// Tip commit's time as a Unix timestamp, so callers can sort branches
58 /// newest-first and render an age.
59 pub tip_unix: i64,
60 /// Commits on this branch its upstream lacks. Zero without an upstream.
61 pub ahead: usize,
62 /// Commits on the upstream this branch lacks. Zero without an upstream.
63 pub behind: usize,
64}
65
66/// A network operation the binary runs by shelling out to the backend's CLI,
67/// so the user's existing auth (SSH agent, credential helper, tokens) applies
68/// without diffler holding any credentials.
69#[derive(Debug, Clone, Copy, PartialEq, Eq)]
70pub enum NetworkOp {
71 Fetch,
72 FetchAll,
73}
74
75/// A run of consecutive lines a single commit last touched.
76#[derive(Debug, Clone, PartialEq, Eq)]
77pub struct BlameSpan {
78 /// 1-based first line of the run in the blamed content.
79 pub start_line: u32,
80 pub line_count: u32,
81 pub oid: String,
82 pub oid7: String,
83 pub author: String,
84 pub time_unix: i64,
85 pub summary: String,
86 /// False for lines that exist only in the worktree, which no commit owns.
87 pub committed: bool,
88}
89
90/// Per-area views of the working tree, neogit-style sections.
91#[derive(Debug, Clone, Default)]
92pub struct StatusModel {
93 pub untracked: DiffModel,
94 pub unstaged: DiffModel,
95 pub staged: DiffModel,
96}
97
98pub trait Vcs: Send {
99 /// Resolved repository metadata directory. In a plain repo this is
100 /// `<root>/.git`; in a linked worktree `<root>/.git` is a gitlink file
101 /// and this resolves to the external gitdir it points at.
102 fn git_dir(&self) -> Result<PathBuf, VcsError>;
103 /// Current branch, commit, and upstream.
104 fn head(&self) -> Result<HeadInfo, VcsError>;
105 /// Untracked / unstaged / staged sections as separate diff models.
106 fn status(&self) -> Result<StatusModel, VcsError>;
107 /// HEAD vs workdir+index including untracked files: the review view.
108 fn working_tree_diff(&self) -> Result<DiffModel, VcsError>;
109 /// [`Vcs::working_tree_diff`] taken from an arbitrary base commit instead
110 /// of HEAD, so uncommitted work shows alongside the commits since `base`.
111 fn tree_to_workdir_diff(&self, base_oid: &str) -> Result<DiffModel, VcsError>;
112 /// Changes a single commit introduced over its first parent.
113 fn commit_diff(&self, oid: &str) -> Result<DiffModel, VcsError>;
114 /// Combined diff of a contiguous commit range, from the first parent of
115 /// `oldest` to `newest` (`git diff <oldest>^..<newest>` semantics). When
116 /// `oldest` is a root commit its first-parent tree is the empty tree, so
117 /// the range includes everything `oldest` introduced.
118 fn range_diff(&self, oldest_oid: &str, newest_oid: &str) -> Result<DiffModel, VcsError>;
119 /// Diff between two trees as-is (`git diff <base> <newest>` semantics);
120 /// with `base` a merge base this is a PR-style three-dot diff.
121 fn tree_diff(&self, base_oid: &str, newest_oid: &str) -> Result<DiffModel, VcsError>;
122 /// Best common ancestor of two commits.
123 fn merge_base(&self, a: &str, b: &str) -> Result<String, VcsError>;
124 /// Resolve a revision (oid, ref name, remote ref) to a full commit oid.
125 fn resolve(&self, revision: &str) -> Result<String, VcsError>;
126 /// History from HEAD, newest first.
127 fn log(&self, limit: usize) -> Result<Vec<LogEntry>, VcsError>;
128
129 /// The branch a pull request merges into by default; `None` when the
130 /// repository offers no answer.
131 fn default_branch(&self, remote: &str) -> Result<Option<String>, VcsError>;
132
133 /// Commits reachable from `head` but not `base`, newest first: what a
134 /// pull request from `head` would carry.
135 fn commits_between(&self, base: &str, head: &str) -> Result<Vec<LogEntry>, VcsError>;
136 /// Commits on HEAD that no remote-tracking branch contains, newest first,
137 /// at most `limit` of them: work that exists only on this machine. `None`
138 /// when the repository has no remote-tracking refs, where being pushed has
139 /// no meaning yet. Asking the remotes rather than the configured upstream
140 /// is what makes the answer true: an upstream may be another local branch,
141 /// or a stale ref from before the last fetch. `limit` bounds a walk that is
142 /// otherwise the whole history whenever no remote ref sits on it.
143 fn unpushed(&self, limit: usize) -> Result<Option<Vec<LogEntry>>, VcsError>;
144 /// Last commit to touch each line of `rel` as the worktree has it, in line
145 /// order. Lines the worktree added since the last commit come back as one
146 /// span of their own, owned by no commit.
147 fn blame(&self, rel: &Path) -> Result<Vec<BlameSpan>, VcsError>;
148
149 /// Every tracked file, repo-relative and sorted. This is the index, so a
150 /// staged new file is tracked and an untracked one is not.
151 fn tracked_files(&self) -> Result<Vec<PathBuf>, VcsError>;
152
153 /// Local branches.
154 fn branches(&self) -> Result<Vec<BranchInfo>, VcsError>;
155 /// Local and remote-tracking branch names, for pickers that name a
156 /// revision rather than check one out.
157 fn all_branches(&self) -> Result<Vec<String>, VcsError>;
158 /// Stage a whole file (worktree deletions become staged deletions).
159 fn stage(&self, rel: &Path) -> Result<(), VcsError>;
160
161 /// Stage every change in the worktree, deletions and untracked files
162 /// included. Resolved against the repository as it is now, so a file
163 /// edited since the caller last looked is still caught.
164 fn stage_everything(&self) -> Result<(), VcsError>;
165
166 /// Reset the whole index back to HEAD, keeping the worktree.
167 fn unstage_everything(&self) -> Result<(), VcsError>;
168 /// Stage one hunk out of the unstaged (or untracked) changes of a file.
169 fn stage_hunk(&self, rel: &Path, hunk: &HunkId) -> Result<(), VcsError>;
170 /// Reset a file's index entry back to HEAD, keeping the worktree.
171 fn unstage(&self, rel: &Path) -> Result<(), VcsError>;
172 /// Remove one staged hunk from the index, keeping the worktree.
173 fn unstage_hunk(&self, rel: &Path, hunk: &HunkId) -> Result<(), VcsError>;
174 /// Throw away worktree changes only; an untracked file is deleted.
175 /// Refused while the file has staged changes (unstage first).
176 fn discard(&self, rel: &Path) -> Result<(), VcsError>;
177 /// Commit the index; returns the new commit id.
178 fn commit(&self, message: &str) -> Result<String, VcsError>;
179 /// Full message of the HEAD commit, for amend/reword editor templates.
180 fn head_message(&self) -> Result<String, VcsError>;
181 /// Amend HEAD, returning the new commit id. `message` `None` reuses HEAD's
182 /// message (extend); `Some` rewords it. `use_index` true folds the staged
183 /// index into the new tree (extend/amend); false keeps HEAD's tree (a
184 /// pure reword). Local-only: no network.
185 fn amend(&self, message: Option<&str>, use_index: bool) -> Result<String, VcsError>;
186 fn create_branch(&self, name: &str, checkout: bool) -> Result<(), VcsError>;
187 /// Refused for the currently checked-out branch.
188 fn delete_branch(&self, name: &str) -> Result<(), VcsError>;
189 fn checkout(&self, name: &str) -> Result<(), VcsError>;
190 /// Stash tracked changes (staged + unstaged), reverting the worktree to
191 /// HEAD; untracked files are left in place, matching `git stash`. `message`
192 /// `None` lets the backend label it. Local-only: no network.
193 fn stash_push(&self, message: Option<&str>) -> Result<(), VcsError>;
194 /// Restore the most recent stash and drop it. Refused when there is no
195 /// stash or the pop would conflict.
196 fn stash_pop(&self) -> Result<(), VcsError>;
197 /// Argv to run for a network op, e.g. `["git", "push"]`. The binary runs
198 /// this in [`Vcs::workdir`] so the backend's own CLI handles credentials;
199 /// diffler never touches them. A future jj backend returns `["jj", …]`.
200 fn network_argv(&self, op: NetworkOp) -> Vec<String>;
201 /// Working directory to run [`Vcs::network_argv`] in.
202 fn workdir(&self) -> Result<PathBuf, VcsError>;
203 /// URL of the named remote (e.g. `origin`), if it exists. Used to detect the
204 /// CI provider's host without shelling out.
205 fn remote_url(&self, name: &str) -> Result<Option<String>, VcsError>;
206 /// Names of every configured remote, for multi-remote CI detection.
207 fn remotes(&self) -> Result<Vec<String>, VcsError>;
208}
209
210/// Three-dot diff of `rev` against the working tree: `merge-base(rev, HEAD)`
211/// vs index + worktree + untracked. Commits `rev` gained since the branch
212/// forked stay out of it; uncommitted work stays in.
213pub fn against_diff(vcs: &dyn Vcs, rev: &str) -> Result<DiffModel, VcsError> {
214 let head = vcs.resolve("HEAD")?;
215 let base = vcs.merge_base(&vcs.resolve(rev)?, &head)?;
216 vcs.tree_to_workdir_diff(&base)
217}