From 3869b7c2ac9bbe02cfdf85d1628799ba399e8e52 Mon Sep 17 00:00:00 2001 From: Vamsi Avula Date: Tue, 15 Aug 2023 13:26:23 +0530 Subject: [PATCH] cli: refactor default_description to UserSettings --- cli/src/commands/mod.rs | 10 ++-------- lib/src/settings.rs | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 9dd753a94..d44e01301 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -2989,10 +2989,7 @@ fn description_template_for_commit( &[DiffFormat::Summary], )?; let description = if commit.description().is_empty() { - settings - .config() - .get_string("ui.default-description") - .unwrap_or("".to_owned()) + settings.default_description() } else { commit.description().to_owned() }; @@ -3023,10 +3020,7 @@ fn description_template_for_cmd_split( &[DiffFormat::Summary], )?; let description = if overall_commit_description.is_empty() { - settings - .config() - .get_string("ui.default-description") - .unwrap_or("".to_owned()) + settings.default_description() } else { overall_commit_description.to_owned() }; diff --git a/lib/src/settings.rs b/lib/src/settings.rs index e279453db..dac2bf13a 100644 --- a/lib/src/settings.rs +++ b/lib/src/settings.rs @@ -146,6 +146,12 @@ impl UserSettings { .unwrap_or_else(|_| "push-".to_string()) } + pub fn default_description(&self) -> String { + self.config() + .get_string("ui.default-description") + .unwrap_or_default() + } + pub fn default_revset(&self) -> String { self.config.get_string("revsets.log").unwrap_or_else(|_| { // For compatibility with old config files (<0.8.0)