subrepos.rs 79.9%

255 of 319 lines run, 26 of 60 functions · run #350 on proposal/125 · run missed

//! Subrepositories in the working copy (spec §7.8): reading pins from
//! nested repositories, moving them to pins, and the `oxy submodule`
//! commands.

use super::*;
use crate::subrepo::{Module, Modules, Pin};
use std::process::Command;

/// What syncing a nested repository to its pin did.
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum SubrepoSync {
    Updated,
    UpToDate,
    Missing,
    Dirty,
    /// The working copy was brought to the pin, but the nested repository's
    /// bookmark has changes the pin lacks, so it was left where it is: a
    /// bookmark is never moved backwards (spec §7.8).
    KeptBookmark {
        bookmark: String,
        newer: usize,
    },
    Failed(String),
}

impl SubrepoSync {
    /// A note for a checkout report, when there is something to say.
    pub fn note(&self, path: &str) -> Option<String> {
        match self {
            SubrepoSync::Updated | SubrepoSync::UpToDate => None,
            SubrepoSync::Missing => Some(format!(
                "{path}: nested repository not present; run oxy submodule update --init"
            )),
            SubrepoSync::Dirty => Some(format!(
                "{path}: nested repository has uncommitted changes; left as is"
            )),
            SubrepoSync::KeptBookmark { bookmark, newer } => Some(format!(
                "{path}: checked out at the pin; its bookmark {bookmark} keeps {newer} newer change{} (oxy bookmark switch {bookmark} there to return to them)",
                if *newer == 1 { "" } else { "s" }
            )),
            SubrepoSync::Failed(e) => Some(format!("{path}: {e}")),
        }
    }
}

/// One subrepo as `oxy submodule status` shows it.
#[derive(Clone, Debug)]
pub struct SubrepoInfo {
    pub path: String,
    pub pin: Pin,
    pub url: Option<String>,
    /// The nested repository's own pin now, if present.
    pub actual: Option<Pin>,
    pub dirty: bool,
    /// Whether the working copy's base records it. An added subrepo
    /// (registered in `.oxymodules`, not committed yet) has `pin` set to
    /// what the next commit records.
    pub committed: bool,
}

fn git_out(dir: &Path, args: &[&str]) -> Result<String> {
    let out = Command::new("git")
        .arg("-C")
        .arg(dir)
        .args(args)
        .output()
        .map_err(|e| RepoError::Msg(format!("running git: {e}")))?;
    if !out.status.success() {
        return fail(format!(
            "git {} in {}: {}",
            args.join(" "),
            dir.display(),
            String::from_utf8_lossy(&out.stderr).trim()
        ));
    }
    Ok(String::from_utf8_lossy(&out.stdout).trim().to_string())
}

/// The pin a nested repository at `dir` is at: the base of its working
/// copy for an Oxygen repository (which is its bookmark's heads unless a
/// parent checked out an older pin), `HEAD` for a Git one.
pub(crate) fn read_pin(dir: &Path, bookmark_hint: Option<&str>) -> Result<Pin> {
    if dir.join(OXY_DIR).exists() {
        let nested = Repo::open(dir)?;
        return Ok(Pin::Oxy {
            repo: nested.id()?,
            heads: nested.working_copy()?.1.deps,
            bookmark: nested.config.bookmark.clone(),
        });
    }
    if dir.join(".git").exists() {
        let sha = git_out(dir, &["rev-parse", "HEAD"])?;
        return Ok(Pin::Git {
            sha,
            branch: bookmark_hint.unwrap_or("HEAD").to_string(),
        });
    }
    fail(format!("{} is not a repository", dir.display()))
}

/// Whether a nested repository has uncommitted work.
fn nested_dirty(dir: &Path) -> Result<bool> {
    if dir.join(OXY_DIR).exists() {
        let nested = Repo::open(dir)?;
        let snap = nested.snapshot("oxy submodule")?;
        return Ok(!snap.wc.tree_ops.is_empty() || !snap.wc.edits.is_empty());
    }
    Ok(!git_out(dir, &["status", "--porcelain"])?.is_empty())
}

