h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 10:01:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

uvar migration: remove extra message if there were no color uvars

Browse Source
This commit is contained in:
Johannes Altmanninger
2025-12-27 17:44:34 +01:00
parent 3105f88622
commit 3c77a67668
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/functions/__fish_theme_migrate.fish
View File

@@ -10,7 +10,8 @@ function __fish_theme_migrate
set -l removing_uvars false set -l removing_uvars false
set -l msg set -l msg
# Copy legacy uvars to globals. # Copy legacy uvars to globals.
if set -l theme_uvars (__fish_theme_variables --universal) set -l theme_uvars (__fish_theme_variables --universal)
if set -q theme_uvars[1]
set removing_uvars true set removing_uvars true
set -l msg_suffix . set -l msg_suffix .
if not __fish_config_theme_uvars_subset_of_historical_default $theme_uvars if not __fish_config_theme_uvars_subset_of_historical_default $theme_uvars

2
tests/checks/__fish_theme_migrate.fish
View File

@@ -100,8 +100,6 @@ echo no default universal variables
provoke-migration provoke-migration
$fish -c __fish_theme_migrate $fish -c __fish_theme_migrate
# CHECK: {{\x1b\[1m}}fish:{{\x1b\[m}} {{upgraded.*}} # CHECK: {{\x1b\[1m}}fish:{{\x1b\[m}} {{upgraded.*}}
# CHECK: {{.*Color.*no.longer.*universal.*}}
# CHECK: {{.*restart.*}}
# CHECK: {{.*fish_key_bindings.*no.longer.*universal.*}} # CHECK: {{.*fish_key_bindings.*no.longer.*universal.*}}
# CHECK: Migrated {{.*}} {{\S*}}/xdg_config_home/fish/conf.d/fish_frozen_key_bindings.fish{{\x1b\[m}} # CHECK: Migrated {{.*}} {{\S*}}/xdg_config_home/fish/conf.d/fish_frozen_key_bindings.fish{{\x1b\[m}}
# CHECK: {{.*help relnotes.*}} # CHECK: {{.*help relnotes.*}}