From f741102f83d057d383314db569293508dbb6a72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <jakub@okonski.org>
Date: Mon, 14 Oct 2024 08:55:04 +0200
Subject: [PATCH] cargo: bump scm-record to 0.4.0

---
 CHANGELOG.md |  4 ++++
 Cargo.lock   | 11 ++++++-----
 Cargo.toml   |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b56fa77db7..c157282605 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * Error on `trunk()` revset resolution is now handled gracefully.
   [#4616](https://github.com/martinvonz/jj/issues/4616)
 
+* Updated the built-in diff editor `scm-record` to version 
+  [0.4.0](https://github.com/arxanas/scm-record/releases/tag/v0.4.0), which
+  includes multiple fixes.
+
 ## [0.22.0] - 2024-10-02
 
 ### Breaking changes
diff --git a/Cargo.lock b/Cargo.lock
index 2bdf0ee2d4..04d05d1a45 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2587,19 +2587,20 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.26.3"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
+checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3"
 dependencies = [
  "bitflags 2.6.0",
  "cassowary",
  "compact_str",
  "crossterm",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "lru",
  "paste",
  "stability",
  "strum",
+ "strum_macros",
  "unicode-segmentation",
  "unicode-truncate",
  "unicode-width",
@@ -2784,9 +2785,9 @@ checksum = "088c5d71572124929ea7549a8ce98e1a6fd33d0a38367b09027b382e67c033db"
 
 [[package]]
 name = "scm-record"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1bf431016c7a34038f440696c672f0fee1a15d6aea31fe100df6974a35bf5f"
+checksum = "0d344fd2a7dd1580458c344f977c64ce7b1b1ad1d4f959ab6d2ca2cbab44de69"
 dependencies = [
  "cassowary",
  "crossterm",
diff --git a/Cargo.toml b/Cargo.toml
index 7feb5fbd1e..cc384a8fd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -93,7 +93,7 @@ ref-cast = "1.0.23"
 regex = "1.11.0"
 rpassword = "7.3.1"
 rustix = { version = "0.38.37", features = ["fs"] }
-scm-record = "0.3.0"
+scm-record = "0.4.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.128"
 slab = "0.4.9"