hl-valdemar/vamp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

style: show only jj change IDs in revision labels

Browse Source
This commit is contained in:
Valdemar Lorenzen
2026-10-12 15:23:30 +02:00
parent 9f1ea04f4d
commit d64704d4eb
3 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/repository.rs
-38
View File
@@ -534,19 +534,6 @@ fn jj_catalog_and_working_comparisons_prefer_jj_and_never_snapshot_or_merge_oper
"commit_id",
],
);
let change = jj(
&active,
&[
"--ignore-working-copy",
"--at-operation=@",
"log",
"--no-graph",
"-r",
"@",
"-T",
"change_id",
],
);
jj(&active, &["bookmark", "create", "baseline"]);
jj(&active, &["new"]);
fs::write(active.join("file"), "disk\n").unwrap();
@@ -564,8 +551,6 @@ fn jj_catalog_and_working_comparisons_prefer_jj_and_never_snapshot_or_merge_oper
r.target == RevisionTarget::Commit(id.clone()) && r.category == Category::Revisions
})
.unwrap();
assert!(baseline.label.contains(&id) && baseline.label.contains(&change));
assert_eq!(baseline.description, "jj baseline searchable");
assert!(
catalog
.entries
@@ -641,27 +626,6 @@ fn jj_private_fetch_discovers_never_fetched_bookmark_and_searchable_remote_chang
bare.to_str().unwrap(),
],
);
// Git transport may derive imported change IDs; compare with an independent
// CLI import rather than assuming the exporting store's private metadata.
let oracle = fixture.dir("oracle");
init_jj(&oracle, false);
jj(
&oracle,
&["git", "remote", "add", "origin", bare.to_str().unwrap()],
);
jj(&oracle, &["git", "fetch", "--remote", "origin"]);
let change = jj(
&oracle,
&[
"--ignore-working-copy",
"log",
"--no-graph",
"-r",
&ancestor,
"-T",
"change_id",
],
);
let active = fixture.dir("active");
init_jj(&active, false);
fs::write(active.join("file"), "local\n").unwrap();
@@ -709,8 +673,6 @@ fn jj_private_fetch_discovers_never_fetched_bookmark_and_searchable_remote_chang
&& r.category == Category::Revisions
})
.unwrap();
assert!(historic.label.contains(&ancestor) && historic.label.contains(&change));
assert_eq!(historic.description, "remote historic needle");
let comparison = compare_loaded(&mut repository, historic, &remote, &[]).unwrap();
assert_eq!(
changed(&comparison, Path::new("file")).before,