grit-lib 0.5.21

Core library for the grit Git implementation
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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
//! Untracked cache (UNTR index extension) compatibility with system `git` (t7063).

mod support;

use std::collections::BTreeSet;
use std::fs;
use std::path::Path;

use grit_lib::config::environment::RepositoryOptions;
use grit_lib::config::ConfigSet;
use grit_lib::index::untracked_cache::{
    collect_untracked_from_cache, dir_flags_from_config, parse_untracked_extension,
    refresh_untracked_cache_for_status, try_untracked_from_valid_cache, untracked_cache_ident,
    UntrackedCache, UntrackedIgnoredMode, DIR_HIDE_EMPTY_DIRECTORIES, DIR_SHOW_OTHER_DIRECTORIES,
};
use grit_lib::porcelain::add::stage_for_commit;
use grit_lib::porcelain::status::{status, StatusOptions, UntrackedMode};
use grit_lib::progress::NeverCancel;
use grit_lib::progress::NullProgress;
use grit_lib::repo::Repository;

use support::{
    append_git_config, entry_from_worktree_path, extension_payload, fsck_strict, git,
    git_porcelain_untracked, git_status_porcelain_normal, git_status_porcelain_normal_with_trace,
    git_update_index_untracked_cache, read_index_bytes, trace2_read_directory_counter,
};

fn init_repo(root: &Path) {
    git(root, &["init", "-q", "-b", "main", "."]);
    git(root, &["config", "user.email", "t@example.com"]);
    git(root, &["config", "user.name", "Test"]);
    git(root, &["config", "core.untrackedCache", "true"]);
}

fn grit_untracked_paths(repo: &Repository) -> Vec<String> {
    let opts = StatusOptions {
        untracked: UntrackedMode::All,
        ..StatusOptions::default()
    };
    let model = status(repo, &opts, &mut NullProgress, &NeverCancel).expect("status");
    model.untracked
}

fn grit_untracked_paths_normal(repo: &Repository) -> Vec<String> {
    let opts = StatusOptions {
        untracked: UntrackedMode::Normal,
        ..StatusOptions::default()
    };
    let model = status(repo, &opts, &mut NullProgress, &NeverCancel).expect("status");
    model.untracked
}

fn git_untracked_paths_normal_mode(root: &Path) -> Vec<String> {
    git(
        root,
        &["-c", "core.untrackedCache=true", "status", "--porcelain"],
    )
    .lines()
    .filter(|l| l.starts_with("?? "))
    .map(|l| l[3..].to_string())
    .collect()
}

fn find_uc_dir<'a>(
    dir: &'a grit_lib::index::untracked_cache::UntrackedCacheDir,
    name: &str,
) -> Option<&'a grit_lib::index::untracked_cache::UntrackedCacheDir> {
    dir.dirs.iter().find(|d| d.name == name)
}

/// Regression: UNTR refresh probe must enumerate nested files when building check-only subtrees
/// (Bugbot PR #1522 — forwarding `show_all` into the probe dropped paths).
#[test]
fn normal_refresh_check_only_subtree_records_nested_files() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::create_dir_all(root.join("collapse")).expect("mkdir");
    fs::write(root.join("collapse/u1.txt"), "1\n").expect("write");
    fs::write(root.join("collapse/u2.txt"), "2\n").expect("write");
    fs::write(root.join("tracked.txt"), "t\n").expect("write");
    git(root, &["add", "tracked.txt"]);
    git(root, &["commit", "-qm", "c"]);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let idx = repo.index_handle().load().expect("load");
    let wt = repo.work_tree().expect("wt");
    let cfg = repo.config().expect("config");
    let mut uc = UntrackedCache::new_shell(
        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES,
        untracked_cache_ident(wt),
    );
    refresh_untracked_cache_for_status(
        &repo,
        &idx,
        wt,
        cfg.as_ref(),
        &mut uc,
        false,
        UntrackedIgnoredMode::No,
        None,
    )
    .expect("refresh normal");

    let collapse = find_uc_dir(uc.root.as_ref().expect("root"), "collapse").expect("collapse node");
    assert!(
        collapse.check_only,
        "collapsed untracked-only dir should be check_only, got recurse={} untracked={:?}",
        collapse.recurse, collapse.untracked
    );
    assert!(
        collapse.untracked.iter().any(|p| p == "u1.txt"),
        "check_only subtree must record nested files, got {:?}",
        collapse.untracked
    );
    assert!(
        collapse.untracked.iter().any(|p| p == "u2.txt"),
        "check_only subtree must record nested files, got {:?}",
        collapse.untracked
    );

    let collapsed_status = grit_untracked_paths_normal(&repo);
    assert!(
        collapsed_status.iter().any(|p| p == "collapse/"),
        "status output should still collapse to collapse/, got {collapsed_status:?}"
    );
}

