From c86b8c8130136eb04b440a910b2e762e29c979c8 Mon Sep 17 00:00:00 2001 From: Tiago de Paula Date: Sun, 25 Jan 2026 03:13:35 -0300 Subject: [PATCH] completion/quilt: make subcommands exclusive Includes the missing `revert` command. Part of #12370 --- localization/po/de.po | 3 ++ localization/po/en.po | 3 ++ localization/po/fr.po | 3 ++ localization/po/pl.po | 3 ++ localization/po/pt_BR.po | 3 ++ localization/po/sv.po | 3 ++ localization/po/zh_CN.po | 3 ++ localization/po/zh_TW.po | 3 ++ share/completions/quilt.fish | 101 +++++++++++++++++++++++------------ 9 files changed, 92 insertions(+), 33 deletions(-) diff --git a/localization/po/de.po b/localization/po/de.po index 2580d9a12..505a2c97b 100644 --- a/localization/po/de.po +++ b/localization/po/de.po @@ -51541,6 +51541,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/en.po b/localization/po/en.po index edc8a00f1..31a39110a 100644 --- a/localization/po/en.po +++ b/localization/po/en.po @@ -51539,6 +51539,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/fr.po b/localization/po/fr.po index 07400edb0..d1cc32ca4 100644 --- a/localization/po/fr.po +++ b/localization/po/fr.po @@ -51670,6 +51670,9 @@ msgstr "Inverser une validation existante" msgid "Revert back to given revision" msgstr "Revenir à la révision spécifiée" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/pl.po b/localization/po/pl.po index 7cd390606..aeb725b50 100644 --- a/localization/po/pl.po +++ b/localization/po/pl.po @@ -51535,6 +51535,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/pt_BR.po b/localization/po/pt_BR.po index 9b5c9ec50..d2c0f28a2 100644 --- a/localization/po/pt_BR.po +++ b/localization/po/pt_BR.po @@ -51540,6 +51540,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/sv.po b/localization/po/sv.po index a526d3bb1..94a17ae48 100644 --- a/localization/po/sv.po +++ b/localization/po/sv.po @@ -51536,6 +51536,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/zh_CN.po b/localization/po/zh_CN.po index db38877b9..6d1d604dc 100644 --- a/localization/po/zh_CN.po +++ b/localization/po/zh_CN.po @@ -51568,6 +51568,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/localization/po/zh_TW.po b/localization/po/zh_TW.po index 58a48d977..9936bf2c8 100644 --- a/localization/po/zh_TW.po +++ b/localization/po/zh_TW.po @@ -51545,6 +51545,9 @@ msgstr "" msgid "Revert back to given revision" msgstr "" +msgid "Revert file changes in patch" +msgstr "" + msgid "Revert to an older installation of composer" msgstr "" diff --git a/share/completions/quilt.fish b/share/completions/quilt.fish index 8a3953c1a..a2bad2969 100644 --- a/share/completions/quilt.fish +++ b/share/completions/quilt.fish @@ -1,100 +1,135 @@ # completions for quilt version 0.69 +complete -c quilt -f + # quilt [command] -h -complete -c quilt -s h -d 'Show help' +set -l commands (string match --all --regex '\S+' ' + add + annotate + applied + delete + diff + edit + files + fold + fork + graph + grep + header + import + mail + new + next + patches + pop + previous + push + refresh + remove + rename + revert + series + setup + snapshot + top + unapplied + upgrade +') +complete -c quilt -n "__fish_seen_subcommand_from $commands" -s h -d 'Show help' -f # quilt [--quiltrc file] [--trace] command [options] -complete -c quilt -l quiltrc -r --no-file -d 'Config file to use' -complete -c quilt -l trace -r --no-file -d 'Trace internal shell commands (bash -x)' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -l quiltrc -d 'Config file to use' -f +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -l trace -d 'Trace internal shell commands (bash -x)' -f # quilt --version -complete -c quilt -l version -d 'Show version' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -l version -d 'Show version' -f # quilt add [-P patch] {file} ... -complete -c quilt -a add -r -d 'Add files to patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a add -d 'Add files to patch' -f # quilt annotate [-P patch] {file} -complete -c quilt -a annotate -r -d 'Show which patches modify which lines in file' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a annotate -d 'Show which patches modify which lines in file' -f # quilt applied [patch] -complete -c quilt -a applied -r -d 'List applied patches in the stack' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a applied -d 'List applied patches in the stack' -f # quilt delete [-r] [--backup] [patch|-n] -complete -c quilt -a delete -r -d 'Remove patch from the series' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a delete -d 'Remove patch from the series' -f # quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color[=always|auto|never]] [file ...] -complete -c quilt -a diff -r -d 'Diff files in patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a diff -d 'Diff files in patch' -f # quilt edit file ... -complete -c quilt -a edit -r -d 'Edit files in $EDITOR' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a edit -d 'Edit files in $EDITOR' -f # quilt files [-v] [-a] [-l] [--combine patch] [patch] -complete -c quilt -a files -r -d 'Lists files changed by patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a files -d 'Lists files changed by patch' -f # quilt fold [-R] [-q] [-f] [-p strip-level] -complete -c quilt -a fold -r -d 'Integrate patch from stdin into the topmost patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a fold -d 'Integrate patch from stdin into the topmost patch' -f # quilt fork [new_name] -complete -c quilt -a fork -r --no-file -d 'Fork the topmost patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a fork -d 'Fork the topmost patch' -f # quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] [-T ps] [patch] -complete -c quilt -a graph -r --no-file -d 'Visualize patch dependencies using dot' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a graph -d 'Visualize patch dependencies using dot' -f # quilt grep [-h|options] {pattern} -complete -c quilt -a grep -r --no-file -d 'Search through source files' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a grep -d 'Search through source files' -f # quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-trailing-whitespace] [patch] -complete -c quilt -a header -r --no-file -d 'Print/change the header of patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a header -d 'Print/change the header of patch' -f # quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ... -complete -c quilt -a import -r -d 'Import external patches' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a import -d 'Import external patches' -f # quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] [--reply-to message] [--charset ...] [--signature file] [first_patch [last_patch]] -complete -c quilt -a mail -r -d 'Create or send mail messages from patches' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a mail -d 'Create or send mail messages from patches' -f # quilt new [-p n] {patchname} -complete -c quilt -a new -r -d 'Start a new topmost patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a new -d 'Start a new topmost patch' -f # quilt next [patch] -complete -c quilt -a next -r -d 'Name of patch after the topmost/given patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a next -d 'Name of patch after the topmost/given patch' -f # quilt patches [-v] [--color[=always|auto|never]] {file} [files...] -complete -c quilt -a patches -r -d 'List patches that modify the file(s)' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a patches -d 'List patches that modify the file(s)' -f # quilt pop [-afRqv] [--refresh] [num|patch] -complete -c quilt -a pop -r -d 'Unapply patches from the stack' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a pop -d 'Unapply patches from the stack' -f # quilt previous [patch] -complete -c quilt -a previous -r -d 'Name of patch before the topmost/given patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a previous -d 'Name of patch before the topmost/given patch' -f # quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-rejects] [--color[=always|auto|never]] [--refresh] [num|patch] -complete -c quilt -a push -r -d 'Apply patches from the series' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a push -d 'Apply patches from the series' -f # quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch] -complete -c quilt -a refresh -r -d 'Update patch with changes from source' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a refresh -d 'Update patch with changes from source' -f # quilt remove [-P patch] {file} ... -complete -c quilt -a remove -r -d 'Remove files from the patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a remove -d 'Remove files from the patch' -f # quilt rename [-P patch] new_name -complete -c quilt -a rename -r -d 'Rename the topmost/given patch' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a rename -d 'Rename the topmost/given patch' -f # quilt revert [-P patch] {file} ... +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a revert -d 'Revert file changes in patch' -f # quilt series [--color[=always|auto|never]] [-v] -complete -c quilt -a series -r --no-file -d 'List all patches in the series' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a series -d 'List all patches in the series' -f # quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--spec-filter FILTER] [--slow|--fast] {specfile|seriesfile} -complete -c quilt -a setup -r -d 'Initializes a source tree from an rpm spec or a quilt series' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a setup -d 'Initializes a source tree from an rpm spec or a quilt series' -f # quilt snapshot [-d] -complete -c quilt -a snapshot -r --no-file -d 'Take a snapshot of the working state' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a snapshot -d 'Take a snapshot of the working state' -f # quilt top -complete -c quilt -a top -d 'Name of topmost patch in the stack' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a top -d 'Name of topmost patch in the stack' -f # quilt unapplied [patch] -complete -c quilt -a unapplied -r -d 'List unapplied patches in the series' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a unapplied -d 'List unapplied patches in the series' -f # quilt upgrade -complete -c quilt -a upgrade -d 'Upgrade meta-data from older version of quilt' +complete -c quilt -n "not __fish_seen_subcommand_from $commands" -a upgrade -d 'Upgrade meta-data from older version of quilt' -f