/// Whether `url` is an Oxygen repository (else it is taken to be Git),
/// probed with `options`, the credentials a clone of it would use; with
/// the probe's error when it is not, to report if Git cannot clone it
/// either.
fn probe_oxy_url(url: &str, options: &RemoteOptions) -> std::result::Result<(), String> {
    if url.starts_with("http://") || url.starts_with("https://") {
        return crate::protocol::open_remote(url, options)
            .and_then(|r| r.repo_id())
            .map(|_| ())
            .map_err(|e| e.to_string());
    }
    let p = Path::new(url.strip_prefix("file://").unwrap_or(url));
    if p.join(OXY_DIR).exists() {
        Ok(())
    } else {
        Err(format!("{} has no {OXY_DIR} directory", p.display()))
    }
}

impl Repo {
    pub(crate) fn modules_on_disk(&self) -> Modules {
        fs::read_to_string(self.root.join(".oxymodules"))
            .map(|t| Modules::parse(&t))
            .unwrap_or_default()
    }

    fn write_modules(&self, m: &Modules) -> Result<()> {
        if m.entries.is_empty() {
            let _ = fs::remove_file(self.root.join(".oxymodules"));
            return Ok(());
        }
        write_atomic(&self.root.join(".oxymodules"), m.to_text().as_bytes())
    }

    /// Bring the nested repository at `path` to `pin`, cloning it first when
    /// `init` and it is absent.
    pub(crate) fn sync_subrepo(&self, path: &str, pin: &Pin, init: bool) -> Result<SubrepoSync> {
        let dir = self.root.join(path);
        let module = self.modules_on_disk().entries.get(path).cloned();
        let present = dir.join(OXY_DIR).exists() || dir.join(".git").exists();
        let cloned = !present;
        if !present {
            if !init {
                return Ok(SubrepoSync::Missing);
            }
            let Some(m) = &module else {
                return Ok(SubrepoSync::Failed(
                    "no .oxymodules entry to clone from".into(),
                ));
            };
            if let Some(parent) = dir.parent() {
                fs::create_dir_all(parent)?;
            }
            let _ = fs::remove_dir(&dir);
            let r = match pin {
                Pin::Oxy { .. } => self.clone_as_subrepo(&m.url, &dir).map(|_| ()),
                Pin::Git { .. } => Command::new("git")
                    .args(["clone", "-q", &m.url])
                    .arg(&dir)
                    .status()
                    .map_err(|e| RepoError::Msg(e.to_string()))
                    .and_then(|s| {
                        if s.success() {
                            Ok(())
                        } else {
                            fail(format!("git clone {} failed", m.url))
                        }
                    }),
            };
            if let Err(e) = r {
                return Ok(SubrepoSync::Failed(format!("cloning {}: {e}", m.url)));
            }
        }
        let actual = read_pin(&dir, module.as_ref().and_then(|m| m.bookmark.as_deref()))?;
        let same = match (pin, &actual) {
            (Pin::Oxy { heads: a, .. }, Pin::Oxy { heads: b, .. }) => {
                let (mut a, mut b) = (a.clone(), b.clone());
                a.sort();
                b.sort();
                a == b
            }
            (Pin::Git { sha: a, .. }, Pin::Git { sha: b, .. }) => a == b,
            _ => false,
        };
        if same {
            return Ok(if cloned {
                SubrepoSync::Updated
            } else {
                SubrepoSync::UpToDate
            });
        }
        if nested_dirty(&dir)? {
            return Ok(SubrepoSync::Dirty);
        }
        match pin {
            Pin::Oxy { heads, .. } => {
                let nested = Repo::open(&dir)?;
                if nested.load_state(heads).is_err() {
                    // The pinned changes are not here yet: fetch from origin.
                    if let Err(e) = nested.fetch("origin") {
                        return Ok(SubrepoSync::Failed(format!(
                            "fetching the pinned changes: {e}"
                        )));
                    }
                }
                match nested.checkout(heads, false, "oxy submodule update") {
                    Ok(_) => {
                        // Its bookmark follows only forward: work it has
                        // beyond the pin stays on it (metalgear, oxygen#38).
                        let bookmark = nested.config.bookmark.clone();
                        let at = nested.bookmark_heads().unwrap_or_default();
                        let newer = nested.state_gap(&at, heads).map(|g| g.lacks).unwrap_or(0);
                        if newer == 0 {
                            let _ = nested.bookmark_set(&bookmark, heads);
                            Ok(SubrepoSync::Updated)
                        } else {
                            Ok(SubrepoSync::KeptBookmark { bookmark, newer })
                        }
                    }
                    Err(e) => Ok(SubrepoSync::Failed(e.to_string())),
                }
            }
            Pin::Git { sha, .. } => {
                if git_out(&dir, &["cat-file", "-e", &format!("{sha}^{{commit}}")]).is_err() {
                    if let Err(e) = git_out(&dir, &["fetch", "-q", "origin"]) {
                        return Ok(SubrepoSync::Failed(e.to_string()));
                    }
                }
                match git_out(&dir, &["checkout", "-q", "--detach", sha]) {
                    Ok(_) => Ok(SubrepoSync::Updated),
                    Err(e) => Ok(SubrepoSync::Failed(e.to_string())),
                }
            }
        }
    }