#[test]
fn issue_1227_new_file_in_git_warmed_check_only_collapsed_dir() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::write(root.join("tracked.txt"), "t\n").expect("write");
    git(root, &["add", "tracked.txt"]);
    git(root, &["commit", "-qm", "c"]);
    fs::create_dir_all(root.join("sub/deep")).expect("mkdir");
    fs::write(root.join("sub/deep/u.txt"), "u\n").expect("write");
    git_update_index_untracked_cache(root);
    git_status_porcelain_normal(root);
    git_status_porcelain_normal(root);

    fs::write(root.join("sub/deep/new.txt"), "new\n").expect("write new");

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let grit_paths = grit_untracked_paths_normal(&repo);
    let git_paths = git_untracked_paths_normal_mode(root);
    assert!(
        git_paths.iter().any(|p| p.starts_with("sub")),
        "fixture must report untracked under sub/"
    );
    assert_eq!(
        BTreeSet::from_iter(grit_paths),
        BTreeSet::from_iter(git_paths),
        "normal untracked mode must match git for check_only collapsed UNTR"
    );

    stage_for_commit(&repo, &mut NullProgress).expect("stage for commit");
    let staged: BTreeSet<String> = repo
        .index_handle()
        .load()
        .expect("index")
        .entries()
        .iter()
        .filter(|e| e.stage() == 0)
        .map(|e| String::from_utf8_lossy(&e.path).into_owned())
        .collect();
    assert!(staged.contains("sub/deep/u.txt"));
    assert!(staged.contains("sub/deep/new.txt"));
}

#[test]
fn try_untracked_from_valid_cache_rejects_invalid_root() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::write(root.join("tracked.txt"), "t\n").expect("write");
    fs::write(root.join("u.txt"), "u\n").expect("write");
    git(root, &["add", "tracked.txt"]);
    git(root, &["commit", "-qm", "c"]);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let idx = repo.index_handle().load().expect("load");
    let cfg = repo.config().expect("config");
    let wt = repo.work_tree().expect("wt");
    let mut uc = UntrackedCache::new_shell(
        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES,
        untracked_cache_ident(wt),
    );
    refresh_untracked_cache_for_status(
        &repo,
        &idx,
        wt,
        cfg.as_ref(),
        &mut uc,
        false,
        UntrackedIgnoredMode::No,
        None,
    )
    .expect("refresh");
    uc.root.as_mut().expect("root").valid = false;

    let fast =
        try_untracked_from_valid_cache(&repo, wt, cfg.as_ref(), &mut uc, false).expect("try cache");
    assert!(
        fast.is_none(),
        "invalid UNTR root must decline cache reuse, got {fast:?}"
    );
}

#[test]
fn issue_1227_new_file_in_git_warmed_cached_dir() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::create_dir(root.join("d")).expect("mkdir");
    fs::write(root.join("d/a.txt"), "1\n").expect("write");
    git(root, &["add", "."]);
    git(root, &["commit", "-qm", "one"]);
    git_update_index_untracked_cache(root);
    git_status_porcelain_normal(root);
    git_status_porcelain_normal(root);

    fs::write(root.join("d/new.txt"), "new\n").expect("write new");

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let grit_paths = grit_untracked_paths_normal(&repo);
    let git_paths = git_porcelain_untracked(root);
    assert!(
        git_paths.iter().any(|p| p == "d/new.txt"),
        "fixture must list d/new.txt as untracked"
    );
    assert_eq!(
        BTreeSet::from_iter(grit_paths),
        BTreeSet::from_iter(git_paths),
        "normal untracked mode must see new file under git-warmed UNTR dir"
    );

    let outcome = stage_for_commit(&repo, &mut NullProgress).expect("stage for commit");
    assert!(
        outcome.added.len() >= 1,
        "commit staging must include new untracked file, got {outcome:?}"
    );
    fsck_strict(root);
}

