1 files changed, 56 insertions, 3 deletions

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index be7c6fd8a6..0a2b1df197 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -120,9 +120,9 @@ get_vim_sources() {
 
 commit_message() {
   if [[ -n "$vim_tag" ]]; then
-    printf '%s\n%s' "${vim_message}" "${vim_commit_url}"
+    printf '%s\n\n%s\n\n%s' "${vim_message}" "${vim_commit_url}" "${vim_coauthor}"
   else
-    printf 'vim-patch:%s\n\n%s\n%s' "$vim_version" "$vim_message" "$vim_commit_url"
+    printf 'vim-patch:%s\n\n%s\n\n%s\n\n%s' "$vim_version" "$vim_message" "$vim_commit_url" "$vim_coauthor"
   fi
 }
 
@@ -175,6 +175,7 @@ assign_commit_details() {
   vim_commit_url="https://github.com/vim/vim/commit/${vim_commit}"
   vim_message="$(git -C "${VIM_SOURCE_DIR}" log -1 --pretty='format:%B' "${vim_commit}" \
       | sed -e 's/\(#[0-9]\{1,\}\)/vim\/vim\1/g')"
+  vim_coauthor="$(git -C "${VIM_SOURCE_DIR}" log -1 --pretty='format:Co-authored-by: %an <%ae>' "${vim_commit}")"
   if [[ ${munge_commit_line} == "true" ]]; then
     # Remove first line of commit message.
     vim_message="$(echo "${vim_message}" | sed -e '1s/^patch /vim-patch:/')"
@@ -278,6 +279,53 @@ preprocess_patch() {
     "$file" > "$file".tmp && mv "$file".tmp "$file"
 }
 
+uncrustify_patch() {
+  local commit="$1"
+  local changed_files=()
+  while IFS='' read -r file; do changed_files+=("$file"); done < <(git diff-tree --name-only --no-commit-id -r "${commit}")
+
+  local patch_path=$NVIM_SOURCE_DIR/build/vim_patch
+  rm -rf "$patch_path"
+  mkdir -p "$patch_path"/{before,after,patch}
+
+  git checkout --quiet "$commit"~
+  for file in "${changed_files[@]}"; do
+    if [[ -e $file ]]; then
+      cp "$file" "$patch_path"/before
+    fi
+  done
+
+  git checkout --quiet "$commit"
+  for file in "${changed_files[@]}"; do
+    if [[ -e $file ]]; then
+      cp "$file" "$patch_path"/after
+    fi
+  done
+
+  # If the difference are drastic enough uncrustify may need to be used more
+  # than once. This is obviously a bug that needs to be fixed on uncrustify's
+  # end, but in the meantime this workaround is sufficient.
+  for _ in {1..2}; do
+    uncrustify -c "$NVIM_SOURCE_DIR"/src/uncrustify.cfg -q --replace --no-backup "$patch_path"/{before,after}/*.[ch]
+  done
+
+  for file in "${changed_files[@]}"; do
+    local basename
+    basename=$(basename "$file")
+    local before=$patch_path/before/$basename
+    local after=$patch_path/after/$basename
+    local patchfile="$patch_path"/patch/"$basename".patch
+    if [[ ! -e $before ]] || [[ ! -e $after ]]; then
+      continue
+    fi
+    git --no-pager diff --no-index --patch --unified=5 --color=never "$before" "$after" > "$patchfile"
+    sed -E "s|$before|/$file|g" -i "$patchfile"
+    sed -E "s|$after|/$file|g" -i "$patchfile"
+  done
+
+  cat "$patch_path"/patch/*.patch
+}
+
 get_vimpatch() {
   get_vim_sources
 
@@ -286,7 +334,12 @@ get_vimpatch() {
   msg_ok "Found Vim revision '${vim_commit}'."
 
   local patch_content
-  patch_content="$(git --no-pager show --unified=5 --color=never -1 --pretty=medium "${vim_commit}")"
+  if check_executable uncrustify; then
+    patch_content="$(uncrustify_patch "${vim_commit}")"
+    git switch --quiet master
+  else
+    patch_content="$(git --no-pager show --unified=5 --color=never -1 --pretty=medium "${vim_commit}")"
+  fi
 
   cd "${NVIM_SOURCE_DIR}"