mirror of
https://seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5.git
synced 2026-11-16 00:00:37 +08:00
Lorenz LeutgebandFintan Halpenny
3f81e83d36
Canonical references can not be used to model symbolic references. Relax this restriction by adding another member to the payload, named "symbolic". Its key-value/name-target pairs then translate directly to canonical symbolic references. Care is taken to not allow circular references, and that there always is a rule that could generate the target of a symbolic reference (or a chain of symbolic references). Still, a symbolic reference may dangle (for example when its target reference cannot be computed because of divergence), but at least it can be prevented that a symref *always* dangles, because there is no rule that would produce its target. Co-authored-by: Fintan Halpenny <fintan.halpenny@gmail.com>
385 lines
9.3 KiB
Rust
385 lines
9.3 KiB
Rust
use crate::test;
|
|
use crate::util::environment::Environment;
|
|
use crate::util::formula::formula;
|
|
use radicle::prelude::RepoId;
|
|
use radicle::test::fixtures;
|
|
use std::str::FromStr;
|
|
|
|
#[test]
|
|
fn git_push_diverge() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
|
|
|
|
environment.repository(&alice);
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
bob.fork(acme, environment.work(&bob)).unwrap();
|
|
alice.has_remote_of(&acme, &bob.id);
|
|
|
|
formula(&environment.tempdir(), "examples/git/git-push-diverge.md")
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob).join("heartwood"),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn git_push_converge() {
|
|
use std::fs;
|
|
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
let eve = environment.node("eve");
|
|
let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
|
|
|
|
environment.repository(&alice);
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
let mut eve = eve.spawn();
|
|
|
|
bob.connect(&alice).connect(&eve).converge([&alice]);
|
|
eve.connect(&alice).converge([&alice]);
|
|
bob.fork(acme, environment.work(&bob)).unwrap();
|
|
eve.fork(acme, environment.work(&eve)).unwrap();
|
|
alice.has_remote_of(&acme, &bob.id);
|
|
alice.has_remote_of(&acme, &eve.id);
|
|
|
|
fs::write(
|
|
environment.work(&bob).join("heartwood").join("README"),
|
|
"Hello\n",
|
|
)
|
|
.unwrap();
|
|
fs::write(
|
|
environment.work(&eve).join("heartwood").join("README"),
|
|
"Hello, world!\n",
|
|
)
|
|
.unwrap();
|
|
|
|
formula(&environment.tempdir(), "examples/git/git-push-converge.md")
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob).join("heartwood"),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.home(
|
|
"eve",
|
|
environment.work(&eve).join("heartwood"),
|
|
[("RAD_HOME", eve.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn git_push_amend() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
|
|
|
|
environment.repository(&alice);
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
bob.fork(acme, environment.work(&bob)).unwrap();
|
|
alice.has_remote_of(&acme, &bob.id);
|
|
|
|
formula(&environment.tempdir(), "examples/git/git-push-amend.md")
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob).join("heartwood"),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn git_push_force_with_lease() {
|
|
Environment::alice(["rad-init", "git/git-push-force-with-lease"]);
|
|
}
|
|
|
|
#[test]
|
|
fn git_push_rollback() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
|
|
|
|
environment.repository(&alice);
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
bob.fork(acme, environment.work(&bob)).unwrap();
|
|
alice.has_remote_of(&acme, &bob.id);
|
|
|
|
formula(&environment.tempdir(), "examples/git/git-push-rollback.md")
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob).join("heartwood"),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn git_push_and_fetch() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
|
|
environment.repository(&alice);
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
|
|
environment.test("rad-clone", &bob).unwrap();
|
|
environment.test("git/git-push", &alice).unwrap();
|
|
environment.test("git/git-fetch", &bob).unwrap();
|
|
environment.test("git/git-push-delete", &alice).unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn git_tag() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
|
|
environment.repository(&alice);
|
|
|
|
environment.test("rad-init", &alice).unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
|
|
test(
|
|
"examples/rad-clone.md",
|
|
environment.work(&bob),
|
|
Some(&bob.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
formula(&environment.tempdir(), "examples/git/git-tag.md")
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn git_push_canonical_lightweight_tags() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
|
|
let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
|
|
|
|
fixtures::repository(environment.work(&alice));
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
bob.clone(rid, environment.work(&bob)).unwrap();
|
|
formula(
|
|
&environment.tempdir(),
|
|
"examples/git/git-push-canonical-lightweight-tags.md",
|
|
)
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|
|
|
|
/// This test exercises a large surface of the "Canonical References" feature:
|
|
/// - Annotated Tags
|
|
/// - Branches
|
|
/// - Symbolic References
|
|
#[test]
|
|
fn git_push_canonical() {
|
|
let mut environment = Environment::new();
|
|
let alice = environment.node("alice");
|
|
let bob = environment.node("bob");
|
|
|
|
let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
|
|
|
|
fixtures::repository(environment.work(&alice));
|
|
|
|
test(
|
|
"examples/rad-init.md",
|
|
environment.work(&alice),
|
|
Some(&alice.home),
|
|
[],
|
|
)
|
|
.unwrap();
|
|
|
|
let alice = alice.spawn();
|
|
let mut bob = bob.spawn();
|
|
|
|
bob.connect(&alice).converge([&alice]);
|
|
bob.clone(rid, environment.work(&bob)).unwrap();
|
|
formula(
|
|
&environment.tempdir(),
|
|
"examples/git/git-push-canonical-annotated-tags.md",
|
|
)
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
|
|
formula(
|
|
&environment.tempdir(),
|
|
"examples/git/git-push-canonical-branch.md",
|
|
)
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
|
|
formula(
|
|
&environment.tempdir(),
|
|
"examples/git/git-push-canonical-symbolic-ref.md",
|
|
)
|
|
.unwrap()
|
|
.home(
|
|
"alice",
|
|
environment.work(&alice),
|
|
[("RAD_HOME", alice.home.path().display())],
|
|
)
|
|
.home(
|
|
"bob",
|
|
environment.work(&bob),
|
|
[("RAD_HOME", bob.home.path().display())],
|
|
)
|
|
.run()
|
|
.unwrap();
|
|
}
|