#[test]
fn t7063_untracked_cache_reused_by_git_status() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::create_dir_all(root.join("dir")).expect("mkdir");
    fs::write(root.join("dir/tracked.txt"), "t\n").expect("write");
    fs::write(root.join("dir/untracked.txt"), "u\n").expect("write");
    git(root, &["add", "dir/tracked.txt"]);
    git(root, &["commit", "-qm", "c"]);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let mut idx = repo.index_handle().load().expect("load");
    let cfg = repo.config().expect("config");
    let wt = repo.work_tree().expect("work tree");
    let mut uc = UntrackedCache::new_shell(
        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES,
        untracked_cache_ident(wt),
    );
    refresh_untracked_cache_for_status(
        &repo,
        &idx,
        wt,
        cfg.as_ref(),
        &mut uc,
        false,
        UntrackedIgnoredMode::No,
        None,
    )
    .expect("refresh cache");
    idx.untracked_cache = Some(uc);
    repo.index_handle().write(&mut idx).expect("persist UNTR");

    let before = extension_payload(&read_index_bytes(&repo), b"UNTR").expect("UNTR");
    assert!(!before.is_empty(), "grit must write UNTR extension payload");

    let trace_warm = tempfile::NamedTempFile::new().expect("trace warm");
    git_status_porcelain_normal_with_trace(root, trace_warm.path());

    let stable = extension_payload(&read_index_bytes(&repo), b"UNTR").expect("UNTR after warm");
    assert!(
        !stable.is_empty(),
        "git must accept grit-written UNTR in normal untracked mode"
    );

    let trace_reuse = tempfile::NamedTempFile::new().expect("trace reuse");
    git_status_porcelain_normal_with_trace(root, trace_reuse.path());

    let after_reuse =
        extension_payload(&read_index_bytes(&repo), b"UNTR").expect("UNTR after second status");
    assert_eq!(
        stable, after_reuse,
        "second git status must reuse the UNTR payload without rebuilding"
    );
    assert_eq!(
        trace2_read_directory_counter(trace_reuse.path(), "node-creation"),
        Some(0),
        "reused UNTR must not allocate new directory nodes on the second status"
    );
    assert_eq!(
        trace2_read_directory_counter(trace_warm.path(), "gitignore-invalidation"),
        Some(0),
        "warm status should not invalidate gitignore after grit populated UNTR"
    );
    assert_eq!(
        stable.len(),
        before.len(),
        "UNTR payload size stable after grit write"
    );

    fsck_strict(root);
}

#[test]
fn t7063_git_untracked_cache_read_by_grit_status() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::write(root.join("a.txt"), "a\n").expect("write");
    fs::write(root.join("u.txt"), "u\n").expect("write");
    git(root, &["add", "a.txt"]);
    git(root, &["commit", "-qm", "c"]);
    git_update_index_untracked_cache(root);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let idx = repo.index_handle().load().expect("load");
    assert!(
        idx.untracked_cache.is_some(),
        "git UNTR must parse into grit index"
    );

    let grit_paths = grit_untracked_paths(&repo);
    let git_paths = git_porcelain_untracked(root);
    assert_eq!(
        BTreeSet::from_iter(grit_paths),
        BTreeSet::from_iter(git_paths),
        "grit status must match git porcelain untracked list"
    );
}

#[test]
fn t7063_invalidation_matches_git() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::write(root.join("tracked.txt"), "t\n").expect("write");
    git(root, &["add", "tracked.txt"]);
    git(root, &["commit", "-qm", "c"]);
    git_update_index_untracked_cache(root);

    let before_git = git_porcelain_untracked(root);

    fs::write(root.join("new.txt"), "n\n").expect("add untracked file");
    let after_add_git = git_porcelain_untracked(root);
    assert!(after_add_git.contains(&"new.txt".to_string()));
    assert_ne!(before_git, after_add_git);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let mut idx = repo.index_handle().load().expect("load");
    idx.invalidate_untracked_cache_for_path("new.txt");
    repo.index_handle()
        .write(&mut idx)
        .expect("persist invalidation");
    let grit_after = grit_untracked_paths(&repo);
    assert!(grit_after.iter().any(|p| p == "new.txt"));

    fs::remove_file(root.join("new.txt")).expect("remove");
    let mut idx = repo.index_handle().load().expect("reload");
    idx.invalidate_untracked_cache_for_path("new.txt");
    repo.index_handle()
        .write(&mut idx)
        .expect("persist after remove");
    let grit_removed = grit_untracked_paths(&repo);
    assert!(!grit_removed.iter().any(|p| p == "new.txt"));
}

#[test]
fn t7063_dir_flags_from_config_modes() {
    assert_eq!(
        dir_flags_from_config(&ConfigSet::new()),
        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES
    );
    let cfg_dir = tempfile::tempdir().expect("cfg temp");
    fs::write(
        cfg_dir.path().join("config"),
        "[status]\n\tshowUntrackedFiles = all\n",
    )
    .expect("write cfg");
    let cfg_all = ConfigSet::load(
        &grit_lib::config::environment::Environment::empty(),
        Some(cfg_dir.path()),
        true,
    )
    .expect("load cfg");
    assert_eq!(dir_flags_from_config(&cfg_all), 0);

    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    append_git_config(&root.join(".git"), "[status]\n\tshowUntrackedFiles = all\n");
    fs::write(root.join("t.txt"), "t\n").expect("write");
    fs::write(root.join("u.txt"), "u\n").expect("write");
    git(root, &["add", "t.txt"]);
    git(root, &["commit", "-qm", "c"]);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let mut idx = repo.index_handle().load().expect("load");
    let cfg = repo.config().expect("config");
    let wt = repo.work_tree().expect("wt");
    let mut uc = UntrackedCache::new_shell(0, untracked_cache_ident(wt));
    refresh_untracked_cache_for_status(
        &repo,
        &idx,
        wt,
        cfg.as_ref(),
        &mut uc,
        true,
        UntrackedIgnoredMode::No,
        None,
    )
    .expect("refresh all mode");
    let from_cache = collect_untracked_from_cache(&uc);
    assert!(from_cache.iter().any(|p| p == "u.txt"));
    idx.untracked_cache = Some(uc);
    repo.index_handle().write(&mut idx).expect("write");

    let grit_paths = grit_untracked_paths(&repo);
    assert!(grit_paths.iter().any(|p| p == "u.txt"));
}