    /// Every subrepo of the working copy's base state.
    pub fn subrepos(&self) -> Result<Vec<SubrepoInfo>> {
        let (_, wc) = self.working_copy()?;
        let snap = self.load_state(&wc.deps)?.materialize();
        let modules = self.modules_on_disk();
        let mut out = Vec::new();
        for (path, f) in &snap.files {
            if f.kind != NodeKind::Subrepo {
                continue;
            }
            let FileContent::Opaque { blobs } = &f.content else {
                continue;
            };
            let Some(b) = blobs.first() else { continue };
            let pin = Pin::decode(&self.read_blob(b)?)?;
            let dir = self.root.join(path);
            let present = dir.join(OXY_DIR).exists() || dir.join(".git").exists();
            let actual = if present {
                read_pin(
                    &dir,
                    modules
                        .entries
                        .get(path)
                        .and_then(|m| m.bookmark.as_deref()),
                )
                .ok()
            } else {
                None
            };
            let dirty = present && nested_dirty(&dir).unwrap_or(false);
            out.push(SubrepoInfo {
                path: path.clone(),
                pin,
                url: modules.entries.get(path).map(|m| m.url.clone()),
                actual,
                dirty,
                committed: true,
            });
        }
        // Registered but not committed yet: pinned at what they are now.
        for (path, m) in &modules.entries {
            if snap.files.contains_key(path) {
                continue;
            }
            let dir = self.root.join(path);
            let Ok(pin) = read_pin(&dir, m.bookmark.as_deref()) else {
                continue;
            };
            out.push(SubrepoInfo {
                path: path.clone(),
                pin: pin.clone(),
                url: Some(m.url.clone()),
                actual: Some(pin),
                dirty: nested_dirty(&dir).unwrap_or(false),
                committed: false,
            });
        }
        out.sort_by(|a, b| a.path.cmp(&b.path));
        Ok(out)
    }

    /// `.oxymodules` entries with no subrepo behind them: never added, so
    /// there is no pin to clone or check out (oxygen#72).
    pub fn unpinned_modules(&self) -> Result<Vec<(String, Module)>> {
        let pinned: Vec<String> = self.subrepos()?.into_iter().map(|s| s.path).collect();
        Ok(self
            .modules_on_disk()
            .entries
            .into_iter()
            .filter(|(path, _)| !pinned.contains(path))
            .collect())
    }

    /// Clone `url` at `path`, register it in `.oxymodules`, and return the
    /// pin the next snapshot will record.
    pub fn submodule_add(&self, url: &str, path: &str, bookmark: Option<&str>) -> Result<Pin> {
        let path = path.trim_end_matches('/').to_string();
        if path.is_empty()
            || path.starts_with('/')
            || path.split('/').any(|c| c == ".." || c == ".")
        {
            return fail(format!("{path:?} is not a valid subrepo path"));
        }
        let dir = self.root.join(&path);
        if dir.exists() && fs::read_dir(&dir)?.next().is_some() {
            return fail(format!("{path} exists and is not empty"));
        }
        if let Some(parent) = dir.parent() {
            fs::create_dir_all(parent)?;
        }
        let probe = probe_oxy_url(url, &self.credentials_for(url));
        let git = probe.is_err();
        if git {
            let mut cmd = Command::new("git");
            cmd.args(["clone", "-q"]);
            if let Some(b) = bookmark {
                cmd.args(["--branch", b]);
            }
            let status = cmd
                .arg(url)
                .arg(&dir)
                .status()
                .map_err(|e| RepoError::Msg(format!("running git: {e}")))?;
            if !status.success() {
                let oxy_error = probe.err().unwrap_or_default();
                return fail(format!(
                    "git clone {url} failed; as an Oxygen repository: {oxy_error}"
                ));
            }
        } else {
            let _ = fs::remove_dir(&dir);
            let mut nested = self.clone_as_subrepo(url, &dir)?;
            if let Some(b) = bookmark {
                nested.bookmark_switch(b, true)?;
            }
        }
        let mut modules = self.modules_on_disk();
        modules.entries.insert(
            path.clone(),
            Module {
                url: url.to_string(),
                bookmark: bookmark.map(str::to_string),
                git,
            },
        );
        self.write_modules(&modules)?;
        read_pin(&dir, bookmark)
    }

