7 files changed, 29 insertions, 38 deletions
diff --git a/pkgs/by-name/fi/fish-patched/patches/0003-feat-history-Add-turtle-as-history-backend.patch b/pkgs/by-name/fi/fish-patched/patches/0002-feat-history-Add-turtle-as-history-backend.patch
index 8eeb03b4..50aad155 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0003-feat-history-Add-turtle-as-history-backend.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0002-feat-history-Add-turtle-as-history-backend.patch
@@ -1,7 +1,7 @@
-From 26e8fbb5a24dd8b9cac67adcb59e714b32f95aa6 Mon Sep 17 00:00:00 2001
+From 040524694b6c13aecb350b47c5a7e7adb74d6fc9 Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Sat, 22 Aug 2026 22:42:44 +0200
-Subject: [PATCH 03/10] feat(history): Add turtle as history backend
+Subject: [PATCH 02/10] feat(history): Add turtle as history backend
 
 ---
  Cargo.toml             |   4 +
@@ -9,12 +9,12 @@ Subject: [PATCH 03/10] feat(history): Add turtle as history backend
  src/history/mod.rs     |   2 +
  src/history/turtle.rs  | 400 +++++++++++++++++++++++++++++++++++++++++
  src/parser.rs          |   5 +
- src/reader/reader.rs   |   4 +-
- 6 files changed, 424 insertions(+), 276 deletions(-)
+ src/reader/reader.rs   |   2 +
+ 6 files changed, 423 insertions(+), 275 deletions(-)
  create mode 100644 src/history/turtle.rs
 
 diff --git a/Cargo.toml b/Cargo.toml
-index aa91b61b7..137fbed24 100644
+index 2eaf41ae8..1b83ce50d 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -11,6 +11,7 @@ repository = "https://github.com/fish-shell/fish-shell"
@@ -25,7 +25,7 @@ index aa91b61b7..137fbed24 100644
  anstyle = "1.0.13"
  anyhow = "1.0.102"
  assert_matches = "1.5.0"
-@@ -115,6 +116,9 @@ homepage = "https://fishshell.com"
+@@ -113,6 +114,9 @@ homepage = "https://fishshell.com"
  readme = "README.rst"
  
  [dependencies]
@@ -33,10 +33,10 @@ index aa91b61b7..137fbed24 100644
 +tokio = { version = "1.53.1", features = ["rt"] }
 +uuid = { version = "1.24.0", features = ["v7"] }
  assert_matches.workspace = true
- bitflags.workspace = true
  cfg-if.workspace = true
+ fish-build-helper.workspace = true
 diff --git a/src/history/history.rs b/src/history/history.rs
-index e1d04ad49..90cbfe6a9 100644
+index 47512ea59..4023280bf 100644
 --- a/src/history/history.rs
 +++ b/src/history/history.rs
 @@ -14,6 +14,7 @@