#[test]
fn t7063_ident_mismatch_discards_stale_cache() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    fs::write(root.join("a.txt"), "a\n").expect("write");
    git(root, &["add", "a.txt"]);
    git(root, &["commit", "-qm", "c"]);

    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let mut idx = repo.index_handle().load().expect("load");
    let uc = UntrackedCache::new_shell(6, b"wrong-ident\x00".to_vec());
    idx.untracked_cache = Some(uc);
    repo.index_handle()
        .write(&mut idx)
        .expect("write stale cache");

    fs::write(root.join("fresh.txt"), "f\n").expect("write untracked");
    let paths = grit_untracked_paths(&repo);
    assert!(
        paths.iter().any(|p| p == "fresh.txt"),
        "ident mismatch must bypass stale UNTR and scan the worktree"
    );
}

#[test]
fn untracked_extension_corrupt_payload_no_panic() {
    assert!(parse_untracked_extension(&[]).is_none());
    assert!(parse_untracked_extension(&[0]).is_none());
    let mut truncated = write_minimal_untr();
    truncated.truncate(truncated.len() / 2);
    assert!(parse_untracked_extension(&truncated).is_none());

    let mut no_nul = write_minimal_untr();
    no_nul.pop();
    assert!(parse_untracked_extension(&no_nul).is_none());
}

fn write_minimal_untr() -> Vec<u8> {
    let uc = UntrackedCache::new_shell(6, b"id\x00".to_vec());
    grit_lib::index::untracked_cache::write_untracked_extension(&uc)
}

#[test]
fn t7063_collect_untracked_matches_git_deep_tree() {
    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    init_repo(root);
    for d in 0..15 {
        let dir = root.join(format!("tree{d}"));
        fs::create_dir_all(&dir).expect("mkdir");
        fs::write(dir.join("tracked.txt"), "t\n").expect("write");
        fs::write(dir.join(format!("u{d}.txt")), format!("u{d}\n")).expect("write");
        git(root, &["add", &format!("tree{d}/tracked.txt")]);
    }
    git(root, &["commit", "-qm", "c"]);
    git_update_index_untracked_cache(root);

    let git_set: BTreeSet<String> = git_porcelain_untracked(root).into_iter().collect();
    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let grit_set: BTreeSet<String> = grit_untracked_paths(&repo).into_iter().collect();
    assert_eq!(git_set, grit_set);

    let mut idx = repo.index_handle().load().expect("load");
    let cfg = repo.config().expect("config");
    let wt = repo.work_tree().expect("wt");
    let mut uc = idx.untracked_cache.take().expect("untr");
    refresh_untracked_cache_for_status(
        &repo,
        &idx,
        wt,
        cfg.as_ref(),
        &mut uc,
        true,
        UntrackedIgnoredMode::No,
        None,
    )
    .expect("refresh for collect");
    let from_cache: BTreeSet<String> = collect_untracked_from_cache(&uc).into_iter().collect();
    assert_eq!(git_set, from_cache);
    fsck_strict(root);
}

#[test]
fn index_name_hash_lazy_ignorecase_lookup() {
    use grit_lib::index::index_name_hash_lazy::{
        dump_lazy_init_name_hash, memihash, test_lazy_init_name_hash,
    };
    use grit_lib::index::Index;

    assert_eq!(memihash(b"Path/File"), memihash(b"path/file"));

    let tmp = tempfile::tempdir().expect("tempdir");
    let root = tmp.path();
    git(root, &["init", "-q", "-b", "main", "."]);
    let repo = Repository::discover(Some(root), &RepositoryOptions::empty()).expect("open");
    let mut idx = Index::empty(2);
    idx.add_or_replace(entry_from_worktree_path(&repo, "Mixed/Case.txt", b"x"));
    let threads = test_lazy_init_name_hash(&idx, false).expect("lazy init");
    assert_eq!(threads, 0, "small index uses single-threaded lazy path");
    dump_lazy_init_name_hash(&idx, false).expect("dump lazy hashes");
}