aboutsummaryrefslogtreecommitdiff
path: root/scripts/vim-patch.sh
Commit message (Collapse)AuthorAge
...
* vim-patch.sh: Fix PR subject with multiple patchesJames McCoy2020-09-04
|
* vim-patch.sh: fix bash version-check message #12398Poh Zi How2020-05-31
|
* Merge pull request #11764 from blueyed/vim-patch-usageJames McCoy2020-05-15
|\
| * docDaniel Hahler2020-01-26
| |
| * set -u before returnDaniel Hahler2020-01-26
| | | | | | | | Follow up to a4d21f059.
| * scripts/vim-patch.sh: add -m to usageDaniel Hahler2020-01-26
| | | | | | | | Ref: https://github.com/neovim/neovim/pull/11514#issuecomment-569476828
* | Merge pull request #12081 from xylix/bash-version-checkJames McCoy2020-04-21
|\ \
| * | Apply suggestions from code reviewKerkko Pelttari2020-04-07
| | | | | | | | | | | | | | | | | | Improve error message for unsupported bash version, use double square bracket operator Co-Authored-By: Daniel Hahler <github@thequod.de>
| * | Check for bash version in vim-patch.shKerkko Pelttari2020-04-06
| |/
* / vim-patch.sh: Fix creation of commit list for PR reviewJames McCoy2020-03-31
|/ | | | [ci skip]
* terminal: absolute CWD in term:// URI #11289Chris LaRose2020-01-26
| | | | | | | | | This makes it possible to restore the working directory of :terminal buffers when reading those buffers from a session file. Fixes #11288 Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
* fixup! fixup! vim-patch.sh: list related missing Vim patches [ci skip] #11514Jan Edmund Lazo2020-01-19
|
* vim-patch.sh: fix for bash 4.3 or older #11700Jan Edmund Lazo2020-01-11
|
* fixup! vim-patch.sh: list related missing Vim patches [ci skip] #11514Jan Edmund Lazo2019-12-29
|
* Fix scripts/vim-patch.sh for Bash 4.3Daniel Hahler2019-12-25
| | | | Ref: https://github.com/neovim/neovim/pull/11514#issuecomment-568780231
* vim-patch.sh: list related missing Vim patches [ci skip] #11514Daniel Hahler2019-12-24
| | | | | | | | * scripts/vim-patch.sh: factor out _set_tokens_and_tags This allows for caching `$tokens` and `$vim_commit_tags`, which will become relevant with the next commit adding `list_missing_previous_vimpatches_for_patch`.
* vim-patch.sh: multiline printf -> heredoc (#11351)Marco Hinz2019-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following script is cut out from vim-patch.sh: ```sh #!/usr/bin/env bash BASENAME=vim-patch.sh printf "\nInstructions: To port one of the above patches to Neovim, execute this script with the patch revision as argument and follow the instructions, e.g. '%s -p v8.0.1234', or '%s -P v8.0.1234' NOTE: Please port the _oldest_ patch if you possibly can. You can use '%s -l path/to/file' to see what patches are missing for a file. " "${BASENAME}" "${BASENAME}" "${BASENAME}" ``` The code itself should be correct, but shellcheck 0.7.0 says: ``` In /tmp/test.sh line 5: printf "\nInstructions: ^-- SC2183: This format string has 2 variables, but is passed 3 arguments. ``` We also had a problem before that a `%s` was added, but the accompanying argument to printf was forgotten. Using a heredoc is less error-prone, since we insert variables directly.
* vim-patch.sh: add missing argumentMarco Hinz2019-11-08
| | | | [skip ci]
* scripts/vim-patch.sh: lazily update Vim source (#11207)Daniel Hahler2019-10-16
| | | | | | This gets done only initially, for `-l`, and when a commit cannot be found. Also provide more compact instructions with `-l` / `show_vimpatches`.
* scripts/vim-patch.sh -l: display commit subjectsDaniel Hahler2019-10-13
| | | | Closes https://github.com/neovim/neovim/pull/11182.
* vim-patch.sh: fix "unbound variable" error with Bash < 4.4 [ci skip] (#10917)Daniel Hahler2019-09-03
| | | Ref: https://github.com/neovim/neovim/pull/10888#issuecomment-526774032
* scripts/vim-patch.sh: massage args for git-log [ci skip] (#10888)Daniel Hahler2019-08-30
| | | | | | | | | | Replace "src/nvim/" => "src/". Replace ".*/.vim-src/" => "". This allows to use tab completion based on existing files in Neovim's source, or via .vim-src. Previously you would have to typically remove the "nvim/" part manually yourself.
* Merge #10646 'vim-patch: runtime patches'Justin M. Keyes2019-08-01
|\
| * runtime: move matchit.vim to /pack/dist/opt/Justin M. Keyes2019-08-01
| | | | | | | | | | | | Align matchit.vim with upstream Vim. We don't want to maintain a fork of matchit.vim; our small changes should be sent to https://github.com/chrisbra/matchit
* | vim-patch: handle tags, pass through git-log options (#10140)Daniel Hahler2019-07-30
|/ | | | | | | | | | | | | | | | * scripts/vim-patch.sh: fall back to "origin" for remote Without this, it would fail e.g. with a locally cloned repo of Neovim. * scripts/vim-patch.sh: assign_commit_details: handle tags [ci skip] - Handle "v" prefix from Vim tags. - Exit in case of error therein already. * -l/-L: pass through git-log options [ci skip] This allows for only listing missing patches for a given Vim file: > scripts/vim-patch.sh -L src/edit.c
* vim-patch.sh: git-for-each-ref: use strip [ci skip] #10169Daniel Hahler2019-06-09
| | | | | | | | - It is a synonym for lstrip, which works with older Git versions also (2.7.4, Ubuntu Xenial). - exit in case of errors from git-foreach-ref - msg_err: echo to stderr Ref: https://github.com/neovim/neovim/pull/10165#issuecomment-500164356
* vim-patch.sh: improve performance with -l [ci skip] #10165Daniel Hahler2019-06-09
| | | Down to < 1s now also (without get_vim_sources).
* vim-patch.sh: use --no-backup-if-mismatch [ci skip] #10156Daniel Hahler2019-06-08
|
* vim-patch.sh: improve patching [ci skip] #10154Daniel Hahler2019-06-08
| | | | | (fuzz, unified, exit) Fixes https://github.com/neovim/neovim/issues/10143
* vim-patch.sh: improve performance #10137Daniel Hahler2019-06-08
| | | | | | | | | | | | | | | | | | | `vim-patch.sh -L`: down to ~0.5s from ~85s. `vim-patch.sh -l`: down to ~6s from ~90s. % diff old new: 193c193 < • v8.0.1366 --- > • v8.0.1367 354d353 < • v8.0.1738 This is due to duplicate tags for Vim commits (https://github.com/vim/vim/issues/4510): - vim/vim@1ad022a9b: tagged as v8.0.1367, v8.0.1366 - vim/vim@5d69da462: tagged as v8.0.1739, v8.0.1738
* vim-patch.sh: fix shellcheck issues [ci skip] #10138Daniel Hahler2019-06-08
|
* vim-patch.sh: perf, readability #9044Daniel Hahler2019-04-12
| | | | closes #9044
* vim-patch.sh: mention URL for `hub` tool #9659Billy Su2019-03-02
| | | | closes #9659
* vim-patch: add matchit docJan Edmund Lazo2018-11-12
| | | | matchit doc is named 'pi_matchit.txt'.
* vim-patch: rename path to check_colors.vimJan Edmund Lazo2018-11-12
|
* vim-patch: move test_urls.vim out of runtime/Jan Edmund Lazo2018-11-12
| | | | Rename it to check_urls.vim, similar to check-includes.py.
* doc: merge sponsor.txt into intro.txtJustin M. Keyes2018-11-05
| | | | | | Also mention how to donate to Nvim. closes #8603
* vim-patch.sh: Skip Vim screen-dump filesJustin M. Keyes2018-10-05
|
* vim-patch.sh: use --ff with git-pullDaniel Hahler2018-09-30
| | | | | | | | I have `merge.ff = no` in my Git config to not use fast-forward merges by default, but when updating the Vim sources it should not cause a merge commit. [ci skip]
* vim-patch.sh: Also check for .git/ directoryJustin M. Keyes2018-08-21
| | | | | | | | | | In the case of nested repos, such as when "neovim/" repo contains "neovim/.vim-src/" repo, git rev-parse --show-toplevel returns the fullpath to the "neovim/" repo, which failed the condition. ref #8875 ref c05d7153d315
* vim-patch.sh: Use git-rev-parse to check repo (#8875)James McCoy2018-08-20
| | | | | | Explicitly checking for the .git/ directory doesn't work in various situations (e.g., git-worktree). [ci skip]
* vim-patch.sh: Fix replacement which converts #1234 to vim/vim#1234James McCoy2018-08-09
| | | | | | | Noticed in cb7bdf5f, where the script incorrectly converted `#ifdef` to `vim/vim#ifdef`. [skip ci]
* vim-patch.sh: Pass directory name to find (#8830)Jason Felice2018-08-09
| | | BSD/Mac find requires directory names before arguments.
* vim-patch.sh: Unwrap commit messages when reviewing PRsJames McCoy2018-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Longer summary lines for commits may be wrapped when downloading the commit from GitHub. Unwrapping the lines ensures they can be compared with the raw Vim commits. The difference before and after this patch using: ./scripts/vim-patch.sh -r 8684 Before: ✘ Wrong commit message. Expected: vim-patch:8.0.1464: completing directory after :find does not add slash Problem: Completing directory after :find does not add slash. Solution: Adjust the flags for globpath(). (Genki Sky) vim/vim@8a37b03 Actual: vim-patch:8.0.1464: completing directory after :find does not add slash Problem: Completing directory after :find does not add slash. Solution: Adjust the flags for globpath(). (Genki Sky) After: ✔ Found expected commit message. [ci skip]
* vim-patch.sh: review_commit: Fix regex for vim versionJames McCoy2018-07-09
| | | | | 067bb1e9f changed the commit format to include a brief description in the summary line of the commit.
* vim-patch.sh: Use single quotes to avoid doubling backslashesJames McCoy2018-07-09
|
* vim-patch: Replace shell variables in printf with formatted argsJames McCoy2018-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that special characters in the variables are not interpreted as escapes/format characters in the printf string, as was seen with upstream patch 8.0.0615. $ ./scripts/vim-patch.sh -p 8.0.0615 Updating Vim sources: /$HOME/src/neovim/.vim-src ✔ Updated Vim sources. ✔ Found Vim revision 'bf15b8d78b22661db8b19d662b62bb9a061cdd37'. Creating patch... Pre-processing patch... ✔ Saved patch to '/$HOME/src/neovim/vim-8.0.0615.patch'. Fetching 'origin/master'. ✔ From https://github.com/neovim/neovim * branch master -> FETCH_HEAD Creating new branch 'vim-8.0.0615' based on 'origin/master'. ✔ Switched to a new branch 'vim-8.0.0615' Branch 'vim-8.0.0615' set up to track remote branch 'master' from 'origin'. Creating empty commit with correct commit message. ./scripts/vim-patch.sh: line 40: printf: `w': invalid format character ✔ [vim-8.0.0615 db7fbb016] vim-patch:8.0.0615: using ./scripts/vim-patch.sh: line 44: printf: `w': invalid format character ✘ [vim-8.0.0615 db7fbb016] vim-patch:8.0.0615: using [ci-skip]
* vim-patch.sh: remove blank line before URLJustin M. Keyes2018-03-24
| | | | This "stacks" better in squashed PRs, etc.
* vim-patch.sh: more colorful #8115Giuseppe2018-03-09
|
* vim-patch.sh: delete *.orig filesJustin M. Keyes2018-02-11
|