Code

config: migrate off config.merge()#5015

Code

Merged

yuja merged 7 commits intojj-vcs:mainjj-vcs/jj:mainfrom yuja:push-xyxwvmuoqnxzyuja/jj:push-xyxwvmuoqnxzCopy head branch name to clipboardDec 4, 2024

+168-290

Commits

Commits on Dec 4, 2024

• config: migrate resolved_config_values() to new getter API

  Show description for cae8d55
  yuja

  committed
  cae8d55

• config: remove unneeded Result wrapping from resolved_config_values()

  yuja

  committed
  0a69fb9

• completion: migrate to UserSettings API

  Show description for f10e5d7
  yuja

  committed
  f10e5d7

• completion: remove redundant rebuild of default config

  yuja

  committed
  bb41024

• formatter: migrate tests to be using StackedConfig

  yuja

  committed
  32e1a3e

• cli: migrate remainder of Config::get() to StackedConfig::get()

  yuja

  committed
  2ff8750

• config: remove merge() function which is used only in tests

  yuja

  committed
  aa7d7c8