Fixes for M-02 to M-14, G-01 to G-14, K-02 to K-04, X-04 to X-14, not yet reviewed
Committed before review so Windows and WSL builds can start. Each fix was tested and mutation-checked here; the codex review of each item is still to come, so tasks/BUGS.md stays unticked. M-02 is mid-review: round 1 findings are fixed (apps/ely-mark/src/tally.rs). K-01 stays deferred. The ElyMark window test mark-outside.sh failed once at its crash-recovery step in the last run; not yet looked into.
This commit is contained in:
75 files changed
+1482
-354
No files matched your search
@@ -29,6 +29,7 @@ pub fn sides(doing: Option<&Doing>, cx: &App) -> [SharedString; 2] {
|
||||
Op::Rebase => ("tree.ours.rebase", "tree.theirs.rebase"),
|
||||
Op::CherryPick => ("tree.ours.pick", "tree.theirs.pick"),
|
||||
Op::Revert => ("tree.ours.revert", "tree.theirs.revert"),
|
||||
Op::Am => ("tree.ours.am", "tree.theirs.am"),
|
||||
};
|
||||
[
|
||||
text(cx, ours, &[("name", &doing.ours)]),
|
||||
@@ -59,8 +60,14 @@ fn button(
|
||||
impl Tree {
|
||||
/// A stopped operation: continue, skip or abort.
|
||||
pub fn op_alert(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
|
||||
let Some(Some(Ok(Some(doing)))) = self.active().map(|opened| opened.doing.as_ref()) else {
|
||||
return None;
|
||||
let doing = match self.active().map(|opened| opened.doing.as_ref()) {
|
||||
Some(Some(Ok(Some(doing)))) => doing,
|
||||
// A read that failed says so in Git's own words.
|
||||
Some(Some(Err(error))) => {
|
||||
let title = text(cx, "tree.op.unread", &[("error", error)]);
|
||||
return Some(Alert::new("tree-op", Severity::Danger, title).into_any_element());
|
||||
}
|
||||
_ => return None,
|
||||
};
|
||||
let op = doing.op;
|
||||
let key = match op {
|
||||
@@ -68,6 +75,7 @@ impl Tree {
|
||||
Op::Rebase => "tree.op.rebasing",
|
||||
Op::CherryPick => "tree.op.picking",
|
||||
Op::Revert => "tree.op.reverting",
|
||||
Op::Am => "tree.op.applying",
|
||||
};
|
||||
let title = text(cx, key, &[("ours", &doing.ours), ("theirs", &doing.theirs)]);
|
||||
let mut alert = Alert::new("tree-op", Severity::Warning, title)
|
||||
|
||||
Reference in new issue
Block a user