    /// Bring nested repositories to their pins (`paths` empty = all).
    pub fn submodule_update(
        &self,
        init: bool,
        paths: &[String],
    ) -> Result<Vec<(String, SubrepoSync)>> {
        let mut out = Vec::new();
        for s in self.subrepos()? {
            if !paths.is_empty() && !paths.iter().any(|p| p.trim_end_matches('/') == s.path) {
                continue;
            }
            let r = self.sync_subrepo(&s.path, &s.pin, init)?;
            out.push((s.path, r));
        }
        Ok(out)
    }

    /// Drop the `.oxymodules` entry; the node goes with the next snapshot
    /// only if the directory is removed, since a registered or tracked
    /// nested repository keeps contributing its pin. Here the directory is
    /// left in place and the node is removed explicitly from the working
    /// copy's next change by unregistering and moving the directory aside.
    pub fn submodule_remove(&self, path: &str) -> Result<()> {
        let path = path.trim_end_matches('/').to_string();
        let mut modules = self.modules_on_disk();
        let known = modules.entries.remove(&path).is_some()
            || self.subrepos()?.iter().any(|s| s.path == path);
        if !known {
            return fail(format!("{path} is not a subrepo"));
        }
        self.write_modules(&modules)?;
        // The directory stays; the walker ignores an unregistered nested
        // repository unless tracked, so mark it as removed for the next
        // snapshot by recording an explicit removal.
        let dir = self.oxy.join("subrepos-removed");
        fs::create_dir_all(&dir)?;
        write_atomic(&dir.join(path.replace('/', "%2F")), b"")?;
        Ok(())
    }

    /// Paths whose subrepo node was removed with `oxy submodule remove` and
    /// whose directory is still on disk.
    pub(crate) fn removed_subrepos(&self) -> BTreeSet<String> {
        let mut out = BTreeSet::new();
        if let Ok(rd) = fs::read_dir(self.oxy.join("subrepos-removed")) {
            for e in rd.flatten() {
                out.insert(e.file_name().to_string_lossy().replace("%2F", "/"));
            }
        }
        out
    }

    pub(crate) fn clear_removed_subrepo(&self, path: &str) {
        let _ = fs::remove_file(
            self.oxy
                .join("subrepos-removed")
                .join(path.replace('/', "%2F")),
        );
    }
}

`/`	Search
`g` `c`	Code
`g` `h`	History
`g` `b`	Bookmarks
`g` `t`	Trust
`y`	Permalink to this state (files and trees)
`?`	This sheet

