mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 12:55:47 +02:00
Filter out deprecated user config fields from generated Config.md (#4416)
- **PR Description** This removes generated Config.md entries that are contain the word: `deprecated` (case insensitive) anywhere in their header comment. I think adding in deprecated configs into the reference config clutters it at best, and encourages users to use those configs at worst. They are still going to be validated by the schema, but this PR removes them from the generated config. I also added in the missing `deprecated` yaml tags in our user config in anticipation of https://github.com/invopop/jsonschema/pull/79 getting merged.
This commit is contained in:
commit
67b0db0bd8
3 changed files with 11 additions and 49 deletions
|
@ -40,10 +40,6 @@ gui:
|
||||||
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color
|
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-author-color
|
||||||
authorColors: {}
|
authorColors: {}
|
||||||
|
|
||||||
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
|
||||||
# Deprecated: use branchColorPatterns instead
|
|
||||||
branchColors: {}
|
|
||||||
|
|
||||||
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
||||||
branchColorPatterns: {}
|
branchColorPatterns: {}
|
||||||
|
|
||||||
|
@ -200,9 +196,6 @@ gui:
|
||||||
# If true, show jump-to-window keybindings in window titles.
|
# If true, show jump-to-window keybindings in window titles.
|
||||||
showPanelJumps: true
|
showPanelJumps: true
|
||||||
|
|
||||||
# Deprecated: use nerdFontsVersion instead
|
|
||||||
showIcons: false
|
|
||||||
|
|
||||||
# Nerd fonts version to use.
|
# Nerd fonts version to use.
|
||||||
# One of: '2' | '3' | empty string (default)
|
# One of: '2' | '3' | empty string (default)
|
||||||
# If empty, do not show icons.
|
# If empty, do not show icons.
|
||||||
|
@ -347,10 +340,6 @@ git:
|
||||||
# Command used when displaying the current branch git log in the main window
|
# Command used when displaying the current branch git log in the main window
|
||||||
branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
|
branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
|
||||||
|
|
||||||
# Command used to display git log of all branches in the main window.
|
|
||||||
# Deprecated: Use `allBranchesLogCmds` instead.
|
|
||||||
allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium
|
|
||||||
|
|
||||||
# Commands used to display git log of all branches in the main window, they will be cycled in order of appearance (array of strings)
|
# Commands used to display git log of all branches in the main window, they will be cycled in order of appearance (array of strings)
|
||||||
allBranchesLogCmds: []
|
allBranchesLogCmds: []
|
||||||
|
|
||||||
|
@ -375,19 +364,6 @@ git:
|
||||||
|
|
||||||
# Config for showing the log in the commits view
|
# Config for showing the log in the commits view
|
||||||
log:
|
log:
|
||||||
# One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'
|
|
||||||
# 'topo-order' makes it easier to read the git log graph, but commits may not
|
|
||||||
# appear chronologically. See https://git-scm.com/docs/
|
|
||||||
#
|
|
||||||
# Deprecated: Configure this with `Log menu -> Commit sort order` (<c-l> in the commits window by default).
|
|
||||||
order: topo-order
|
|
||||||
|
|
||||||
# This determines whether the git graph is rendered in the commits panel
|
|
||||||
# One of 'always' | 'never' | 'when-maximised'
|
|
||||||
#
|
|
||||||
# Deprecated: Configure this with `Log menu -> Show git graph` (<c-l> in the commits window by default).
|
|
||||||
showGraph: always
|
|
||||||
|
|
||||||
# displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
|
# displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
|
||||||
showWholeGraph: false
|
showWholeGraph: false
|
||||||
|
|
||||||
|
@ -449,24 +425,6 @@ os:
|
||||||
# Command for opening a link. Should contain "{{link}}".
|
# Command for opening a link. Should contain "{{link}}".
|
||||||
openLink: ""
|
openLink: ""
|
||||||
|
|
||||||
# EditCommand is the command for editing a file.
|
|
||||||
# Deprecated: use Edit instead. Note that semantics are different:
|
|
||||||
# EditCommand is just the command itself, whereas Edit contains a
|
|
||||||
# "{{filename}}" variable.
|
|
||||||
editCommand: ""
|
|
||||||
|
|
||||||
# EditCommandTemplate is the command template for editing a file
|
|
||||||
# Deprecated: use EditAtLine instead.
|
|
||||||
editCommandTemplate: ""
|
|
||||||
|
|
||||||
# OpenCommand is the command for opening a file
|
|
||||||
# Deprecated: use Open instead.
|
|
||||||
openCommand: ""
|
|
||||||
|
|
||||||
# OpenLinkCommand is the command for opening a link
|
|
||||||
# Deprecated: use OpenLink instead.
|
|
||||||
openLinkCommand: ""
|
|
||||||
|
|
||||||
# CopyToClipboardCmd is the command for copying to clipboard.
|
# CopyToClipboardCmd is the command for copying to clipboard.
|
||||||
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
|
# See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
|
||||||
copyToClipboardCmd: ""
|
copyToClipboardCmd: ""
|
||||||
|
|
|
@ -54,7 +54,7 @@ type GuiConfig struct {
|
||||||
AuthorColors map[string]string `yaml:"authorColors"`
|
AuthorColors map[string]string `yaml:"authorColors"`
|
||||||
// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
||||||
// Deprecated: use branchColorPatterns instead
|
// Deprecated: use branchColorPatterns instead
|
||||||
BranchColors map[string]string `yaml:"branchColors"`
|
BranchColors map[string]string `yaml:"branchColors" jsonschema:"deprecated"`
|
||||||
// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-branch-color
|
||||||
BranchColorPatterns map[string]string `yaml:"branchColorPatterns"`
|
BranchColorPatterns map[string]string `yaml:"branchColorPatterns"`
|
||||||
// The number of lines you scroll by when scrolling the main window
|
// The number of lines you scroll by when scrolling the main window
|
||||||
|
@ -131,7 +131,7 @@ type GuiConfig struct {
|
||||||
// If true, show jump-to-window keybindings in window titles.
|
// If true, show jump-to-window keybindings in window titles.
|
||||||
ShowPanelJumps bool `yaml:"showPanelJumps"`
|
ShowPanelJumps bool `yaml:"showPanelJumps"`
|
||||||
// Deprecated: use nerdFontsVersion instead
|
// Deprecated: use nerdFontsVersion instead
|
||||||
ShowIcons bool `yaml:"showIcons"`
|
ShowIcons bool `yaml:"showIcons" jsonschema:"deprecated"`
|
||||||
// Nerd fonts version to use.
|
// Nerd fonts version to use.
|
||||||
// One of: '2' | '3' | empty string (default)
|
// One of: '2' | '3' | empty string (default)
|
||||||
// If empty, do not show icons.
|
// If empty, do not show icons.
|
||||||
|
@ -252,7 +252,7 @@ type GitConfig struct {
|
||||||
BranchLogCmd string `yaml:"branchLogCmd"`
|
BranchLogCmd string `yaml:"branchLogCmd"`
|
||||||
// Command used to display git log of all branches in the main window.
|
// Command used to display git log of all branches in the main window.
|
||||||
// Deprecated: Use `allBranchesLogCmds` instead.
|
// Deprecated: Use `allBranchesLogCmds` instead.
|
||||||
AllBranchesLogCmd string `yaml:"allBranchesLogCmd"`
|
AllBranchesLogCmd string `yaml:"allBranchesLogCmd" jsonschema:"deprecated"`
|
||||||
// Commands used to display git log of all branches in the main window, they will be cycled in order of appearance (array of strings)
|
// Commands used to display git log of all branches in the main window, they will be cycled in order of appearance (array of strings)
|
||||||
AllBranchesLogCmds []string `yaml:"allBranchesLogCmds"`
|
AllBranchesLogCmds []string `yaml:"allBranchesLogCmds"`
|
||||||
// If true, do not spawn a separate process when using GPG
|
// If true, do not spawn a separate process when using GPG
|
||||||
|
@ -587,19 +587,19 @@ type OSConfig struct {
|
||||||
// Deprecated: use Edit instead. Note that semantics are different:
|
// Deprecated: use Edit instead. Note that semantics are different:
|
||||||
// EditCommand is just the command itself, whereas Edit contains a
|
// EditCommand is just the command itself, whereas Edit contains a
|
||||||
// "{{filename}}" variable.
|
// "{{filename}}" variable.
|
||||||
EditCommand string `yaml:"editCommand,omitempty"`
|
EditCommand string `yaml:"editCommand,omitempty" jsonschema:"deprecated"`
|
||||||
|
|
||||||
// EditCommandTemplate is the command template for editing a file
|
// EditCommandTemplate is the command template for editing a file
|
||||||
// Deprecated: use EditAtLine instead.
|
// Deprecated: use EditAtLine instead.
|
||||||
EditCommandTemplate string `yaml:"editCommandTemplate,omitempty"`
|
EditCommandTemplate string `yaml:"editCommandTemplate,omitempty" jsonschema:"deprecated"`
|
||||||
|
|
||||||
// OpenCommand is the command for opening a file
|
// OpenCommand is the command for opening a file
|
||||||
// Deprecated: use Open instead.
|
// Deprecated: use Open instead.
|
||||||
OpenCommand string `yaml:"openCommand,omitempty"`
|
OpenCommand string `yaml:"openCommand,omitempty" jsonschema:"deprecated"`
|
||||||
|
|
||||||
// OpenLinkCommand is the command for opening a link
|
// OpenLinkCommand is the command for opening a link
|
||||||
// Deprecated: use OpenLink instead.
|
// Deprecated: use OpenLink instead.
|
||||||
OpenLinkCommand string `yaml:"openLinkCommand,omitempty"`
|
OpenLinkCommand string `yaml:"openLinkCommand,omitempty" jsonschema:"deprecated"`
|
||||||
|
|
||||||
// CopyToClipboardCmd is the command for copying to clipboard.
|
// CopyToClipboardCmd is the command for copying to clipboard.
|
||||||
// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
|
// See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
|
||||||
|
|
|
@ -205,6 +205,10 @@ func recurseOverSchema(rootSchema, schema *jsonschema.Schema, parent *Node) {
|
||||||
for pair := schema.Properties.Oldest(); pair != nil; pair = pair.Next() {
|
for pair := schema.Properties.Oldest(); pair != nil; pair = pair.Next() {
|
||||||
subSchema := getSubSchema(rootSchema, schema, pair.Key)
|
subSchema := getSubSchema(rootSchema, schema, pair.Key)
|
||||||
|
|
||||||
|
if strings.Contains(strings.ToLower(subSchema.Description), "deprecated") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
node := Node{
|
node := Node{
|
||||||
Name: pair.Key,
|
Name: pair.Key,
|
||||||
Description: subSchema.Description,
|
Description: subSchema.Description,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue