Nested repositories listed in order, and how to leave one out quietly (refs #43) 69692f14b80f
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-10-01 00:32 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
69692f14b80f2efe1ff1997086368f3ff65ebdc66fb9b90a5f12855750488f11
- Depends on
- 135212de5370 d4dbab97e948 fce44ae9ad29
- Depended on by
- 0389c3e82f6c
- In bookmarks
- agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
- In tags
- v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
- Edits
- 5 atoms, 0 tree operations, 2 files
Browse the tree at this change
modified
crates/oxy-core/src/repo/prompt.rs
+3 −1
|
|
… |
552 unchanged lines |
| 553 |
553 |
|
if !dirty { |
| 554 |
554 |
|
// Nested repositories the manifest has no entry for are not |
| 555 |
555 |
|
// subrepos: nothing in them is tracked (oxygen#43). |
| 556 |
|
- |
*self.untracked_nested.borrow_mut() = listing |
|
556 |
+ |
let mut nested: Vec<String> = listing |
| 557 |
557 |
|
.nested |
| 558 |
558 |
|
.iter() |
| 559 |
559 |
|
.map(|d| self.rel_path(d)) |
| 560 |
560 |
|
.filter(|rel| !manifest.entries.contains_key(rel)) |
| 561 |
561 |
|
.collect(); |
|
562 |
+ |
nested.sort(); |
|
563 |
+ |
*self.untracked_nested.borrow_mut() = nested; |
| 562 |
564 |
|
} |
| 563 |
565 |
|
if dirty && keep { |
| 564 |
566 |
|
*self.listing_cache.borrow_mut() = Some(listing); |
|
|
… |
79 unchanged lines |
modified
src/cli/workspace.rs
+1 −1
|
|
… |
85 unchanged lines |
| 86 |
86 |
|
ui::note(), |
| 87 |
87 |
|
ui::dim( |
| 88 |
88 |
|
"to track one's files, remove its .git (or .oxy); to keep it a repository of its own, \ |
| 89 |
|
- |
oxy submodule add URL PATH" |
|
89 |
+ |
oxy submodule add URL PATH; to leave it out quietly, list it in .oxyignore" |
| 90 |
90 |
|
) |
| 91 |
91 |
|
); |
| 92 |
92 |
|
} |
|
|
… |
1868 unchanged lines |