mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity
10770 commits 20 branches 219 tags 52 MiB
Commit graph

753 commits

Author SHA1 Message Date
Daniel Shahaf
23154e46e6 43879: vcs_info git: Fix fatal error in VCS_INFO_git_getbranch in corner case 
Before this commit, the following use-case:

    git checkout foo^
    git show foo | git am

would result in a fatal error, with vcs_info_msg_N_ not set:

    VCS_INFO_git_getbranch:18: no such file or directory: .git/rebase-apply/onto

Now they are set correctly, and HEAD's commit hash is used.
 2018-12-13 15:28:00 +00:00
Joey Pabalinas
fc3826190a 43779 (tweaked): add parentheses to fix expression with cprecedences option set 2018-11-08 11:46:27 +01:00
Daniel Shahaf
f6adb79ba5 43685: add-zle-hook-widget: Support running under NO_UNSET ('set -u'). 2018-10-14 14:01:33 +00:00
Daniel Shahaf
e38f15f8ff 43620 (tweaked): vcs_info git: Reverse the order patches are passed to gen-unapplied-string in. 
This is an incompatible change; see README for details.

Tweaks (relative to posted version): tweaked README, removed scalpel (debug print).
 2018-10-08 13:44:40 +00:00
Daniel Shahaf
31dcba76f0 43617: vcs_info git: During a non-interactive rebase of a detached head, computer the %b expando correctly. 
Before this commit, the value of %b was the hash of the commit from the
"source" side of the rebase, from .git/rebase-apply/orig-head and
.git/rebase-apply/original-commit.  This broke the invariant that
%b expands to a git-rev-parse(1) expression resolving to what %r
expands to.

Use .git/rebase-apply/onto instead as, empirically, it contains the
correct value.
 2018-10-08 13:41:45 +00:00
Daniel Shahaf
0e0219118d 43619: vcs_info git: In non-interactive rebases, always set $hook_com[git_patches_applied] to a string of the form 'foo bar', never just 'foo'. 2018-10-08 13:41:43 +00:00
Daniel Shahaf
a05533e425 43618: vcs_info: Don't redefine helper functions on every execution of the autoloadable outer function. 
This allows enabling tracing of the helper functions without fned'ing
the outer function.
 2018-10-08 13:41:41 +00:00
Daniel Shahaf
5c9ef1a1fa 43587: vcs_info git: In 'git rebase -i', when computing subjects of applied-patches, handle an edge case where the subject is not available. 2018-10-07 15:05:19 +00:00
Daniel Shahaf
0c00eed4c7 43588: vcs_info git: Make sure applied-patches is of the form "$hash $subject" --- that is, has a space and a non-empty second argument --- even with future 'git rebase -i' verbs. 
Use of '?' is consistent with these precedents:

Backends/VCS_INFO_get_data_git:220:            printf -v "git_patches_applied[$p]"  "%04d ?" "$p"
Backends/VCS_INFO_get_data_git:242:                git_patches_applied+=("? $subject")
Backends/VCS_INFO_get_data_git:244:                git_patches_applied+=("?")
VCS_INFO_quilt:160:            applied[$i]+=" ?"
VCS_INFO_quilt:168:            unapplied[$i]+=" ?"
 2018-10-07 15:05:17 +00:00
Daniel Shahaf
a27fad1ae2 43586: vcs_info git: Reformat to minimise next diff. No functional change. 2018-10-07 15:05:15 +00:00
Daniel Shahaf
abc94e8f6a 43585: vcs_info svn: Recognize working copies in need of an upgrade. 2018-10-07 15:05:13 +00:00
Daniel Shahaf
f9952301b2 unposted: Indicate which use-case each branch handles. 2018-10-02 15:22:06 +00:00
Daniel Shahaf
40d9681b62 43313 (log message tweaked): vcs_info git: For the branch name, try to find a symbolic name before falling back to a raw commit hash. 
Ask git-describe(1) and git-name-rev(1) to compute a gitrevisions(7)
name in terms of a branch or tag that contains (= is a descendant of,
is younger than) HEAD.

In this repository, the output changes from "9567bfe..." to
"master~1" or "remotes/origin/HEAD~1". This would also happen
during bisects, e.g., "bisect/bad~22".
 2018-08-24 15:50:18 +00:00
Daniel Shahaf
4cfbbf9ca5 43314: vcs_info git: Flatten a nested if. 
No functional change.
 2018-08-24 15:49:38 +00:00
Peter Stephenson
0a6cb5078d 43084: Variable warning suppression enhancements. 
Add vared -g option along the lines of typeset -g.

Set reply safely in zsh_directory_name_cdr.
 2018-06-25 09:31:40 +01:00
dana
faa07d064b 43030: Replace VCS_INFO_realpath() by :P 2018-06-16 12:03:23 -05:00
Oliver Kiddle
594f2ff06e users/23434: initialise UNDO_LIMIT_NO so that an initial undo doesn't clear the whole edit buffer 2018-06-07 17:48:48 +02:00
Sebastian Gniazdowski
52f1c4ffb0 42929 (tweaked): additional default bindings in zed. 
Add to both zed and zed-vicmd keymaps.
 2018-06-05 09:38:31 +01:00
Sebastian Gniazdowski
abd0040253 41839: force IFS to default for "read" 2018-01-19 22:56:11 -08:00
Daniel Shahaf
a8ad9768bd unposted: vcs_info: Add docstrings to the internal functions VCS_INFO_formats and VCS_INFO_set. 2017-12-30 06:14:22 +00:00
Alexey Sokolov
1a5d8a6916 41952: Use HGPLAIN instead of HGRCPATH in VCS_INFO_get_data_hg 
Fixes prompt indicator in case if the repository requires a non-default
feature. With HGRCPATH, it results in:

