OXYGENHUB
# 170bb436e1d5 oxygen / crates / oxy-core / src / repo / checkout.rs
20.0 KiB · Rust · last changed A verified clean check restamps the manifest; checkout keeps directory times (refs #41) 1 month ago source blame history raw
1
//! Moving the working copy to another state (spec §12.3, §7.7).
2
3
use super::*;
4
5
#[derive(Debug, Default, Clone, PartialEq, Eq)]
6
pub struct CheckoutReport {
7
    pub written: usize,
8
    pub removed: usize,
9
    pub conflicted: bool,
10
    /// Nested repositories that could not be moved, and other remarks.
11
    pub notes: Vec<String>,
12
    /// How many changes of the state left behind the new one lacks.
13
    pub lacks: usize,
14
}
15
16
/// Text files rendered at a time by a checkout: bounds its memory.
17
const CHECKOUT_BATCH: usize = 2048;
18
19
impl Repo {
20
    /// Move the working copy to the state whose heads are `heads` (spec §12.3):
21
    /// the working directory is rewritten to that state and a fresh
22
    /// working-copy change is started on it. The bookmark does not move.
23
    pub fn checkout(
24
        &self,
25
        heads: &[ChangeHash],
26
        discard: bool,
27
        command: &str,
28
    ) -> Result<CheckoutReport> {
29
        self.checkout_keeping(heads, discard, command, &BTreeSet::new())
30
    }
31
32
    /// [`Repo::checkout`], leaving the nested repositories at
33
    /// `keep_subrepos` as they are (their pins are carried work).
34
    pub(crate) fn checkout_keeping(
35
        &self,
36
        heads: &[ChangeHash],
37
        discard: bool,
38
        command: &str,
39
        keep_subrepos: &BTreeSet<String>,
40
    ) -> Result<CheckoutReport> {
41
        let _wc = self.lock_working_copy()?;
42
        let _all = crate::timing::phase("checkout");
43
        // A working copy clean by the manifest needs no snapshot; otherwise a
44
        // status snapshot records what changed, and rewrites the manifest
45
        // with the graph key of every file it proves unchanged. Either way
46
        // the manifest then says, for each file on disk, which graph it
47
        // renders, so the base state itself is not needed (oxygen#35).
48
        let changed_paths: Vec<String> = if self.clean_by_manifest()? {
49
            Vec::new()
50
        } else {
51
            let snap = self.snapshot_status(command)?;
52
            self.refuse_dirty(&snap, discard)?;
53
            snap.statuses.iter().map(|s| s.path.clone()).collect()
54
        };
55
        let (_, wc_now) = self.working_copy()?;
56
        let old_manifest = self.read_manifest()?.map(|(_, _, m)| m).unwrap_or_default();
57
        let changed: HashSet<&str> = changed_paths.iter().map(String::as_str).collect();
58
        // The target's history; its file graphs are built a batch at a time
59
        // for the files that must be written, and dropped after. It becomes
60
        // the working copy's base, which the state index holds.
61
        let mut target = self.load_state_indexed(heads)?;
62
        let heads = target.maximal(heads);
63
        let tv = crate::timing::phase("checkout: target view");
64
        let tview = target.tree().view();
65
        drop(tv);
66
        let mut report = CheckoutReport::default();
67
        // Paths this file system cannot hold side by side (spec §7.7).
68
        report.notes.extend(
69
            self.platform
70
                .problems(tview.entries.keys().map(String::as_str)),
71
        );
72
        report.conflicted = tview.is_conflicted();
73
        report.lacks = self.count_lacking(&wc_now.deps, &target)?;
74
75
        // Remove what the base or the working copy has and the target does
76
        // not. A nested repository is never deleted (spec §7.8).
77
        let mut dirs_to_prune: BTreeSet<PathBuf> = BTreeSet::new();
78
        let gone: BTreeSet<&str> = old_manifest
79
            .entries
80
            .keys()
81
            .map(String::as_str)
82
            .chain(changed.iter().copied())
83
            .filter(|p| !tview.entries.contains_key(*p))
84
            .collect();
85
        for path in gone {
86
            let dir = self.root.join(path);
87
            if dir.join(OXY_DIR).exists() || dir.join(".git").exists() {
88
                report
89
                    .notes
90
                    .push(format!("{path}: nested repository left in place"));
91
                continue;
92
            }
93
            let full = self.safe_path(path)?;
94
            if fs::symlink_metadata(&full).is_err() {
95
                continue;
96
            }
97
            fs::remove_file(&full)?;
98
            report.removed += 1;
99
            if let Some(parent) = full.parent() {
100
                dirs_to_prune.insert(parent.to_path_buf());
101
            }
102
        }
103
104
        // The manifest after the checkout, built from what is known.
105
        let plan = crate::timing::phase("checkout: plan");
106
        let mut entries: BTreeMap<String, FsEntry> = BTreeMap::new();
107
        let hex = |b: &[u8]| *blake3::hash(b).as_bytes();
108
        // Text files to render, attribute files first (the others need them).
109
        let mut texts: Vec<(String, NodeId, Mode)> = Vec::new();
110
        for (path, e) in tview.entries.iter() {
111
            if e.kind == NodeKind::Dir || !self.in_scope(path) {
112
                continue;
113
            }
114
            // The manifest entry of a file the working copy has not changed,
115
            // with the right executable bit.
116
            let exec_ok =
117
                |m: &prompt::ManifestEntry| !self.platform.exec_bits || m.exec == e.mode.exec;
118
            let entry = old_manifest
119
                .entries
120
                .get(path)
121
                .filter(|m| !changed.contains(path.as_str()) && exec_ok(m));
122
            if e.kind == NodeKind::File && !e.mode.opaque {
123
                // The manifest proves the file on disk equal to the rendering
124
                // of a graph whose key is the target's: nothing to read,
125
                // render or write.
126
                let key = target.graph_key(&e.node);
127
                let proven = |m: &&prompt::ManifestEntry| {
128
                    !is_attributes(path) && key.is_some() && m.graph == key
129
                };
130
                match entry.filter(proven) {
131
                    Some(m) => {
132
                        entries.insert(
133
                            path.clone(),
134
                            FsEntry {
135
                                content_hash: Some(m.hash),
136
                                graph_key: m.graph,
137
                                unchanged: true,
138
                                stat: Some((m.size, m.mtime_ns)),
139
                                ..FsEntry::new(NodeKind::File, e.mode.exec, Vec::new())
140
                            },
141
                        );
142
                    }
143
                    None => texts.push((path.clone(), e.node, e.mode)),
144
                }
145
                continue;
146
            }
147
            // Opaque files, symlinks and subrepos: their blobs.
148
            let blobs = target.live_blobs(&e.node);
149
            if blobs.len() > 1 {
150
                report.conflicted = true;
151
            }
152
            let Some(blob) = blobs.first().copied() else {
153
                continue;
154
            };
155
            if e.kind == NodeKind::Subrepo {
156
                if keep_subrepos.contains(path) {
157
                    continue;
158
                }
159
                let pin = crate::subrepo::Pin::decode(&self.read_blob(&blob)?)?;
160
                let sync = self.sync_subrepo(path, &pin, false)?;
161
                if matches!(
162
                    sync,
163
                    SubrepoSync::Updated | SubrepoSync::KeptBookmark { .. }
164
                ) {
165
                    report.written += 1;
166
                }
167
                report.notes.extend(sync.note(path));
168
                continue;
169
            }
170
            if let Some(m) = entry
171
                .filter(|m| e.kind == NodeKind::File && blobs.len() == 1 && m.blob == Some(blob))
172
            {
173
                entries.insert(
174
                    path.clone(),
175
                    FsEntry {
176
                        content_hash: Some(m.hash),
177
                        blob: (e.kind == NodeKind::File).then_some(blob),
178
                        stat: Some((m.size, m.mtime_ns)),
179
                        ..FsEntry::new(e.kind, e.mode.exec, Vec::new())
180
                    },
181
                );
182
                continue;
183
            }
184
            let bytes = self.read_blob(&blob)?;
185
            let full = self.root.join(path);
186
            if e.kind == NodeKind::Symlink {
187
                let same = fs::read_link(&full)
188
                    .is_ok_and(|t| t.to_string_lossy().as_bytes() == bytes.as_slice());
189
                if !same {
190
                    self.write_symlink(path, &bytes)?;
191
                    report.written += 1;
192
                }
193
                entries.insert(
194
                    path.clone(),
195
                    FsEntry {
196
                        content_hash: Some(hex(&bytes)),
197
                        ..FsEntry::new(NodeKind::Symlink, false, Vec::new())
198
                    },
199
                );
200
            } else {
201
                if !self.same_on_disk(&full, &bytes, e.mode.exec) {
202
                    self.write_file(path, &bytes, e.mode.exec)?;
203
                    report.written += 1;
204
                }
205
                entries.insert(
206
                    path.clone(),
207
                    FsEntry {
208
                        content_hash: Some(hex(&bytes)),
209
                        blob: (blobs.len() == 1).then_some(blob),
210
                        ..FsEntry::new(NodeKind::File, e.mode.exec, Vec::new())
211
                    },
212
                );
213
            }
214
            for (i, b) in blobs.iter().enumerate().skip(1) {
215
                self.write_file(
216
                    &format!("{path}.oxy-conflict-{}", i + 1),
217
                    &self.read_blob(b)?,
218
                    e.mode.exec,
219
                )?;
220
            }
221
        }
222
223
        drop(plan);
224
        let _render = crate::timing::phase("checkout: render and write");
225
        // Render and write text files a batch at a time; attribute files
226
        // come first, since the others' line endings and locks follow them.
227
        texts.sort_by_key(|(p, _, _)| !is_attributes(p));
228
        let keys: HashMap<NodeId, [u8; 32]> = texts
229
            .iter()
230
            .filter_map(|(_, n, _)| Some((*n, target.graph_key(n)?)))
231
            .collect();
232
        let mut attrs = crate::attributes::Attributes::default();
233
        let attr_count = texts.iter().filter(|(p, _, _)| is_attributes(p)).count();
234
        let mut done = 0usize;
235
        let mut batches: Vec<&[(String, NodeId, Mode)]> = Vec::new();
236
        if attr_count > 0 {
237
            batches.push(&texts[..attr_count]);
238
        }
239
        batches.extend(texts[attr_count..].chunks(CHECKOUT_BATCH));
240
        for batch in batches {
241
            use rayon::prelude::*;
242
            let nodes: Vec<NodeId> = batch.iter().map(|(_, n, _)| *n).collect();
243
            {
244
                let _t = crate::timing::phase("checkout: build graphs");
245
                self.load_graphs_of(&mut target, &nodes)?;
246
            }
247
            let rendered: Vec<(Vec<u8>, bool)> = {
248
                let _t = crate::timing::phase("checkout: render");
249
                nodes
250
                    .par_iter()
251
                    .map(|n| {
252
                        let (bytes, m) = target.render_file(n);
253
                        (bytes, m.is_conflicted())
254
                    })
255
                    .collect()
256
            };
257
            target.drop_graphs(&nodes);
258
            let _t = crate::timing::phase("checkout: write");
259
            if done == 0 && attr_count > 0 {
260
                attrs = crate::attributes::Attributes::from_files(
261
                    batch
262
                        .iter()
263
                        .zip(&rendered)
264
                        .map(|((p, _, _), (b, _))| (p.as_str(), b.as_slice())),
265
                );
266
            }
267
            done += batch.len();
268
            for ((path, node, mode), (bytes, conflicted)) in batch.iter().zip(rendered) {
269
                let a = attrs.lookup(path);
270
                let crlf = a.eol == Some(crate::attributes::Eol::Crlf);
271
                let on_disk: Vec<u8> = if crlf {
272
                    crate::attributes::to_crlf(&bytes)
273
                } else {
274
                    bytes
275
                };
276
                if !self.same_on_disk(&self.root.join(path), &on_disk, mode.exec) {
277
                    self.write_file(path, &on_disk, mode.exec)?;
278
                    report.written += 1;
279
                }
280
                report.conflicted |= conflicted;
281
                entries.insert(
282
                    path.clone(),
283
                    FsEntry {
284
                        content_hash: Some(hex(&on_disk)),
285
                        graph_key: (!conflicted && a.eol.is_none())
286
                            .then(|| keys.get(node).copied())
287
                            .flatten(),
288
                        ..FsEntry::new(NodeKind::File, mode.exec, Vec::new())
289
                    },
290
                );
291
            }
292
        }
293
        // Lockable files are read-only until locked (spec §18), whether
294
        // written now or left as they were.
295
        for (path, e) in &entries {
296
            if e.kind == NodeKind::File && attrs.lookup(path).lockable && !self.is_locked(path) {
297
                let _ = set_readonly(&self.root.join(path), true);
298
            }
299
        }
300
        // Prune directories left empty, deepest first.
301
        for d in dirs_to_prune.iter().rev() {
302
            let mut d = d.clone();
303
            while d != self.root
304
                && fs::read_dir(&d)
305
                    .map(|mut i| i.next().is_none())
306
                    .unwrap_or(false)
307
            {
308
                fs::remove_dir(&d)?;
309
                let Some(p) = d.parent() else { break };
310
                d = p.to_path_buf();
311
            }
312
        }
313
314
        drop(_render);
315
        let recording = crate::timing::phase("checkout: record");
316
        let (op_ref, op) = self.head_op()?;
317
        let wc = self.new_working_copy(heads.clone(), "");
318
        let wc_hash = self.store.put_change(&wc)?;
319
        let mut view = op.view.clone();
320
        view.workspaces.insert(self.workspace, wc_hash);
321
        self.record_op(&[op_ref], command, view)?;
322
        drop(recording);
323
        let _t = crate::timing::phase("checkout: manifest");
324
        // The directories the new tree has, with any the old manifest kept
325
        // that still exist (holding only ignored files, say), statted now,
326
        // after the writes: the next check then need not list the tree. A
327
        // directory written just now is within the racy window, so for a
328
        // moment the check lists anyway.
329
        if !old_manifest.dirs.is_empty() {
330
            let mut dirs: BTreeSet<String> =
331
                old_manifest.dirs.iter().map(|(d, _)| d.clone()).collect();
332
            dirs.insert(String::new());
333
            for p in entries.keys() {
334
                let mut at = p.as_str();
335
                while let Some((parent, _)) = at.rsplit_once('/') {
336
                    if !dirs.insert(parent.to_string()) {
337
                        break;
338
                    }
339
                    at = parent;
340
                }
341
            }
342
            use rayon::prelude::*;
343
            let root = &self.root;
344
            let dirs: Vec<(String, u128)> = dirs
345
                .into_par_iter()
346
                .filter_map(|d| {
347
                    let m = fs::metadata(root.join(&d)).ok().filter(|m| m.is_dir())?;
348
                    Some((d, prompt::mtime_ns(&m)))
349
                })
350
                .collect();
351
            let mut dirs = dirs;
352
            dirs.sort_unstable();
353
            *self.walked_dirs.borrow_mut() = Some((dirs, old_manifest.nested.clone()));
354
        }
355
        self.write_manifest_entries(report.conflicted, false, &entries, &HashMap::new())?;
356
        let _ = self.run_hook(
357
            "post-checkout",
358
            &format!(
359
                "{{\"event\":\"post-checkout\",\"heads\":{},\"written\":{},\"removed\":{}}}",
360
                json_array(heads.iter().map(|h| json_str(&h.to_hex()))),
361
                report.written,
362
                report.removed
363
            ),
364
        );
365
        Ok(report)
366
    }
367
368
    /// How many changes of the state at `from` the state `to` lacks: a walk
369
    /// down from `from` that stops at what `to` holds.
370
    fn count_lacking(&self, from: &[ChangeHash], to: &State) -> Result<usize> {
371
        let mut seen: HashSet<ChangeHash> = HashSet::new();
372
        let mut stack: Vec<ChangeHash> = from.to_vec();
373
        while let Some(h) = stack.pop() {
374
            if to.contains(&h) || !seen.insert(h) {
375
                continue;
376
            }
377
            stack.extend(self.store.get_change_lazy(&h)?.0.deps);
378
        }
379
        Ok(seen.len())
380
    }
381
382
    /// Refuse to leave uncommitted work behind unless `discard`.
383
    pub(crate) fn refuse_dirty(&self, snap: &SnapshotResult, discard: bool) -> Result<()> {
384
        if discard || (snap.wc.tree_ops.is_empty() && snap.wc.edits.is_empty()) {
385
            return Ok(());
386
        }
387
        let list: Vec<String> = snap
388
            .statuses
389
            .iter()
390
            .take(8)
391
            .map(|s| format!("{} {}", status_word(s.status), s.path))
392
            .collect();
393
        fail(format!(
394
            "the working copy has changes ({}{}); commit them, take them along with --carry, or drop them with --discard",
395
            list.join(", "),
396
            if snap.statuses.len() > 8 { ", …" } else { "" }
397
        ))
398
    }
399
400
    /// Whether the file at `full` already holds `bytes` with this executable
401
    /// bit, so writing it again can be skipped.
402
    fn same_on_disk(&self, full: &Path, bytes: &[u8], exec: bool) -> bool {
403
        match fs::symlink_metadata(full) {
404
            Ok(m) if m.is_file() && m.len() == bytes.len() as u64 => {
405
                (!self.platform.exec_bits || is_executable(&m) == exec)
406
                    && fs::read(full).is_ok_and(|b| b == bytes)
407
            }
408
            _ => false,
409
        }
410
    }
411
412
    /// The absolute path for a repository path, refusing anything that would
413
    /// escape the workspace or write through a symlink (spec §7.7).
414
    fn safe_path(&self, rel: &str) -> Result<PathBuf> {
415
        let mut full = self.root.clone();
416
        let comps: Vec<&str> = rel.split('/').collect();
417
        for (i, comp) in comps.iter().enumerate() {
418
            if comp.is_empty() || *comp == "." || *comp == ".." || comp.contains('\\') {
419
                return fail(format!("refusing unsafe path {rel:?}"));
420
            }
421
            if i == 0 && *comp == OXY_DIR {
422
                return fail(format!("refusing to write inside {OXY_DIR}: {rel:?}"));
423
            }
424
            if i + 1 < comps.len() {
425
                full.push(comp);
426
                if let Ok(m) = fs::symlink_metadata(&full) {
427
                    if m.file_type().is_symlink() {
428
                        return fail(format!(
429
                            "refusing to write through symlink {}",
430
                            full.display()
431
                        ));
432
                    }
433
                }
434
            } else {
435
                full.push(comp);
436
            }
437
        }
438
        Ok(full)
439
    }
440
441
    pub(crate) fn write_file(&self, rel: &str, bytes: &[u8], exec: bool) -> Result<()> {
442
        let full = self.safe_path(rel)?;
443
        if let Some(parent) = full.parent() {
444
            fs::create_dir_all(parent)?;
445
        }
446
        if fs::symlink_metadata(&full).is_ok_and(|m| m.file_type().is_symlink() || m.is_dir()) {
447
            remove_any(&full)?;
448
        }
449
        if fs::metadata(&full).is_ok_and(|m| m.permissions().readonly()) {
450
            set_readonly(&full, false)?;
451
        }
452
        fs::write(&full, bytes)?;
453
        set_executable(&full, exec)?;
454
        Ok(())
455
    }
456
457
    pub(crate) fn write_symlink(&self, rel: &str, target: &[u8]) -> Result<()> {
458
        let full = self.safe_path(rel)?;
459
        if let Some(parent) = full.parent() {
460
            fs::create_dir_all(parent)?;
461
        }
462
        if fs::symlink_metadata(&full).is_ok() {
463
            remove_any(&full)?;
464
        }
465
        #[cfg(unix)]
466
        {
467
            std::os::unix::fs::symlink(String::from_utf8_lossy(target).as_ref(), &full)?;
468
            Ok(())
469
        }
470
        #[cfg(not(unix))]
471
        {
472
            // Spec §7.7: without symlink support, write the target as a plain file.
473
            fs::write(&full, target)?;
474
            Ok(())
475
        }
476
    }
477
}
478
479
/// How a refusal names a path's change: "removed" is a file of the working
480
/// copy's base that is missing on disk.
481
fn status_word(s: ChangeStatus) -> &'static str {
482
    match s {
483
        ChangeStatus::Added => "added",
484
        ChangeStatus::Modified => "modified",
485
        ChangeStatus::Removed => "removed",
486
        ChangeStatus::Renamed => "renamed",
487
        ChangeStatus::ModeChanged => "mode changed",
488
        ChangeStatus::ConflictEdited => "conflict edited",
489
        ChangeStatus::Resolved => "resolved",
490
    }
491
}