1		//! Subrepositories in the working copy (spec §7.8): reading pins from
2		//! nested repositories, moving them to pins, and the `oxy submodule`
3		//! commands.
4
5		use super::*;
6		use crate::subrepo::{Module, Modules, Pin};
7		use std::process::Command;
8
9		/// What syncing a nested repository to its pin did.
10		#[derive(Clone, Debug, PartialEq, Eq)]
11		pub enum SubrepoSync {
12		Updated,
13		UpToDate,
14		Missing,
15		Dirty,
16		/// The working copy was brought to the pin, but the nested repository's
17		/// bookmark has changes the pin lacks, so it was left where it is: a
18		/// bookmark is never moved backwards (spec §7.8).
19		KeptBookmark {
20		bookmark: String,
21		newer: usize,
22		},
23		Failed(String),
24		}
25
26		impl SubrepoSync {
27		/// A note for a checkout report, when there is something to say.
28	9×	pub fn note(&self, path: &str) -> Option<String> {
29	9×	match self {
30	4×	SubrepoSync::Updated \| SubrepoSync::UpToDate => None,
31	3×	SubrepoSync::Missing => Some(format!(
32	3×	"{path}: nested repository not present; run oxy submodule update --init"
33	3×	)),
34	1×	SubrepoSync::Dirty => Some(format!(
35	1×	"{path}: nested repository has uncommitted changes; left as is"
36	1×	)),
37	1×	SubrepoSync::KeptBookmark { bookmark, newer } => Some(format!(
38		"{path}: checked out at the pin; its bookmark {bookmark} keeps {newer} newer change{} (oxy bookmark switch {bookmark} there to return to them)",
39	1×	if *newer == 1 { "" } else { "s" }
40		)),
41	0×	SubrepoSync::Failed(e) => Some(format!("{path}: {e}")),
42		}
43	9×	}
44		}
45
46		/// One subrepo as `oxy submodule status` shows it.
47		#[derive(Clone, Debug)]
48		pub struct SubrepoInfo {
49		pub path: String,
50		pub pin: Pin,
51		pub url: Option<String>,
52		/// The nested repository's own pin now, if present.
53		pub actual: Option<Pin>,
54		pub dirty: bool,
55		/// Whether the working copy's base records it. An added subrepo
56		/// (registered in `.oxymodules`, not committed yet) has `pin` set to
57		/// what the next commit records.
58		pub committed: bool,
59		}
60
61	2×	fn git_out(dir: &Path, args: &[&str]) -> Result<String> {
62	2×	let out = Command::new("git")
63	2×	.arg("-C")
64	2×	.arg(dir)
65	2×	.args(args)
66	2×	.output()
67	2×	.map_err(\|e\| RepoError::Msg(format!("running git: {e}")))?;
68	2×	if !out.status.success() {
69	0×	return fail(format!(
70		"git {} in {}: {}",
71	0×	args.join(" "),
72	0×	dir.display(),
73	0×	String::from_utf8_lossy(&out.stderr).trim()
74		));
75	2×	}
76	2×	Ok(String::from_utf8_lossy(&out.stdout).trim().to_string())
77	2×	}
78
79		/// The pin a nested repository at `dir` is at: the base of its working
80		/// copy for an Oxygen repository (which is its bookmark's heads unless a
81		/// parent checked out an older pin), `HEAD` for a Git one.
82	66×	pub(crate) fn read_pin(dir: &Path, bookmark_hint: Option<&str>) -> Result<Pin> {
83	66×	if dir.join(OXY_DIR).exists() {
84	62×	let nested = Repo::open(dir)?;
85		return Ok(Pin::Oxy {
86	62×	repo: nested.id()?,
87	62×	heads: nested.working_copy()?.1.deps,
88	62×	bookmark: nested.config.bookmark.clone(),
89		});
90	4×	}
91	4×	if dir.join(".git").exists() {
92	2×	let sha = git_out(dir, &["rev-parse", "HEAD"])?;
93	2×	return Ok(Pin::Git {
94	2×	sha,
95	2×	branch: bookmark_hint.unwrap_or("HEAD").to_string(),
96	2×	});
97	2×	}
98	2×	fail(format!("{} is not a repository", dir.display()))
99	66×	}
100
101		/// Whether a nested repository has uncommitted work.
102	8×	fn nested_dirty(dir: &Path) -> Result<bool> {
103	8×	if dir.join(OXY_DIR).exists() {
104	8×	let nested = Repo::open(dir)?;
105	8×	let snap = nested.snapshot("oxy submodule")?;
106	8×	return Ok(!snap.wc.tree_ops.is_empty() \|\| !snap.wc.edits.is_empty());
107	0×	}
108	0×	Ok(!git_out(dir, &["status", "--porcelain"])?.is_empty())
109	8×	}
110
111		/// Whether `url` is an Oxygen repository (else it is taken to be Git),
112		/// probed with `options`, the credentials a clone of it would use; with
113		/// the probe's error when it is not, to report if Git cannot clone it
114		/// either.
115	9×	fn probe_oxy_url(url: &str, options: &RemoteOptions) -> std::result::Result<(), String> {
116	9×	if url.starts_with("http://") \|\| url.starts_with("https://") {
117	0×	return crate::protocol::open_remote(url, options)
118	0×	.and_then(\|r\| r.repo_id())
119	0×	.map(\|_\| ())
120	0×	.map_err(\|e\| e.to_string());
121	9×	}
122	9×	let p = Path::new(url.strip_prefix("file://").unwrap_or(url));
123	9×	if p.join(OXY_DIR).exists() {
124	9×	Ok(())
125		} else {
126	0×	Err(format!("{} has no {OXY_DIR} directory", p.display()))
127		}
128	9×	}
129
130		impl Repo {
131	1467×	pub(crate) fn modules_on_disk(&self) -> Modules {
132	1467×	fs::read_to_string(self.root.join(".oxymodules"))
133	1467×	.map(\|t\| Modules::parse(&t))
134	1467×	.unwrap_or_default()
135	1467×	}
136
137	10×	fn write_modules(&self, m: &Modules) -> Result<()> {
138	10×	if m.entries.is_empty() {
139	1×	let _ = fs::remove_file(self.root.join(".oxymodules"));
140	1×	return Ok(());
141	9×	}
142	9×	write_atomic(&self.root.join(".oxymodules"), m.to_text().as_bytes())
143	10×	}
144
145		/// Bring the nested repository at `path` to `pin`, cloning it first when
146		/// `init` and it is absent.
147	14×	pub(crate) fn sync_subrepo(&self, path: &str, pin: &Pin, init: bool) -> Result<SubrepoSync> {
148	14×	let dir = self.root.join(path);
149	14×	let module = self.modules_on_disk().entries.get(path).cloned();
150	14×	let present = dir.join(OXY_DIR).exists() \|\| dir.join(".git").exists();
151	14×	let cloned = !present;
152	14×	if !present {
153	6×	if !init {
154	4×	return Ok(SubrepoSync::Missing);
155	2×	}
156	2×	let Some(m) = &module else {
157	0×	return Ok(SubrepoSync::Failed(
158	0×	"no .oxymodules entry to clone from".into(),
159	0×	));
160		};
161	2×	if let Some(parent) = dir.parent() {
162	2×	fs::create_dir_all(parent)?;
163	0×	}
164	2×	let _ = fs::remove_dir(&dir);
165	2×	let r = match pin {
166	1×	Pin::Oxy { .. } => self.clone_as_subrepo(&m.url, &dir).map(\|_\| ()),
167	1×	Pin::Git { .. } => Command::new("git")
168	1×	.args(["clone", "-q", &m.url])
169	1×	.arg(&dir)
170	1×	.status()
171	1×	.map_err(\|e\| RepoError::Msg(e.to_string()))
172	1×	.and_then(\|s\| {
173	1×	if s.success() {
174	1×	Ok(())
175		} else {
176	0×	fail(format!("git clone {} failed", m.url))
177		}
178	1×	}),
179		};
180	2×	if let Err(e) = r {
181	0×	return Ok(SubrepoSync::Failed(format!("cloning {}: {e}", m.url)));
182	2×	}
183	8×	}
184	10×	let actual = read_pin(&dir, module.as_ref().and_then(\|m\| m.bookmark.as_deref()))?;
185	10×	let same = match (pin, &actual) {
186	9×	(Pin::Oxy { heads: a, .. }, Pin::Oxy { heads: b, .. }) => {
187	9×	let (mut a, mut b) = (a.clone(), b.clone());
188	9×	a.sort();
189	9×	b.sort();
190	9×	a == b
191		}
192	1×	(Pin::Git { sha: a, .. }, Pin::Git { sha: b, .. }) => a == b,
193	0×	_ => false,
194		};
195	10×	if same {
196	7×	return Ok(if cloned {
197	2×	SubrepoSync::Updated
198		} else {
199	5×	SubrepoSync::UpToDate
200		});
201	3×	}
202	3×	if nested_dirty(&dir)? {
203	1×	return Ok(SubrepoSync::Dirty);
204	2×	}
205	2×	match pin {
206	2×	Pin::Oxy { heads, .. } => {
207	2×	let nested = Repo::open(&dir)?;
208	2×	if nested.load_state(heads).is_err() {
209		// The pinned changes are not here yet: fetch from origin.
210	0×	if let Err(e) = nested.fetch("origin") {
211	0×	return Ok(SubrepoSync::Failed(format!(
212	0×	"fetching the pinned changes: {e}"
213	0×	)));
214	0×	}
215	2×	}
216	2×	match nested.checkout(heads, false, "oxy submodule update") {
217		Ok(_) => {
218		// Its bookmark follows only forward: work it has
219		// beyond the pin stays on it (metalgear, oxygen#38).
220	2×	let bookmark = nested.config.bookmark.clone();
221	2×	let at = nested.bookmark_heads().unwrap_or_default();
222	2×	let newer = nested.state_gap(&at, heads).map(\|g\| g.lacks).unwrap_or(0);
223	2×	if newer == 0 {
224	1×	let _ = nested.bookmark_set(&bookmark, heads);
225	1×	Ok(SubrepoSync::Updated)
226		} else {
227	1×	Ok(SubrepoSync::KeptBookmark { bookmark, newer })
228		}
229		}
230	0×	Err(e) => Ok(SubrepoSync::Failed(e.to_string())),
231		}
232		}
233	0×	Pin::Git { sha, .. } => {
234	0×	if git_out(&dir, &["cat-file", "-e", &format!("{sha}^{{commit}}")]).is_err() {
235	0×	if let Err(e) = git_out(&dir, &["fetch", "-q", "origin"]) {
236	0×	return Ok(SubrepoSync::Failed(e.to_string()));
237	0×	}
238	0×	}
239	0×	match git_out(&dir, &["checkout", "-q", "--detach", sha]) {
240	0×	Ok(_) => Ok(SubrepoSync::Updated),
241	0×	Err(e) => Ok(SubrepoSync::Failed(e.to_string())),
242		}
243		}
244		}
245	14×	}
246
247		/// Every subrepo of the working copy's base state.
248	29×	pub fn subrepos(&self) -> Result<Vec<SubrepoInfo>> {
249	29×	let (_, wc) = self.working_copy()?;
250	29×	let snap = self.load_state(&wc.deps)?.materialize();
251	29×	let modules = self.modules_on_disk();
252	29×	let mut out = Vec::new();
253	49×	for (path, f) in &snap.files {
254	49×	if f.kind != NodeKind::Subrepo {
255	42×	continue;
256	7×	}
257	7×	let FileContent::Opaque { blobs } = &f.content else {
258	0×	continue;
259		};
260	7×	let Some(b) = blobs.first() else { continue };
261	7×	let pin = Pin::decode(&self.read_blob(b)?)?;
262	7×	let dir = self.root.join(path);
263	7×	let present = dir.join(OXY_DIR).exists() \|\| dir.join(".git").exists();
264	7×	let actual = if present {
265	3×	read_pin(
266	3×	&dir,
267	3×	modules
268	3×	.entries
269	3×	.get(path)
270	3×	.and_then(\|m\| m.bookmark.as_deref()),
271		)
272	3×	.ok()
273		} else {
274	4×	None
275		};
276	7×	let dirty = present && nested_dirty(&dir).unwrap_or(false);
277	7×	out.push(SubrepoInfo {
278	7×	path: path.clone(),
279	7×	pin,
280	7×	url: modules.entries.get(path).map(\|m\| m.url.clone()),
281	7×	actual,
282	7×	dirty,
283		committed: true,
284		});
285		}
286		// Registered but not committed yet: pinned at what they are now.
287	29×	for (path, m) in &modules.entries {
288	11×	if snap.files.contains_key(path) {
289	7×	continue;
290	4×	}
291	4×	let dir = self.root.join(path);
292	4×	let Ok(pin) = read_pin(&dir, m.bookmark.as_deref()) else {
293	2×	continue;
294		};
295	2×	out.push(SubrepoInfo {
296	2×	path: path.clone(),
297	2×	pin: pin.clone(),
298	2×	url: Some(m.url.clone()),
299	2×	actual: Some(pin),
300	2×	dirty: nested_dirty(&dir).unwrap_or(false),
301	2×	committed: false,
302	2×	});
303		}
304	29×	out.sort_by(\|a, b\| a.path.cmp(&b.path));
305	29×	Ok(out)
306	29×	}
307
308		/// `.oxymodules` entries with no subrepo behind them: never added, so
309		/// there is no pin to clone or check out (oxygen#72).
310	3×	pub fn unpinned_modules(&self) -> Result<Vec<(String, Module)>> {
311	3×	let pinned: Vec<String> = self.subrepos()?.into_iter().map(\|s\| s.path).collect();
312	3×	Ok(self
313	3×	.modules_on_disk()
314	3×	.entries
315	3×	.into_iter()
316	3×	.filter(\|(path, _)\| !pinned.contains(path))
317	3×	.collect())
318	3×	}
319
320		/// Clone `url` at `path`, register it in `.oxymodules`, and return the
321		/// pin the next snapshot will record.
322	9×	pub fn submodule_add(&self, url: &str, path: &str, bookmark: Option<&str>) -> Result<Pin> {
323	9×	let path = path.trim_end_matches('/').to_string();
324	9×	if path.is_empty()
325	9×	\|\| path.starts_with('/')
326	17×	\|\| path.split('/').any(\|c\| c == ".." \|\| c == ".")
327		{
328	0×	return fail(format!("{path:?} is not a valid subrepo path"));
329	9×	}
330	9×	let dir = self.root.join(&path);
331	9×	if dir.exists() && fs::read_dir(&dir)?.next().is_some() {
332	0×	return fail(format!("{path} exists and is not empty"));
333	9×	}
334	9×	if let Some(parent) = dir.parent() {
335	9×	fs::create_dir_all(parent)?;
336	0×	}
337	9×	let probe = probe_oxy_url(url, &self.credentials_for(url));
338	9×	let git = probe.is_err();
339	9×	if git {
340	0×	let mut cmd = Command::new("git");
341	0×	cmd.args(["clone", "-q"]);
342	0×	if let Some(b) = bookmark {
343	0×	cmd.args(["--branch", b]);
344	0×	}
345	0×	let status = cmd
346	0×	.arg(url)
347	0×	.arg(&dir)
348	0×	.status()
349	0×	.map_err(\|e\| RepoError::Msg(format!("running git: {e}")))?;
350	0×	if !status.success() {
351	0×	let oxy_error = probe.err().unwrap_or_default();
352	0×	return fail(format!(
353		"git clone {url} failed; as an Oxygen repository: {oxy_error}"
354		));
355	0×	}
356		} else {
357	9×	let _ = fs::remove_dir(&dir);
358	9×	let mut nested = self.clone_as_subrepo(url, &dir)?;
359	9×	if let Some(b) = bookmark {
360	0×	nested.bookmark_switch(b, true)?;
361	9×	}
362		}
363	9×	let mut modules = self.modules_on_disk();
364	9×	modules.entries.insert(
365	9×	path.clone(),
366	9×	Module {
367	9×	url: url.to_string(),
368	9×	bookmark: bookmark.map(str::to_string),
369	9×	git,
370	9×	},
371		);
372	9×	self.write_modules(&modules)?;
373	9×	read_pin(&dir, bookmark)
374	9×	}
375
376		/// Bring nested repositories to their pins (`paths` empty = all).
377	5×	pub fn submodule_update(
378	5×	&self,
379	5×	init: bool,
380	5×	paths: &[String],
381	5×	) -> Result<Vec<(String, SubrepoSync)>> {
382	5×	let mut out = Vec::new();
383	5×	for s in self.subrepos()? {
384	4×	if !paths.is_empty() && !paths.iter().any(\|p\| p.trim_end_matches('/') == s.path) {
385	0×	continue;
386	4×	}
387	4×	let r = self.sync_subrepo(&s.path, &s.pin, init)?;
388	4×	out.push((s.path, r));
389		}
390	5×	Ok(out)
391	5×	}
392
393		/// Drop the `.oxymodules` entry; the node goes with the next snapshot
394		/// only if the directory is removed, since a registered or tracked
395		/// nested repository keeps contributing its pin. Here the directory is
396		/// left in place and the node is removed explicitly from the working
397		/// copy's next change by unregistering and moving the directory aside.
398	1×	pub fn submodule_remove(&self, path: &str) -> Result<()> {
399	1×	let path = path.trim_end_matches('/').to_string();
400	1×	let mut modules = self.modules_on_disk();
401	1×	let known = modules.entries.remove(&path).is_some()
402	0×	\|\| self.subrepos()?.iter().any(\|s\| s.path == path);
403	1×	if !known {
404	0×	return fail(format!("{path} is not a subrepo"));
405	1×	}
406	1×	self.write_modules(&modules)?;
407		// The directory stays; the walker ignores an unregistered nested
408		// repository unless tracked, so mark it as removed for the next
409		// snapshot by recording an explicit removal.
410	1×	let dir = self.oxy.join("subrepos-removed");
411	1×	fs::create_dir_all(&dir)?;
412	1×	write_atomic(&dir.join(path.replace('/', "%2F")), b"")?;
413	1×	Ok(())
414	1×	}
415
416		/// Paths whose subrepo node was removed with `oxy submodule remove` and
417		/// whose directory is still on disk.
418	1390×	pub(crate) fn removed_subrepos(&self) -> BTreeSet<String> {
419	1390×	let mut out = BTreeSet::new();
420	1390×	if let Ok(rd) = fs::read_dir(self.oxy.join("subrepos-removed")) {
421	3×	for e in rd.flatten() {
422	3×	out.insert(e.file_name().to_string_lossy().replace("%2F", "/"));
423	3×	}
424	1387×	}
425	1390×	out
426	1390×	}
427
428	1×	pub(crate) fn clear_removed_subrepo(&self, path: &str) {
429	1×	let _ = fs::remove_file(
430	1×	self.oxy
431	1×	.join("subrepos-removed")
432	1×	.join(path.replace('/', "%2F")),
433	1×	);
434	1×	}
435		}

Coverage / crates/oxy-core/src/repo/subrepos.rs 79.9%

Keyboard