abort: repository requires features unknown to this Mercurial: ...
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)

Which, in turn, results in "default" getting reported regardless of what
is the current state of the repo.
 2017-10-25 10:34:34 +02:00
Barton E. Schaefer
96845524a6 41899: handle multi-word values of $VISUAL et al., and line counting of buffer for emacs startup 2017-10-15 11:17:06 -07:00
Peter Stephenson
b2e44bce62 Make mbegin, mend, match local in zed. 
Needed for zstyle -m.
 2017-08-31 16:55:26 +01:00
Daniel Shahaf
d6aa949977 41565: vcs_info patch2subject: Support svn log -r N --diff output. 2017-08-22 20:50:14 +00:00
Barton E. Schaefer
43e55a9bcd 41472: introduce cleanup hooks default and restore special themes, and update documentation 2017-07-29 16:58:39 -07:00
Peter Stephenson
d78761c003 41345: Use consistent prompt variables in prompt themese. 
Some more sanity may be needed in this area but this apsect seems
uncontroversial.
 2017-06-26 11:16:38 +01:00
Wieland Hoffmann
cf72c2d288 41265: quote the inserted file names as necessary 2017-06-16 22:28:54 -07:00
Eric Cook
6ecc34a55e unposted: fix typo in url-quote-magic 2017-06-13 21:47:48 -04:00
Sebastian Gniazdowski
d6d7ef2a0d 41232: Use page up/down keys in zed keymap. 
Find with terminfo where available.
 2017-06-07 10:01:38 +01:00
Peter Stephenson
ab6f30350a unposted: Use typeset -g in insert-unicode-char 
Avoid warning from WARN_NESTED_VAR if set.
 2017-05-02 09:39:53 +01:00
Aaron Schrab
7fc15db684 40892: subcommand matching for ip help 2017-03-24 09:46:03 +00:00
Barton E. Schaefer
1b0541c52f Julien Nicoulaud: 40586: discard stderr 2017-02-21 20:45:18 -08:00
Daniel Shahaf
ecd88284f3 40492: vcs_info: Escape '%' signs in payloads. 
Test case: a patch whose subject is '%Sfoo%sbar'.  ('S' and 's' are
expandos both in prompts and in the 'formats' style.)
 2017-02-09 15:24:04 +00:00
Daniel Shahaf
bb6c08b51a unposted: vcs_info git: Fix typo in manual. 2017-02-04 05:55:46 +00:00
Daniel Shahaf
33c0a10448 40480: vcs_info set-patch-format: Eliminate the remaining code duplication. 2017-02-03 18:14:01 +00:00
Daniel Shahaf
9211d7f277 40479: vcs_info set-patch-format: Prepare for more code sharing between the callers. 
This changes hook invocation order in the hg backend.
 2017-02-03 18:14:00 +00:00
Daniel Shahaf
fca4f90bba 40481: vcs_info hg: Pass arguments to the set-patch-format hook. 2017-02-03 18:13:59 +00:00
Daniel Shahaf
3a1756b728 40478: vcs_info set-patch-format: Guard against empty variable elision. 2017-02-03 18:13:58 +00:00
Daniel Shahaf
49bc46946e 40476: vcs_info $backend_misc: Document at the right point, provide in quilt 'standalone' mode. 2017-02-03 18:13:57 +00:00
Daniel Shahaf
2854a67e09 40403/0004: vcs_info set-patch-format helper: Part #4. 
This also fixes the %a (${hook_com[all-n]}) expando in the hg backend:
before this change, it counted only unapplied changes.
 2017-01-25 04:22:32 +00:00
Daniel Shahaf
edd9798de7 40403/0003: vcs_info set-patch-format helper: Part #3. 2017-01-25 04:22:32 +00:00
Daniel Shahaf
2702857334 40403/0002: vcs_info set-patch-format helper: Part #2. 
Not all callers reset ${hook_com}, but those that don't, immediately
overwrite it a few lines later.
 2017-01-25 04:22:31 +00:00
Daniel Shahaf
0ea1957608 40403/0001: vcs_info set-patch-format helper: Part #1. 2017-01-25 04:22:30 +00:00
Daniel Shahaf
57013f8b96 40401: vcs_info git: Fix the %c patch-format expando. 
Before this change, ${git_unapplied_s} was unused and the %c
(${hook_com[unapplied]}) expando evaluated to the number of digits in
the string returned by the gen-unapplied-string hook (or to the number
of digits in the number of unapplied patches, when there was no such
hook).
 2017-01-25 04:22:30 +00:00
Daniel Shahaf
699a38e698 40392: vcs_info patch2subject: Support git show output. 2017-01-25 04:22:28 +00:00
Barton E. Schaefer
5455798bb5 Oliver: 40118: alternate fix replacing 40115 
This commit reverts 40115 (commit 3594f55f) thus restoring 38579, then
applies 40118: Relocate BUFFER/CURSOR reset to work around "fc -p" issue
 2016-12-24 00:15:21 -08:00
Daniel Shahaf
816084c0ac 40149: vcs_info git: Avoid a fork. 2016-12-16 10:48:10 +00:00
Daniel Shahaf
feb4be4a5e 40126: zed (fned): When editing a new function. escape its name. 
Example:

    % unfunction \(
    % fned \(
 2016-12-09 08:21:07 +00:00
Zhiming Wang
3594f55fc0 40115: revert 38579 due to bug restoring BUFFER after history search 
This reverts commit 20948d0889.
 2016-12-06 21:37:30 -08:00
Daniel Shahaf
f71de84f1d unposted: vcs_info git: Handle rebase-apply sequences with >=10000 patches. 
Review-by: Frank Terbeck
 2016-12-04 21:37:02 +00:00