kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 21:25:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch.sh: Include upstream summary in commit message

Browse Source 
[ci skip]
This commit is contained in:
James McCoy 2017-12-16 21:42:08 -05:00
parent bfb21f3e01
commit 067bb1e9f4
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/vim-patch.sh
View File

@ -92,8 +92,11 @@ get_vim_sources() {
} }
commit_message() { commit_message() {
printf 'vim-patch:%s\n\n%s\n\n%s' "${vim_version}" \ if [[ -n "$vim_tag" ]]; then
"${vim_message}" "${vim_commit_url}" printf '%s\n\n%s' "${vim_message}" "${vim_commit_url}"
else
printf 'vim-patch:%s\n\n%s\n\n%s' "$vim_version" "$vim_message" "$vim_commit_url"
fi
} }
find_git_remote() { find_git_remote() {
@ -108,22 +111,23 @@ assign_commit_details() {
vim_tag="v${1}" vim_tag="v${1}"
vim_commit=$(cd "${VIM_SOURCE_DIR}" \ vim_commit=$(cd "${VIM_SOURCE_DIR}" \
&& git log -1 --format="%H" "${vim_tag}") && git log -1 --format="%H" "${vim_tag}")
local strip_commit_line=true local munge_commit_line=true
else else
# Interpret parameter as commit hash. # Interpret parameter as commit hash.
vim_version="${1:0:12}" vim_version="${1:0:12}"
vim_tag=
vim_commit=$(cd "${VIM_SOURCE_DIR}" \ vim_commit=$(cd "${VIM_SOURCE_DIR}" \
&& git log -1 --format="%H" "${vim_version}") && git log -1 --format="%H" "${vim_version}")
local strip_commit_line=false local munge_commit_line=false
fi fi
vim_commit_url="https://github.com/vim/vim/commit/${vim_commit}" vim_commit_url="https://github.com/vim/vim/commit/${vim_commit}"
vim_message="$(cd "${VIM_SOURCE_DIR}" \ vim_message="$(cd "${VIM_SOURCE_DIR}" \
&& git log -1 --pretty='format:%B' "${vim_commit}" \ && git log -1 --pretty='format:%B' "${vim_commit}" \
| sed -e 's/\(#[0-9]*\)/vim\/vim\1/g')" | sed -e 's/\(#[0-9]*\)/vim\/vim\1/g')"
if [[ ${strip_commit_line} == "true" ]]; then if [[ ${munge_commit_line} == "true" ]]; then
# Remove first line of commit message. # Remove first line of commit message.
vim_message="$(echo "${vim_message}" | sed -e '1d')" vim_message="$(echo "${vim_message}" | sed -e '1s/^patch /vim-patch:/')"
fi fi
patch_file="vim-${vim_version}.patch" patch_file="vim-${vim_version}.patch"
} }
@ -286,9 +290,10 @@ submit_pr() {
local git_remote local git_remote
git_remote="$(find_git_remote)" git_remote="$(find_git_remote)"
local pr_body local pr_body
pr_body="$(git log --reverse --format='#### %s%n%n%b%n' "${git_remote}"/master..HEAD)" pr_body="$(git log --grep=vim-patch --reverse --format='#### %s%n%n%b%n' "${git_remote}"/master..HEAD)"
local patches local patches
patches=("$(git log --reverse --format='%s' "${git_remote}"/master..HEAD)") # Extract just the "vim-patch:X.Y.ZZZZ" or "vim-patch:sha" portion of each log
patches=("$(git log --grep=vim-patch --reverse --format='%s' "${git_remote}"/master..HEAD | sed 's/: .*//')")
patches=(${patches[@]//vim-patch:}) # Remove 'vim-patch:' prefix for each item in array. patches=(${patches[@]//vim-patch:}) # Remove 'vim-patch:' prefix for each item in array.
local pr_title="${patches[*]}" # Create space-separated string from array. local pr_title="${patches[*]}" # Create space-separated string from array.
pr_title="${pr_title// /,}" # Replace spaces with commas. pr_title="${pr_title// /,}" # Replace spaces with commas.