forkctl 0.0.3

Control audited StGit downstream patch stacks
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

use super::App;
use crate::process::{capture, run};
use crate::state::PendingOperation;
use anyhow::{Context, Result, ensure};

impl App {
    pub fn publish(&self) -> Result<()> {
        self.verify()?;
        let pending = self
            .read_pending()?
            .context("no forkctl operation is pending publication")?;
        let head = capture(&self.repo, "git", ["rev-parse", "HEAD"])?;
        if pending.operation == PendingOperation::Rebase {
            ensure!(
                pending.new_tip.as_deref() == Some(head.as_str()),
                "pending rebase does not describe current HEAD"
            );
            let report = pending
                .report
                .as_deref()
                .context("pending rebase has no review report")?;
            ensure!(
                std::path::Path::new(report).is_file(),
                "rebase report is unavailable: {report}"
            );
        }

        let downstream_ref = self.downstream_ref();
        let actual_remote = self.downstream_sha()?;
        ensure!(
            actual_remote == pending.expected_remote_sha,
            "downstream advanced to {actual_remote}, expected {}",
            pending.expected_remote_sha
        );
        let tag_ref = format!("refs/tags/{}", pending.backup_tag);
        if let Ok(remote_tag) = self.remote_ref_sha(&self.manifest.downstream.remote, &tag_ref) {
            let local_tag = capture(&self.repo, "git", ["rev-parse", &tag_ref])?;
            ensure!(
                remote_tag == local_tag,
                "remote backup tag {} points to another object",
                pending.backup_tag
            );
        }

        let lease = format!(
            "--force-with-lease={downstream_ref}:{}",
            pending.expected_remote_sha
        );
        let tag_refspec = format!("{tag_ref}:{tag_ref}");
        let branch_refspec = format!("HEAD:{downstream_ref}");
        run(
            &self.repo,
            "git",
            [
                "push",
                "--atomic",
                lease.as_str(),
                self.manifest.downstream.remote.as_str(),
                tag_refspec.as_str(),
                branch_refspec.as_str(),
            ],
        )?;

        let remote_branch = self.downstream_sha()?;
        ensure!(
            remote_branch == head,
            "published branch is {remote_branch}, expected {head}"
        );
        let remote_tag = self.remote_ref_sha(&self.manifest.downstream.remote, &tag_ref)?;
        let local_tag = capture(&self.repo, "git", ["rev-parse", &tag_ref])?;
        ensure!(remote_tag == local_tag, "published backup tag differs");
        self.clear_pending()?;
        println!(
            "forkctl: published {} and {} at {head}",
            pending.backup_tag, self.manifest.downstream.branch
        );
        Ok(())
    }
}