From f958957f9e6bcfad597de23a2599eb69c5806d4d Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Sun, 5 May 2024 07:17:52 -0700
Subject: [PATCH] cli: drop support for old `ui.default-revset` config

We replaced it by `revsets.log` in 0.8.0, which is long enough that
users should have been able to switch.
---
 CHANGELOG.md        | 3 +++
 lib/src/settings.rs | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e432f64bd..1ee63d87e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking changes
 
+* Dropped support for `ui.default-revset` config (replaced by `revsets.log` in
+  0.8.0).
+
 ### Deprecations
 
 ### New features
diff --git a/lib/src/settings.rs b/lib/src/settings.rs
index 380b305b4..f9466807d 100644
--- a/lib/src/settings.rs
+++ b/lib/src/settings.rs
@@ -205,12 +205,9 @@ impl UserSettings {
     }
 
     pub fn default_revset(&self) -> String {
-        self.config.get_string("revsets.log").unwrap_or_else(|_| {
-            // For compatibility with old config files (<0.8.0)
-            self.config
-                .get_string("ui.default-revset")
-                .unwrap_or_else(|_| "@ | ancestors(immutable_heads().., 2) | trunk()".to_string())
-        })
+        self.config
+            .get_string("revsets.log")
+            .unwrap_or_else(|_| "@ | ancestors(immutable_heads().., 2) | trunk()".to_string())
     }
 
     pub fn signature(&self) -> Signature {