| Commit message (Collapse) | Author | Age |
|---|
| | |
|
| |
|
|
|
|
|
| |
It's not atypical to have extra, non-"vim-patch" commits in a PR merging
a bigger or set of related patches from Vim. Rather than immediately
aborting, display the patch header to the user and let them decide
whether to continue reviewing.
|
| | |
|
| |
|
|
|
| |
Some .po files do not have UTF8 versions, leave those alone for now.
Also remove sjiscorr.c utility.
|
| |
|
|
|
|
|
|
|
| |
grep 2.26 changed its behavior when redirecting its output to /dev/null
such that it exits as soon as one match is found. This causes sed to
get a SIGPIPE which, due to "set -o pipefail", falsely implies that the
patch is not applied.
Removing "set -o pipefail" preserves the good exit status from grep.
|
| |
|
|
|
|
| |
Also include missing changes from:
https://github.com/vim/vim/commit/06d2d38ab7564e1f784b1058a4ef4580cd6d1810
https://github.com/vim/vim/commit/26852128a2b713ef49341a0c18daba928444e7eb
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Without the groupings, only the first alternation matches the diff
marker. For example,
local na_doc='todo\.txt\|version\d\.txt\|tags'
... +'g^diff --git a/runtime/doc/'${na_doc}'...
becomes, after expansion,
... +'g^diff --git a/runtime/doc/todo\.txt\|version\d\.txt\|tags'...
so the matches become "^diff --get a/runtime/doc/todo\.txt",
"version\d\.txt", or "tags". Adding the grouping ensures the expected
behavior of requiring "^diff --get a/runtime/doc/" before every
filename.
|
| |
|
|
| |
Also: neovim => nvim
|
| |
|
|
|
|
|
| |
- Remove not-applicable Vim changes such as *.proto, todo.txt, ...
Also:
- support NVIM_SOURCE_DIR override
|
| |
|
| |
[ci skip]
|
| |
|
|
|
|
|
|
|
| |
Without this the "cd scripts/.." might change to another dir (since
CDPATH is looked at before a local path), and then NEOVIM_SOURCE_DIR
might end up being "/somewhere/else\n/somewhere/else" (since the "cd"
prints the dir already in that case).
Closes https://github.com/neovim/neovim/pull/5213.
|
| | |
|
| |
|
| |
vimpatch.sh: fix awk expr
|
| |
|
|
|
|
|
| |
If a user has multiple remotes set for neovim/neovim, then
find_get_remote was returning 'remote1\nremote2\n', which breaks
anything trying to use it. Since we're just using this remote to fetch
from, any one will do.
|
| | |
|
| | |
|
| |
|
|
|
| |
check_executable now just wraps the "exists && executable" check. This
will be needed to allow fallbacks for commands.
|
| |
|
|
|
|
|
|
|
| |
It's acceptable for “git describe --tags --exact-match …” to fail, since
all runtime updates commits are untagged. All that matters is that we
get a tag when one exists.
Therefore, ignore the failure status of the git describe call, relying
on the captured output instead.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are a total of 5 shell scripts in the Neovim source tree.
All but runtime\macros\less.sh had warnings/errors when run through
Shellcheck (http://www.shellcheck.net/).
This commit fixes all warnings/errors and also changes the shebang to
"#!/bin/sh" when possible (this was not possible for vim-patch.sh
because it uses many bashisms).
The shellcheck errors that were fixed are:
SC2068: Double quote array expansions to avoid re-splitting elements.
SC2086: Double quote to prevent globbing and word splitting.
SC2124: Assigning an array to a string! Assign as array, or use *
instead of @ to concatenate
SC2155: Declare and assign separately to avoid masking return values.
|
| | |
|
| |
|
|
|
| |
Rather than assume the user named their neovim/neovim remote "upstream",
parse the information from "git remote -v".
|
| |
|
|
|
|
|
| |
Make get_vim_sources fetch the whole repository (it's not THAT big) so we can
pick up all the patches. The regexp didn't pick up the NA patches if there was a
comma after NA, so I extended it (I allowed arbitray things after NA, so maybe
someone can write a comment or so, should not lead to confusion).
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Calling "vim-patch.sh -p" on a checked-out branch already created with
"-p" will re-use the branch and append commits.
* Fetch upstream/master before checking out branch on first call of "-p".
* Reverted creation of commit in submit step ("-s") to previous behavior:
Create an empty commit with correct commit message when "-p" is called.
* Submitting a pull request with "-s" will create a correct pull request
message even if multiple patches have been ported in one single branch
with "-p".
|
| |
|
|
|
|
| |
When calling "vim-patch.sh -s" on a checked-out branch created with
"vim-patch.sh -p", create commit from staged changes, push to origin,
create pull request (using hub), and clean up patch files.
|
| | |
|
| |
|
|
|
|
| |
* Support pull requests with multiple commits.
* Offer to clean up files after review.
* Always use full commit hash in assign_commit_details().
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
Any patch may contain mixed encodings, so we must process them as byte
arrays. E.g. with stock `sed` on OS X patch
8a94d873aa8c753a8522ea86a049bdf2abd0c507 causes this error:
sed: RE error: illegal byte sequence
To avoid that, set LC_ALL=C.
Also remove redundant *.patch creation from review_pr().
|
| |
|
|
| |
Sort non-tagged patches in descending order, like tagged patches.
|
| |
|
|
| |
The examples were missing the required -p flag.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Helped-by: Michael Reed <m.reed@mykolab.com>
|
| |
|
|
|
|
| |
* Link to the commit details on GitHub for a tagged version.
* Non-tagged patches (runtime updates) are still linked to
Google Code because they are identified by a Mercurial commit hash.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
- Check for mercurial before using it
- Make 'Merging patches...' wiki page easier to copy
- Use `basename` instead of assuming the user is running vim-patch.sh
via the repo root
- Appease shellcheck by quoting path variables
- Remove unneeded variable quoting inside [[ ]] blocks
- Don't unconditionally 'exit 1'
'-h' and '--help' are both recognized options, so current behavior is
misleading.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