@@ -47,7 +47,7 @@ index e1d04ad49..90cbfe6a9 100644
  use crate::{
      ast::{self, Kind, Node as _},
      common::valid_var_name,
-@@ -334,7 +335,7 @@ struct HistoryImpl {
+@@ -333,7 +334,7 @@ struct HistoryImpl {
      /// Deleted item contents, and the scope of the deletion.
      deleted_items: HashMap<WString, DeletionScope>,
      /// The history file contents.
@@ -56,7 +56,7 @@ index e1d04ad49..90cbfe6a9 100644
      /// The file ID of the history file.
      history_file_id: FileId, // INVALID_FILE_ID
      /// The boundary timestamp distinguishes old items from new items. Items whose timestamps are <=
-@@ -358,6 +359,8 @@ fn history_file_path(&self) -> std::io::Result<Option<WString>> {
+@@ -357,6 +358,8 @@ fn history_file_path(&self) -> std::io::Result<Option<WString>> {
              return Ok(None);
          }
  
@@ -65,7 +65,7 @@ index e1d04ad49..90cbfe6a9 100644
          let mut path = if let Some(custom_dir) = &self.custom_directory {
              custom_dir.clone()
          } else {
-@@ -422,10 +425,7 @@ fn add(&mut self, item: HistoryItem, pending: bool, do_save: bool) {
+@@ -417,10 +420,7 @@ fn add(&mut self, item: HistoryItem, pending: bool, do_save: bool) {
      }
  
      /// Internal function.
@@ -77,7 +77,7 @@ index e1d04ad49..90cbfe6a9 100644
  
      /// Returns a timestamp for new items - see the implementation for a subtlety.
      fn timestamps_as_of_now(&self) -> Timestamps {
-@@ -451,32 +451,16 @@ fn timestamps_as_of_now(&self) -> Timestamps {
+@@ -446,32 +446,16 @@ fn timestamps_as_of_now(&self) -> Timestamps {
  
      /// Loads old items if necessary.
      /// Return a reference to the loaded history file.
@@ -113,7 +113,7 @@ index e1d04ad49..90cbfe6a9 100644
          self.file_contents.insert(file_contents)
      }
  
-@@ -524,260 +508,11 @@ fn remove_ephemeral_items(&mut self) {
+@@ -519,260 +503,11 @@ fn remove_ephemeral_items(&mut self) {
              usize::min(self.first_unwritten_new_item_index, self.new_items.len());
      }
  
@@ -794,7 +794,7 @@ index 000000000..ffcdea108
 +    }
 +}
 diff --git a/src/parser.rs b/src/parser.rs
-index ffbc28633..6440b7476 100644
+index df9536ea1..fa0647ff3 100644
 --- a/src/parser.rs
 +++ b/src/parser.rs
 @@ -437,6 +437,11 @@ pub struct Parser {
@@ -810,7 +810,7 @@ index ffbc28633..6440b7476 100644
  #[derive(Copy, Clone, Default)]
  pub struct ParserEnvSetMode {
 diff --git a/src/reader/reader.rs b/src/reader/reader.rs
-index 14fbc89c0..6848a7f1c 100644
+index 93b52e6db..8e916d186 100644
 --- a/src/reader/reader.rs
 +++ b/src/reader/reader.rs
 @@ -871,6 +871,7 @@ fn read_i(parser: &mut Parser) {
@@ -829,15 +829,6 @@ index 14fbc89c0..6848a7f1c 100644
          event::fire_generic(reader.parser, L!("fish_postexec").to_owned(), vec![command]);
          // Allow any pending history items to be returned in the history array.
          reader.history.resolve_pending();
-@@ -2663,7 +2665,7 @@ fn readline(
-             self.clear_pager();
-         }
- 
--        if EXIT_STATE.load(Ordering::Relaxed) != ExitState::FinishedHandlers as _ {
-+        if EXIT_STATE.load(Ordering::Relaxed) != ExitState::FinishedHandlers as u8 {
-             // The order of the two conditions below is important. Try to restore the mode
-             // in all cases, but only complain if interactive.
-             if let Some(old_modes) = old_modes {
 -- 
 2.55.0
 
diff --git a/pkgs/by-name/fi/fish-patched/patches/0004-history-turtle-Fix-id-misuse-and-history-return-orde.patch b/pkgs/by-name/fi/fish-patched/patches/0003-history-turtle-Fix-id-misuse-and-history-return-orde.patch
index 4eb3220b..7498b92d 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0004-history-turtle-Fix-id-misuse-and-history-return-orde.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0003-history-turtle-Fix-id-misuse-and-history-return-orde.patch
@@ -1,7 +1,7 @@
-From c4f1ff5812024e50f8c6cf825a81b654afada2a4 Mon Sep 17 00:00:00 2001
+From e2e21711bc54cbd65021a6d78c3f920b75b868b3 Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Sun, 23 Aug 2026 23:34:58 +0200
-Subject: [PATCH 04/10] history/turtle: Fix id misuse and history return order
+Subject: [PATCH 03/10] history/turtle: Fix id misuse and history return order
 
 ---
  src/history/turtle.rs | 16 +++++++++++++---
diff --git a/pkgs/by-name/fi/fish-patched/patches/0005-history-history-Always-save-history-even-in-private-.patch b/pkgs/by-name/fi/fish-patched/patches/0004-history-history-Always-save-history-even-in-private-.patch
index f55a6096..c8515067 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0005-history-history-Always-save-history-even-in-private-.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0004-history-history-Always-save-history-even-in-private-.patch
@@ -1,7 +1,7 @@
-From b113638a4a3283b95029fe67fe575ae37e1b768a Mon Sep 17 00:00:00 2001
+From 2c34971c30e9a87f6dbe78a2a623dd7ff4ca1970 Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Mon, 24 Aug 2026 21:12:01 +0200
-Subject: [PATCH 05/10] history/history: Always save history, even in private
+Subject: [PATCH 04/10] history/history: Always save history, even in private
  mode
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 05/10] history/history: Always save history, even in private
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/history/history.rs b/src/history/history.rs
-index 90cbfe6a9..b721e04df 100644
+index 4023280bf..59c7b862c 100644
 --- a/src/history/history.rs
 +++ b/src/history/history.rs
-@@ -355,12 +355,12 @@ impl HistoryImpl {
+@@ -354,12 +354,12 @@ impl HistoryImpl {
      /// Because the `path_get_data` function does not return error information,
      /// we cannot provide more detail about the reason for the failure here.
      fn history_file_path(&self) -> std::io::Result<Option<WString>> {
diff --git a/pkgs/by-name/fi/fish-patched/patches/0006-history-turtle-Don-t-block-at-startup-and-wait-until.patch b/pkgs/by-name/fi/fish-patched/patches/0005-history-turtle-Don-t-block-at-startup-and-wait-until.patch
index 00fbc192..24ee9803 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0006-history-turtle-Don-t-block-at-startup-and-wait-until.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0005-history-turtle-Don-t-block-at-startup-and-wait-until.patch
@@ -1,7 +1,7 @@
-From c159bc0d6be03ce566a5a0e144a503d174aee91f Mon Sep 17 00:00:00 2001
+From 84709a258c2e97a30afaa9e8d97a37f0c978567b Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Mon, 24 Aug 2026 21:18:39 +0200
-Subject: [PATCH 06/10] history/turtle: Don't block at startup, and wait until
+Subject: [PATCH 05/10] history/turtle: Don't block at startup, and wait until
  history is loaded
 
 ---
diff --git a/pkgs/by-name/fi/fish-patched/patches/0007-history-turtle-Don-t-reverse-newly-loaded-history.patch b/pkgs/by-name/fi/fish-patched/patches/0006-history-turtle-Don-t-reverse-newly-loaded-history.patch
index 1e75acaf..97f8970a 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0007-history-turtle-Don-t-reverse-newly-loaded-history.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0006-history-turtle-Don-t-reverse-newly-loaded-history.patch
@@ -1,7 +1,7 @@
-From dd41eb10eb76289504ff4c5457434c81112cb008 Mon Sep 17 00:00:00 2001
+From 4222ded83f051088530cfe0f542172011a76a2e2 Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Mon, 24 Aug 2026 21:28:04 +0200
-Subject: [PATCH 07/10] history/turtle: Don't reverse newly loaded history
+Subject: [PATCH 06/10] history/turtle: Don't reverse newly loaded history
 
 ---
  src/history/turtle.rs | 4 ----
diff --git a/pkgs/by-name/fi/fish-patched/patches/0008-history-turtle-Reverse-history-upon-load.patch b/pkgs/by-name/fi/fish-patched/patches/0007-history-turtle-Reverse-history-upon-load.patch
index b7331637..f14833e7 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0008-history-turtle-Reverse-history-upon-load.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0007-history-turtle-Reverse-history-upon-load.patch
@@ -1,7 +1,7 @@
-From 5afaf63f339cfc183a8728363fbb34a710f0e2dc Mon Sep 17 00:00:00 2001
+From c631edf1af801f831561bad4357c2d3f98a4521d Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Mon, 24 Aug 2026 21:32:51 +0200
-Subject: [PATCH 08/10] history/turtle: Reverse history upon load
+Subject: [PATCH 07/10] history/turtle: Reverse history upon load
 
 For _some_ reason, that seems to improve performance by 5x?!
 (I presume I'm just measuring wrong.)
diff --git a/pkgs/by-name/fi/fish-patched/patches/0009-history-turtle-Do-more-work-in-the-command-handler-w.patch b/pkgs/by-name/fi/fish-patched/patches/0008-history-turtle-Do-more-work-in-the-command-handler-w.patch
index 9e5fbecc..ac04333f 100644
--- a/pkgs/by-name/fi/fish-patched/patches/0009-history-turtle-Do-more-work-in-the-command-handler-w.patch
+++ b/pkgs/by-name/fi/fish-patched/patches/0008-history-turtle-Do-more-work-in-the-command-handler-w.patch
@@ -1,7 +1,7 @@
-From b316b4952d46ad964aa8397f9a3e57de8ba98b3b Mon Sep 17 00:00:00 2001
+From 7bb2ba5577638552428e0820c7bea22a8b45d3dd Mon Sep 17 00:00:00 2001
 From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
 Date: Mon, 24 Aug 2026 21:43:45 +0200
-Subject: [PATCH 09/10] history/turtle: Do more work in the command handler,
+Subject: [PATCH 08/10] history/turtle: Do more work in the command handler,
  when loading history
 
 ---