mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 10:45:16 -07:00
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:
parent
a288b4f214
commit
24c9561a68
2
.github/workflows/vim-patches.yml
vendored
2
.github/workflows/vim-patches.yml
vendored
@ -40,7 +40,7 @@ jobs:
|
||||
id: update-version
|
||||
run: |
|
||||
git checkout -b ${VERSION_BRANCH}
|
||||
nvim -i NONE -u NONE --headless +'luafile scripts/vimpatch.lua' +q
|
||||
nvim -V1 -es -i NONE +'luafile scripts/vimpatch.lua' +q
|
||||
printf '::set-output name=NEW_PATCHES::%s\n' $([ -z "$(git diff)" ]; echo $?)
|
||||
|
||||
- name: Automatic PR
|
||||
|
@ -339,6 +339,7 @@ local function validate_link(node, bufnr, fname)
|
||||
return helppage, tagname, ignored
|
||||
end
|
||||
|
||||
-- TODO: port the logic from scripts/check_urls.vim
|
||||
local function validate_url(text, fname)
|
||||
local ignored = false
|
||||
if vim.fs.basename(fname) == 'pi_netrw.txt' then
|
||||
|
@ -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() {
|
||||
|
||||
# Gets all Vim commits since the "start" commit.
|
||||
list_vim_commits() { (
|
||||
cd "${VIM_SOURCE_DIR}" && git log --reverse v8.0.0000..HEAD "$@"
|
||||
cd "${VIM_SOURCE_DIR}" && git log --reverse v8.1.0000..HEAD "$@"
|
||||
) }
|
||||
|
||||
# Prints all (sorted) "vim-patch:xxx" tokens found in the Nvim git log.
|
||||
@ -488,7 +488,7 @@ list_vimpatch_tokens() {
|
||||
list_vimpatch_numbers() {
|
||||
# Transform "vim-patch:X.Y.ZZZZ" to "ZZZZ".
|
||||
list_vimpatch_tokens | while read -r vimpatch_token; do
|
||||
echo "$vimpatch_token" | grep '8\.0\.' | sed 's/.*vim-patch:8\.0\.\([0-9a-z]\+\).*/\1/'
|
||||
echo "$vimpatch_token" | grep '8\.1\.' | sed -E 's/.*vim-patch:8\.1\.([0-9a-z]+).*/\1/'
|
||||
done
|
||||
}
|
||||
|
||||
@ -585,7 +585,7 @@ _set_missing_vimpatches() {
|
||||
else
|
||||
info=${line#* }
|
||||
if [[ -n $info ]]; then
|
||||
# Remove any "patch 8.0.0902: " prefixes, and prefix with ": ".
|
||||
# Remove any "patch 8.1.0902: " prefixes, and prefix with ": ".
|
||||
info=": ${info#patch*: }"
|
||||
fi
|
||||
fi
|
||||
@ -628,7 +628,7 @@ show_vimpatches() {
|
||||
|
||||
Instructions:
|
||||
To port one of the above patches to Neovim, execute this script with the patch revision as argument and follow the instructions, e.g.
|
||||
'${BASENAME} -p v8.0.1234', or '${BASENAME} -P v8.0.1234'
|
||||
'${BASENAME} -p v8.1.1234', or '${BASENAME} -P v8.1.1234'
|
||||
|
||||
NOTE: Please port the _oldest_ patch if you possibly can.
|
||||
You can use '${BASENAME} -l path/to/file' to see what patches are missing for a file.
|
||||
|
@ -1,7 +1,7 @@
|
||||
-- Updates version.c list of applied Vim patches.
|
||||
--
|
||||
-- Usage:
|
||||
-- VIM_SOURCE_DIR=~/neovim/.vim-src/ nvim -i NONE -u NONE --headless +'luafile ./scripts/vimpatch.lua' +q
|
||||
-- VIM_SOURCE_DIR=~/neovim/.vim-src/ nvim -V1 -es -i NONE +'luafile ./scripts/vimpatch.lua' +q
|
||||
|
||||
local nvim = vim.api
|
||||
|
||||
@ -22,12 +22,13 @@ end
|
||||
-- Generates the lines to be inserted into the src/version.c
|
||||
-- `included_patches[]` definition.
|
||||
local function gen_version_c_lines()
|
||||
-- Set of merged Vim 8.0.zzzz patch numbers.
|
||||
-- Set of merged Vim 8.1.zzzz patch numbers.
|
||||
local merged_patch_numbers = {}
|
||||
local highest = 0
|
||||
for _, n in ipairs(vimpatch_sh_list_numbers()) do
|
||||
n = tonumber(n)
|
||||
if n then
|
||||
merged_patch_numbers[tonumber(n)] = true
|
||||
merged_patch_numbers[n] = true
|
||||
highest = math.max(highest, n)
|
||||
end
|
||||
end
|
||||
|
1132
src/nvim/version.c
1132
src/nvim/version.c
File diff suppressed because it is too large
Load Diff
@ -14,7 +14,7 @@ extern char *longVersion;
|
||||
|
||||
// Values that change for a new release
|
||||
#define VIM_VERSION_MAJOR 8
|
||||
#define VIM_VERSION_MINOR 0
|
||||
#define VIM_VERSION_MINOR 1
|
||||
|
||||
// Values based on the above
|
||||
#define VIM_VERSION_MAJOR_STR STR(VIM_VERSION_MAJOR)
|
||||
|
Loading…
Reference in New Issue
Block a user