mirror of
https://github.com/neovim/neovim.git
synced 2025-09-06 19:38:20 +00:00
vim-patch.sh: introduce -L
This commit is contained in:
@@ -21,7 +21,8 @@ usage() {
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " -h Show this message and exit."
|
||||
echo " -l Show list of Vim patches missing from Neovim."
|
||||
echo " -l Show list of missing Vim patches."
|
||||
echo " -L Print missing Vim patches in machine-readable form."
|
||||
echo " -p {vim-revision} Download and generate the specified Vim patch."
|
||||
echo " vim-revision can be a version number '8.0.xxx'"
|
||||
echo " or a valid Git ref (hash, tag, etc.)."
|
||||
@@ -318,11 +319,8 @@ submit_pr() {
|
||||
if [[ ! -f "${NVIM_SOURCE_DIR}/${patch_file}" ]]; then
|
||||
continue
|
||||
fi
|
||||
rm -- "${NVIM_SOURCE_DIR}/${patch_file}"
|
||||
echo "✔ Removed '${NVIM_SOURCE_DIR}/${patch_file}'."
|
||||
echo "✔ Removed '${NVIM_SOURCE_DIR}/${patch_file}'."
|
||||
done
|
||||
}
|
||||
|
||||
done
|
||||
}
|
||||
|
||||
@@ -343,18 +341,27 @@ list_vim_patches() {
|
||||
local vim_tag
|
||||
# This fails for untagged commits (e.g., runtime file updates) so mask the return status
|
||||
vim_tag="$(cd "${VIM_SOURCE_DIR}" && git describe --tags --exact-match "${vim_commit}" 2>/dev/null)" || true
|
||||
if [[ -n "${vim_tag}" ]]; then
|
||||
# Vim version number (not commit hash).
|
||||
local patch_number="${vim_tag:1}" # "v7.4.0001" => "7.4.0001"
|
||||
is_missing="$(echo "$tokens" | >/dev/null 2>&1 grep "vim\-patch:${patch_number}" && echo false || echo true)"
|
||||
vim_commit="${vim_tag#v}"
|
||||
if [[ -n "${vim_tag}" ]]; then
|
||||
# Vim version number (not commit hash).
|
||||
local patch_number="${vim_tag:1}" # "v7.4.0001" => "7.4.0001"
|
||||
is_missing="$(echo "$tokens" | >/dev/null 2>&1 grep "vim\-patch:${patch_number}" && echo false || echo true)"
|
||||
vim_commit="${vim_tag#v}"
|
||||
else
|
||||
# Untagged Vim patch (e.g. runtime updates).
|
||||
# Untagged Vim patch (e.g. runtime updates).
|
||||
is_missing="$(echo "$tokens" | >/dev/null 2>&1 grep "vim\-patch:${vim_commit:0:7}" && echo false || echo true)"
|
||||
fi
|
||||
|
||||
if ! [ "$is_missing" = "false" ]; then
|
||||
echo "${vim_commit}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# Prints a human-formatted list of Vim commits, with instructional messages.
|
||||
show_vim_patches() {
|
||||
get_vim_sources
|
||||
printf "\nVim patches missing from Neovim:\n"
|
||||
|
||||
list_vim_patches | while read vim_commit; do
|
||||
if (cd "${VIM_SOURCE_DIR}" && git --no-pager show --color=never --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then
|
||||
printf " • ${vim_commit} (+runtime)\n"
|
||||
@@ -465,13 +472,17 @@ review_pr() {
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
clean_files
|
||||
}
|
||||
|
||||
while getopts "hlLp:P:g:r:s" opt; do
|
||||
case ${opt} in
|
||||
h)
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
l)
|
||||
show_vim_patches
|
||||
exit 0
|
||||
|
Reference in New Issue
Block a user