| Commit message (Collapse) | Author | Age |
... | |
| |
|
| |
|
|\ |
|
| | |
|
| |
| |
| |
| | |
Follow up to a4d21f059.
|
| |
| |
| |
| | |
Ref: https://github.com/neovim/neovim/pull/11514#issuecomment-569476828
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Improve error message for unsupported bash version, use double square bracket operator
Co-Authored-By: Daniel Hahler <github@thequod.de>
|
| |/ |
|
|/
|
|
| |
[ci skip]
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
| |
|
| |
|
|
|
|
| |
Ref: https://github.com/neovim/neovim/pull/11514#issuecomment-568780231
|
|
|
|
|
|
|
|
| |
* 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`.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
[skip ci]
|
|
|
|
|
|
| |
This gets done only initially, for `-l`, and when a commit cannot be found.
Also provide more compact instructions with `-l` / `show_vimpatches`.
|
|
|
|
| |
Closes https://github.com/neovim/neovim/pull/11182.
|
|
|
| |
Ref: https://github.com/neovim/neovim/pull/10888#issuecomment-526774032
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|\ |
|
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
|
|
|
|
|
|
|
| |
- 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
|
|
|
| |
Down to < 1s now also (without get_vim_sources).
|
| |
|
|
|
|
|
| |
(fuzz, unified, exit)
Fixes https://github.com/neovim/neovim/issues/10143
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
`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
|
| |
|
|
|
|
| |
closes #9044
|
|
|
|
| |
closes #9659
|
|
|
|
| |
matchit doc is named 'pi_matchit.txt'.
|
| |
|
|
|
|
| |
Rename it to check_urls.vim, similar to check-includes.py.
|
|
|
|
|
|
| |
Also mention how to donate to Nvim.
closes #8603
|
| |
|
|
|
|
|
|
|
|
| |
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]
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Explicitly checking for the .git/ directory doesn't work in various
situations (e.g., git-worktree).
[ci skip]
|
|
|
|
|
|
|
| |
Noticed in cb7bdf5f, where the script incorrectly converted `#ifdef` to
`vim/vim#ifdef`.
[skip ci]
|
|
|
| |
BSD/Mac find requires directory names before arguments.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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]
|
|
|
|
|
| |
067bb1e9f changed the commit format to include a brief description in
the summary line of the commit.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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]
|
|
|
|
| |
This "stacks" better in squashed PRs, etc.
|
| |
|
| |
|