use vcs_diff::DiffStat;
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct Change {
pub change_id: String,
pub commit_id: String,
pub empty: bool,
pub description: String,
}
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct Bookmark {
pub name: String,
pub target: String,
}
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct BookmarkRef {
pub name: String,
pub remote: Option<String>,
pub target: String,
pub tracked: bool,
}
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct Workspace {
pub name: String,
pub commit: String,
pub bookmarks: Vec<String>,
}
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct ChangedPath {
pub status: char,
pub path: String,
pub old_path: Option<String>,
}
pub(crate) const CHANGE_TEMPLATE: &str = "change_id.short() ++ \"\\t\" ++ commit_id.short() ++ \"\\t\" ++ if(empty, \"true\", \"false\") ++ \"\\t\" ++ description.first_line() ++ \"\\n\"";
pub(crate) const WORKSPACE_TEMPLATE: &str = "name ++ \"\\t\" ++ target.commit_id().short() ++ \"\\t\" ++ target.local_bookmarks().map(|b| b.name()).join(\",\") ++ \"\\n\"";
pub(crate) const BOOKMARKS_TEMPLATE: &str = "local_bookmarks.map(|b| b.name()).join(\",\")";
pub(crate) const BOOKMARK_ALL_TEMPLATE: &str = "name ++ \"\\t\" ++ remote ++ \"\\t\" ++ if(tracked, \"1\", \"0\") ++ \"\\t\" ++ if(normal_target, normal_target.commit_id().short(), \"\") ++ \"\\n\"";
pub(crate) const CONFLICT_TEMPLATE: &str = "if(conflict, \"1\", \"0\")";
pub(crate) const COUNT_TEMPLATE: &str = "commit_id.short() ++ \"\\n\"";
pub(crate) const REACHABLE_BOOKMARKS_TEMPLATE: &str =
"local_bookmarks.map(|b| b.name()).join(\" \") ++ \"\\t\" ++ commit_id.short() ++ \"\\n\"";
pub(crate) fn parse_jj_version(raw: &str) -> Option<vcs_diff::Version> {
vcs_diff::parse_dotted_version(raw)
}
pub(crate) const EVOLOG_TEMPLATE: &str = "commit.change_id().short() ++ \"\\t\" ++ commit.commit_id().short() ++ \"\\t\" ++ if(commit.empty(), \"true\", \"false\") ++ \"\\t\" ++ commit.description().first_line() ++ \"\\n\"";
pub(crate) const OP_TEMPLATE: &str = "id.short() ++ \"\\t\" ++ user ++ \"\\t\" ++ time.start().format(\"%Y-%m-%dT%H:%M:%S%z\") ++ \"\\t\" ++ description.first_line() ++ \"\\n\"";
pub(crate) const ANNOTATE_TEMPLATE: &str = "commit.change_id().short() ++ \"\\t\" ++ content";
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct Operation {
pub id: String,
pub user: String,
pub time: String,
pub description: String,
}
#[derive(Debug, Clone, PartialEq, Eq)]
#[non_exhaustive]
pub struct AnnotationLine {
pub change_id: String,
pub line: u32,
pub content: String,
}
pub(crate) fn parse_operations(output: &str) -> Vec<Operation> {
output
.lines()
.filter(|line| !line.is_empty())
.filter_map(|line| {
let mut fields = line.splitn(4, '\t');
Some(Operation {
id: fields.next()?.to_string(),
user: fields.next()?.to_string(),
time: fields.next()?.to_string(),
description: fields.next().unwrap_or("").to_string(),
})
})
.collect()
}
pub(crate) fn parse_annotate(output: &str) -> Vec<AnnotationLine> {
output
.lines()
.enumerate()
.filter_map(|(idx, line)| {
let (change_id, content) = line.split_once('\t')?;
Some(AnnotationLine {
change_id: change_id.to_string(),
line: (idx + 1) as u32,
content: content.to_string(),
})
})
.collect()
}
pub(crate) fn parse_changes(output: &str) -> Vec<Change> {
output
.lines()
.filter(|line| !line.is_empty())
.filter_map(|line| {
let mut fields = line.splitn(4, '\t');
let change_id = fields.next()?.to_string();
let commit_id = fields.next()?.to_string();
let empty = fields.next()? == "true";
let description = fields.next().unwrap_or("").to_string();
Some(Change {
change_id,
commit_id,
empty,
description,
})
})
.collect()
}
pub(crate) fn parse_bookmarks(output: &str) -> Vec<Bookmark> {
output
.lines()
.filter(|line| !line.is_empty() && !line.starts_with(char::is_whitespace))
.filter_map(|line| {
let (name, rest) = line.split_once(':')?;
let mut tokens = rest.split_whitespace();
let target = tokens
.nth(1)
.or_else(|| rest.split_whitespace().next())
.unwrap_or("")
.to_string();
Some(Bookmark {
name: name.trim().to_string(),
target,
})
})
.collect()
}
pub(crate) fn parse_bookmarks_all(output: &str) -> Vec<BookmarkRef> {
output
.lines()
.filter(|line| !line.is_empty())
.filter_map(|line| {
let mut fields = line.split('\t');
let name = fields.next()?.to_string();
let remote = fields.next().unwrap_or("");
let tracked = fields.next() == Some("1");
let target = fields.next().unwrap_or("").to_string();
Some(BookmarkRef {
name,
remote: (!remote.is_empty()).then(|| remote.to_string()),
target,
tracked,
})
})
.collect()
}
pub(crate) fn parse_reachable_bookmarks(output: &str) -> Vec<Bookmark> {
let mut out = Vec::new();
for line in output.lines().filter(|l| !l.is_empty()) {
let mut fields = line.splitn(2, '\t');
let names = fields.next().unwrap_or("");
let target = fields.next().unwrap_or("");
for name in names.split_whitespace() {
out.push(Bookmark {
name: name.to_string(),
target: target.to_string(),
});
}
}
out
}
pub(crate) fn parse_resolve_list(output: &str) -> Vec<String> {
output
.lines()
.filter_map(|line| {
let path = line.split(" ").next().unwrap_or(line).trim();
(!path.is_empty()).then(|| path.replace('\\', "/"))
})
.collect()
}
pub(crate) fn parse_workspaces(output: &str) -> Vec<Workspace> {
output
.lines()
.filter(|line| !line.is_empty())
.filter_map(|line| {
let mut fields = line.split('\t');
let name = fields.next()?.to_string();
let commit = fields.next().unwrap_or("").to_string();
let bookmarks = fields
.next()
.unwrap_or("")
.split(',')
.filter(|s| !s.is_empty())
.map(str::to_string)
.collect();
Some(Workspace {
name,
commit,
bookmarks,
})
})
.collect()
}
pub(crate) fn parse_diff_summary(output: &str) -> Vec<ChangedPath> {
let normalize = |p: String| p.replace('\\', "/");
output
.lines()
.filter(|line| !line.is_empty())
.filter_map(|line| {
let mut chars = line.chars();
let status = chars.next()?;
let raw = chars.as_str().strip_prefix(' ')?;
if raw.is_empty() {
return None;
}
let (old_path, path) = if matches!(status, 'R' | 'C') {
let (old, new) = expand_rename(raw);
(Some(normalize(old)), normalize(new))
} else {
(None, normalize(raw.to_string()))
};
Some(ChangedPath {
status,
path,
old_path,
})
})
.collect()
}
fn expand_rename(raw: &str) -> (String, String) {
let plain = || (raw.to_string(), raw.to_string());
let (Some(open), Some(close)) = (raw.find('{'), raw.find('}')) else {
return plain();
};
if open >= close {
return plain();
}
let Some(rel) = raw[open..close].find(" => ") else {
return plain();
};
let arrow = open + rel;
let prefix = &raw[..open];
let left = &raw[open + 1..arrow];
let right = &raw[arrow + 4..close];
let suffix = &raw[close + 1..];
(
format!("{prefix}{left}{suffix}"),
format!("{prefix}{right}{suffix}"),
)
}
pub(crate) fn parse_diff_stat(output: &str) -> DiffStat {
let summary = output
.lines()
.rev()
.find(|line| line.contains("changed"))
.unwrap_or("");
let mut stat = DiffStat::default();
for part in summary.split(',') {
let part = part.trim();
let n = part
.split_whitespace()
.next()
.and_then(|tok| tok.parse().ok())
.unwrap_or(0);
if part.contains("file") {
stat.files_changed = n;
} else if part.contains("insertion") {
stat.insertions = n;
} else if part.contains("deletion") {
stat.deletions = n;
}
}
stat
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn jj_version_parses_real_world_shapes() {
let v = parse_jj_version("jj 0.38.0").unwrap();
assert_eq!((v.major, v.minor, v.patch), (0, 38, 0));
let v = parse_jj_version("jj 0.39.0-dev+abc123").unwrap();
assert_eq!((v.major, v.minor, v.patch), (0, 39, 0));
let v = parse_jj_version("jj 1.2").unwrap();
assert_eq!(v.patch, 0, "missing patch defaults to 0");
assert!(parse_jj_version("jj 0.37.9").unwrap() < parse_jj_version("jj 0.38.0").unwrap());
assert!(parse_jj_version("jj").is_none());
}
#[test]
fn operations_split_tab_fields() {
let out = "abc123\tuser@host\t2026-06-05T10:00:00+0200\tnew empty commit\n\
def456\tuser@host\t2026-06-05T09:59:00+0200\tdescribe commit\twith tab\n";
let ops = parse_operations(out);
assert_eq!(ops.len(), 2);
assert_eq!(ops[0].id, "abc123");
assert_eq!(ops[0].user, "user@host");
assert_eq!(ops[0].time, "2026-06-05T10:00:00+0200");
assert_eq!(ops[0].description, "new empty commit");
assert_eq!(ops[1].description, "describe commit\twith tab");
}
#[test]
fn annotate_rows_carry_line_numbers() {
let out = "kxoyzabc\tfn main() {\nkxoyzabc\t}\nqlmnopqr\t// added later";
let lines = parse_annotate(out);
assert_eq!(lines.len(), 3);
assert_eq!(lines[0].change_id, "kxoyzabc");
assert_eq!(lines[0].line, 1);
assert_eq!(lines[0].content, "fn main() {");
assert_eq!(lines[2].change_id, "qlmnopqr");
assert_eq!(lines[2].line, 3);
assert!(parse_annotate("").is_empty());
}
#[test]
fn evolog_rows_parse_as_changes() {
let out = "kz\t38\tfalse\tfeat: parser\nkz\t12\ttrue\t\n";
let changes = parse_changes(out);
assert_eq!(changes.len(), 2);
assert_eq!(changes[0].description, "feat: parser");
assert!(changes[1].empty);
}
#[test]
fn changes_split_tab_fields() {
let input = "kztuxlro\t38e00654\tfalse\tfeat: stuff\nqpvuntsm\t6ecf997f\ttrue\t\n";
let got = parse_changes(input);
assert_eq!(got.len(), 2);
assert_eq!(
got[0],
Change {
change_id: "kztuxlro".into(),
commit_id: "38e00654".into(),
empty: false,
description: "feat: stuff".into(),
}
);
assert!(got[1].empty);
assert_eq!(got[1].description, "");
}
#[test]
fn changes_keep_tab_in_description() {
let got = parse_changes("kztuxlro\t38e00654\tfalse\tcol1\tcol2\n");
assert_eq!(got.len(), 1);
assert_eq!(got[0].description, "col1\tcol2");
}
#[test]
fn reachable_bookmarks_fan_out_per_name() {
let got = parse_reachable_bookmarks("main feat\tabc123\n\tdef456\n");
assert_eq!(
got,
vec![
Bookmark {
name: "main".into(),
target: "abc123".into()
},
Bookmark {
name: "feat".into(),
target: "abc123".into()
},
]
);
}
#[test]
fn resolve_list_extracts_paths_before_description() {
let got = parse_resolve_list(
"src/a.rs 2-sided conflict\nb.txt 2-sided conflict including 1 deletion\n",
);
assert_eq!(got, vec!["src/a.rs".to_string(), "b.txt".to_string()]);
assert!(parse_resolve_list("").is_empty());
assert_eq!(
parse_resolve_list("sub\\c.txt 2-sided conflict\n"),
vec!["sub/c.txt".to_string()]
);
}
#[test]
fn bookmarks_parse_name_and_commit_and_skip_remotes() {
let input = "main: pzlznprr f5d07685 feat(process): job-backed spawn\n @origin: pzlznprr f5d07685 feat(process)\nfeature: abcd1234 deadbeef wip\n";
let got = parse_bookmarks(input);
assert_eq!(
got,
vec![
Bookmark {
name: "main".into(),
target: "f5d07685".into()
},
Bookmark {
name: "feature".into(),
target: "deadbeef".into()
},
]
);
}
#[test]
fn workspaces_split_tab_fields_and_bookmarks() {
let input = "default\te2aa3420\tmain,feature\nws1\t12345678\t\n";
let got = parse_workspaces(input);
assert_eq!(got.len(), 2);
assert_eq!(
got[0],
Workspace {
name: "default".into(),
commit: "e2aa3420".into(),
bookmarks: vec!["main".into(), "feature".into()],
}
);
assert!(got[1].bookmarks.is_empty());
}
#[test]
fn diff_summary_splits_status_and_path() {
let got = parse_diff_summary("M src/lib.rs\nA new file.txt\nD gone.rs\n");
assert_eq!(got.len(), 3);
assert_eq!(got[0].status, 'M');
assert_eq!(got[1].path, "new file.txt");
assert!(got[1].old_path.is_none());
assert_eq!(got[2].status, 'D');
}
#[test]
fn diff_summary_expands_rename_and_copy() {
let got =
parse_diff_summary("R {old.rs => new.rs}\nC sub/{a.rs => b.rs}\nM lit{eral}.rs\n");
assert_eq!(got[0].status, 'R');
assert_eq!(got[0].path, "new.rs");
assert_eq!(got[0].old_path.as_deref(), Some("old.rs"));
assert_eq!(got[1].path, "sub/b.rs");
assert_eq!(got[1].old_path.as_deref(), Some("sub/a.rs"));
assert_eq!(got[2].path, "lit{eral}.rs");
assert!(got[2].old_path.is_none());
}
#[test]
fn diff_summary_normalises_backslash_separators() {
let got = parse_diff_summary("M deep\\nested\\f.rs\nR win\\{a.rs => b.rs}\n");
assert_eq!(got[0].path, "deep/nested/f.rs");
assert_eq!(got[1].path, "win/b.rs");
assert_eq!(got[1].old_path.as_deref(), Some("win/a.rs"));
}
#[test]
fn diff_stat_parses_footer_among_per_file_lines() {
let input = "README.md | 10 +++---\n\
src/lib.rs | 4 +-\n\
4 files changed, 157 insertions(+), 137 deletions(-)\n";
assert_eq!(parse_diff_stat(input), DiffStat::new(4, 157, 137));
assert_eq!(parse_diff_stat(""), DiffStat::default());
}
}
#[cfg(test)]
mod proptests {
use super::*;
use proptest::prelude::*;
fn structured_line() -> impl Strategy<Value = String> {
prop_oneof![
Just("M src/a.rs\n".to_string()),
Just("R sub\\{old.rs => new.rs}\n".to_string()),
Just("C {a => b}.rs\n".to_string()),
"[A-Z] \\{[a-zé]{0,6} => [a-zé]{0,6}\\}\n", "[a-zé]{0,8}\t[a-zé]{0,8}\t(true|false)\t[a-zé\t]{0,10}\n", "[a-zé]{0,8}\t[a-zé@]{0,8}\t[01]\t[a-zé]{0,8}\n", "[-+ ]?[a-zé]{0,10}\n", ]
}
fn structured_doc() -> impl Strategy<Value = String> {
prop::collection::vec(structured_line(), 0..40).prop_map(|lines| lines.concat())
}
proptest! {
#[test]
fn parsers_never_panic_on_arbitrary_text(s in any::<String>()) {
let _ = parse_changes(&s);
let _ = parse_operations(&s);
let _ = parse_annotate(&s);
let _ = parse_bookmarks(&s);
let _ = parse_bookmarks_all(&s);
let _ = parse_reachable_bookmarks(&s);
let _ = parse_resolve_list(&s);
let _ = parse_workspaces(&s);
let _ = parse_diff_summary(&s);
let _ = parse_diff_stat(&s);
let _ = parse_jj_version(&s);
let _ = expand_rename(&s);
}
#[test]
fn parsers_never_panic_on_structured_text(s in structured_doc()) {
let _ = parse_diff_summary(&s);
let _ = parse_changes(&s);
let _ = parse_bookmarks_all(&s);
}
#[test]
fn expand_rename_is_identity_without_braces(s in "[a-zé/ ]{0,20}") {
prop_assume!(!s.contains('{') && !s.contains('}'));
prop_assert_eq!(expand_rename(&s), (s.clone(), s));
}
}
}