vim-patch: bump VIM_VERSION from 8.0 => 8.1 #20762

There are 6 remaining 8.0.x patches, tracked in:
https://github.com/neovim/neovim/issues/5431
This commit is contained in:
Justin M. Keyes
2022-10-21 06:56:09 -04:00
committed by GitHub
parent a288b4f214
commit 24c9561a68
6 changed files with 865 additions and 289 deletions

View File

@ -35,7 +35,7 @@ usage() {
echo " -m {vim-revision} List previous (older) missing Vim patches."
echo " -M List all merged patch-numbers (at current v:version)."
echo " -p {vim-revision} Download and generate a Vim patch. vim-revision"
echo " can be a Vim version (8.0.xxx) or a Git hash."
echo " can be a Vim version (8.1.xxx) or a Git hash."
echo " -P {vim-revision} Download, generate and apply a Vim patch."
echo " -g {vim-revision} Download a Vim patch."
echo " -s [pr args] Create a vim-patch pull request."
@ -470,7 +470,7 @@ submit_pr() {
for patch_file in "${patches[@]}"; do
patch_file="vim-${patch_file}.patch"
if [[ ! -f "${NVIM_SOURCE_DIR}/${patch_file}" ]]; then
continue
continue
fi
rm -- "${NVIM_SOURCE_DIR}/${patch_file}"
msg_ok "Removed '${NVIM_SOURCE_DIR}/${patch_file}'."
@ -488,7 +488,7 @@ list_vimpatch_tokens() {
git -C "${NVIM_SOURCE_DIR}" log -E --grep='vim-patch:[^ ,{]{7,}' \
| grep -oE 'vim-patch:[^ ,{:]{7,}' \
| sort \
| uniq \
| uniq \
| sed -nE 's/^(vim-patch:([0-9]+\.[^ ]+|[0-9a-z]{7,7})).*/\1/p'
}
@ -585,7 +585,7 @@ _set_missing_vimpatches() {
if [[ "${tokens[$token]-}" ]]; then
continue
fi
# Get commit hash, and optional info from line. This is used in
# extended mode, and when using e.g. '--format' manually.
vim_commit=${line%% *}
@ -628,7 +628,7 @@ show_vimpatches() {
list_missing_vimpatches 1 "$@" | while read -r vim_commit; do
if [[ "${runtime_commits[$vim_commit]-}" ]]; then
printf ' • %s (+runtime)\n' "${vim_commit}"
else
else
printf ' • %s\n' "${vim_commit}"
fi
done