zsh/Functions/VCS_Info, branch master

51144, 51146: vcs_info git: stg: Extract patch descriptions

2022-12-09T01:39:32Z

Joint work with Peter Grayson.

51142: vcs_info git: Check the get-unapplied style as documented

2022-12-08T22:09:59Z

The style was treated as "always true" rather than as "settable, false by default" in the rebase-merge and cherry-pick cases. This affects the gen-unapplied-string hook, and may also affect gen-applied-string and set-patch-format hooks if they accessed VCS_INFO_get_data_git's internal parameters directly. If this affects you, just set the style in your zshrc: . zstyle ':vcs_info:git*:*:*' get-unapplied true

51138: Updated StGit patch detection in vcs_info

2022-12-08T21:27:35Z

The vcs_info patch detection code attempted to interrogate StGit patch stack state by inspecting .git/patches/applied and .git/patches/unapplied. As of StGit 0.15 (2009), patch stack metadata is captured in the repo's object database. And as of StGit 1.0 (2021), no stack or patch state is maintained in any files in the .git/ directory. Zsh's approach for interrogating StGit patch state is thus obsoleted. This patch updates vcs_info to determine whether StGit is initialized on a branch by looking at the appropriate git refs and uses StGit's prescribed interface for interrogating applied and unapplied patch state via the `stg series` command. This approach will work with all versions of StGit >=0.15. Signed-off-by: Peter Grayson

49728: vcs_info hg mq: Don't include applied patches in the unapplied patches

2022-02-20T10:16:54Z

For instance, with 4 applied patches, 5 unapplied patches, and no guards involved, the patch-format style would indicate 9 (= 4+5) unapplied patches and 4 applied patches.

49727 (+ comment): vcs_info quilt: Pass the patches dir path to the gen-applied-string, gen-unapplied-string, and set-patch-format hooks

2022-02-20T10:16:33Z

I use that in my gen-applied-string hook.

unposted: vcs_info hg mg (with get-unapplied set): Stop leaking a variable to global scope

2022-02-20T10:12:56Z

security/82: VCS_Info: Fix typo in hook_com[base-name_orig] assignment

2022-02-12T16:29:55Z

Tweaked per discussion in security/90, security/91 (cherry picked from commit b34d33e3b3c5ae30e8315111f07634c1e7507531)

unposted: vcs_info git: Teach the rebase-apply test case generator to also generate rebase-merge test cases

2022-01-29T16:01:39Z

unposted: vcs_info git: Add a missing guard against redefining a function.

2022-01-29T16:01:39Z

unposted: vcs_info git: Deconfuse $EDITOR

2022-01-29T16:01:39Z

Work around .

unposted: vcs_info: Add Vim modelines

2022-01-29T16:01:39Z

... for consistency with all other vcs_info function files.

49723: vcs_info quilt: Use quilt-patch-dir and ${QUILT_PATCHES} even when get-unapplied hasn't been set

2022-01-29T11:04:44Z

This affects the post-quilt hook. Before this patch, if no patches have been applied and get-unapplied hasn't been set, the second argument to that hook would undergo null elision. The generation of patch subjects for the gen-applied-string, gen-unapplied-string, and set-patch-format hooks was unaffected since it was guarded by [[ -n $patches ]].

49722: vcs_info quilt: Refactor for readability. No functional change.

2022-01-29T11:04:43Z

unposted: vcs_info quilt: Remove a no-op variable assignment

2022-01-27T17:34:57Z

49709: vcs_info hg: Keep $HGPLAIN set for hooks if it had been set outside vcs_info

2022-01-25T10:11:58Z

If someone does 'HGPLAIN=1 vcs_info', any vcs_info hooks should be called with HGPLAIN set. Declaring it 'local' broke that.

users/26635 (tweaked): vcs_info hg: Compute the branch name correctly when get-revision is set and check-for-changes is not

2021-04-21T00:57:59Z

Tweak: Simplify an always-true condition. Review-by: Manuel Jacob

47561 (the git and cvs parts) (compare 44919 + 44920): vcs_info internals: cvs, git: Set ${vcs_comm[basedir]} like all other backends do.

2021-03-29T17:03:40Z

That doesn't affect anything, not even other vcs_info internals; it's just for consistency across backends.

47303: vcs_info hg: Fix changing the expansion of %g (hook_com[guards]) in the set-patch-format hook (regression from workers/40480).

2020-08-09T08:07:01Z

To reproduce, go to a hg repository with active mq guards and configure vcs_info as follows: zstyle '*' get-unapplied true zstyle ':vcs_info:*set-patch-format*' hooks f zstyle '*' patch-format '[%g : %G]' zstyle '*' nopatch-format '[%g : %G]' zstyle '*' formats '%m' +vi-f () { hook_com[guards]+=XXX } The regression was first released in 5.3.1-test-2, over three years ago.

46091: Add code to Mercurial VCS backend to show topic if there is any.

2020-06-22T08:18:38Z

"Topics" is an experimental concept in Mercurial that augments the current branching concept (called "named branches"). For more information, see the not always up-to-date Mercurial Wiki page https://www.mercurial-scm.org/wiki/TopicPlan.

45644: vcs_info git: Fix current patch's name in several cases.

2020-03-28T22:12:33Z

45627: vcs_info git: Under git-am(1) conflicts, pass to the gen-applied-string hook information on already-applied patches.

2020-03-27T01:14:42Z

The hook already receives information about the current (topmost applied) patch and, if the get-unapplied style is set, about future (unapplied) patches. Tested in the Functions/VCS_Info/test-repo-git-rebase-apply scenario, after manually converting the rebase to a «git am». (Specifically, I ran: mkdir d git rebase --abort git format-patch rebase_from_this..HEAD -o d git checkout rebase_onto_this git am d/* .)

45625: vcs_info svn: Detect the "working copy format is too new" error.

2020-03-27T01:14:42Z

45626: vcs_info: Deduplicate calling the set-branch-format hook.

2020-03-27T01:14:42Z

45624: vcs_info: Set $rrn in all backends.

2020-03-27T01:14:42Z

45541: internal: vcs_info git: Add a test case repository for rebase-apply situations

2020-03-15T00:18:31Z

45539: vcs_info git: In non-interactive rebases, obtain applied patches' names.

2020-03-15T00:18:30Z

45540: vcs_info git: In non-interactive rebases, compute patch names for unapplied patches.

2020-03-15T00:18:28Z

45543: vcs_info quilt: Allow quiltcommand to be a function.

2020-03-15T00:18:27Z

Before this commit, it could only be an external command.

45547: vcs_info git: In interactive rebases, process gen-unapplied-string arguments like gen-applied-string arguments are processed.

2020-03-15T00:18:25Z

I consider this a bugfix, since it's unexpected for -applied and -unapplied to differ about this.

45546: vcs_info git: In interactive rebases, properly support the full form of the "exec" verb.

2020-03-15T00:18:23Z

The code before this commit happened to have done the right thing: "exec" lines were handled by the catchall forward compatibility case, which happened to have had virtually the same effect as the correct case. However, that was merely an accidental result. This patch makes the code do the right thing deliberately, rather than by accident.

45545: vcs_info git: In interactive rebases, ignore comment lines.

2020-03-15T00:18:21Z

github #48/0002: vcs_info git: properly detect bare repositories

2020-02-17T10:03:08Z

We currently detect Git repositories by finding the top level of the working tree, and if we fail to detect it, assume that we're not in a repository. However, there's a case we don't consider: a bare repository. Let's detect if the user is in a bare repository by checking if gitdir is set, and if so, using that if there is no working tree. We now detect bare Git repositories with vcs_info, as expected.

github #48/0001: vcs_info git: avoid warnings in bare repositories

2020-02-17T10:02:27Z

Git 2.25 introduced a change to how git rev-parse --show-toplevel behaves. Traditionally, it succeeded with no output if the user was in a bare repository. Now it dies, printing an error to standard error. Consequently, when the user is in a bare repository with a newer Git, vcs_info prints noisily to standard error. While this is functionally harmless, it is annoying for the shell to print messages from Git every time the prompt is printed, so let's silence the error message.

45114: vcs_info quilt: Improve support for svn-style patch headers.

2019-12-22T03:21:03Z

Additional lines between the |-separated header line and the actual log message, as generated by 'svn log -v' and 'svn log -g', are now supported. This change affects you if you have quilt patches with 'svn log'-style information in their headers, regardless of whether you use quilt standalone, quilt over svn, or quilt over some other VCS.

44960: vcs_info cvs: Fix infinite loop when /CVS exists.

2019-12-03T03:03:05Z

44961: vcs_info svn: Fix infinite loop when /.svn exists.

2019-12-03T02:56:02Z

44962: vcs_info: Document internal function and variable

2019-12-03T02:56:01Z

44958: vcs_info quilt: Avoid forks

2019-11-29T20:57:01Z

44945: vcs_info git: Optimize detection by running fewer external commands.

2019-11-29T20:56:42Z

44020: VCS_INFO_detect_p4: Fix infinite recursion

2019-01-27T06:26:31Z

43879: vcs_info git: Fix fatal error in VCS_INFO_git_getbranch in corner case

2018-12-13T15:28:00Z

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.

43620 (tweaked): vcs_info git: Reverse the order patches are passed to gen-unapplied-string in.

2018-10-08T13:44:40Z

This is an incompatible change; see README for details. Tweaks (relative to posted version): tweaked README, removed scalpel (debug print).

43617: vcs_info git: During a non-interactive rebase of a detached head, computer the %b expando correctly.

2018-10-08T13:41:45Z

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.

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-08T13:41:43Z

43618: vcs_info: Don't redefine helper functions on every execution of the autoloadable outer function.

2018-10-08T13:41:41Z

This allows enabling tracing of the helper functions without fned'ing the outer function.

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-07T15:05:19Z

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.

2018-10-07T15:05:17Z

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]+=" ?"

43586: vcs_info git: Reformat to minimise next diff. No functional change.

2018-10-07T15:05:15Z

43585: vcs_info svn: Recognize working copies in need of an upgrade.

2018-10-07T15:05:13Z

unposted: Indicate which use-case each branch handles.

2018-10-02T15:22:06Z

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.

2018-08-24T15:50:18Z

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".

43314: vcs_info git: Flatten a nested if.

2018-08-24T15:49:38Z

No functional change.

43030: Replace VCS_INFO_realpath() by :P

2018-06-16T17:03:23Z

unposted: vcs_info: Add docstrings to the internal functions VCS_INFO_formats and VCS_INFO_set.

2017-12-30T06:14:22Z

41952: Use HGPLAIN instead of HGRCPATH in VCS_INFO_get_data_hg

2017-10-25T08:34:34Z

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.

41565: vcs_info patch2subject: Support `svn log -r N --diff` output.

2017-08-22T20:50:14Z

Julien Nicoulaud: 40586: discard stderr

2017-02-22T04:45:18Z

40492: vcs_info: Escape '%' signs in payloads.

2017-02-09T15:24:04Z

Test case: a patch whose subject is '%Sfoo%sbar'. ('S' and 's' are expandos both in prompts and in the 'formats' style.)

unposted: vcs_info git: Fix typo in manual.

2017-02-04T05:55:46Z

40480: vcs_info set-patch-format: Eliminate the remaining code duplication.

2017-02-03T18:14:01Z

40479: vcs_info set-patch-format: Prepare for more code sharing between the callers.

2017-02-03T18:14:00Z

This changes hook invocation order in the hg backend.

40481: vcs_info hg: Pass arguments to the set-patch-format hook.

2017-02-03T18:13:59Z

40478: vcs_info set-patch-format: Guard against empty variable elision.

2017-02-03T18:13:58Z

40476: vcs_info $backend_misc: Document at the right point, provide in quilt 'standalone' mode.

2017-02-03T18:13:57Z

40403/0004: vcs_info set-patch-format helper: Part #4.

2017-01-25T04:22:32Z

This also fixes the %a (${hook_com[all-n]}) expando in the hg backend: before this change, it counted only unapplied changes.

40403/0003: vcs_info set-patch-format helper: Part #3.

2017-01-25T04:22:32Z

40403/0002: vcs_info set-patch-format helper: Part #2.

2017-01-25T04:22:31Z

Not all callers reset ${hook_com}, but those that don't, immediately overwrite it a few lines later.

40403/0001: vcs_info set-patch-format helper: Part #1.

2017-01-25T04:22:30Z

40401: vcs_info git: Fix the %c patch-format expando.

2017-01-25T04:22:30Z

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).

40392: vcs_info patch2subject: Support `git show` output.

2017-01-25T04:22:28Z

40149: vcs_info git: Avoid a fork.

2016-12-16T10:48:10Z

unposted: vcs_info git: Handle rebase-apply sequences with >=10000 patches.

2016-12-04T21:37:02Z

Review-by: Frank Terbeck

40074: vcs_info git: rfc822-unfold rebase-apply patch subjects when msg-clean is unavailable.

2016-12-04T21:37:01Z

Example (in this repository): git -c merge.merge-changelog.driver=/bin/false rebase --onto=1955cce^^ 1955cce^ 1955cce

Get subject of current patch in rebase-apply mode

2016-12-02T23:18:22Z

unposted: vcs_info: Break out VCS_INFO_quilt-patch2subject into VCS_INFO_patch2subject

2016-12-01T17:13:37Z

... so other places can use it; compare 40030 in the 39990 thread.

39786: vcs_info (hg): Use native hexdump implementation instead of external command.

2016-10-31T18:35:47Z

Fixes issue whereby the external command would print "*" for repeated octets. Includes comment change, cf 39790.

39423: vcs_info git: Produce nicer applied-string messages for 'exec' actions.

2016-09-24T07:22:15Z

This changes the behaviour on "unknown" git-rebase actions (those other than pick/reword/edit/fixup/squash/execute).

39046 + 39061: New :P history modifier.

2016-08-22T03:34:30Z

38610: vcs_info quilt: Extract a patch subject, 2.0.

2016-06-06T08:10:12Z

38609: vcs_info quilt: Factor out a helper function. No functional change.

2016-06-06T08:10:11Z

unposted: Fix typo in comment.

2016-01-15T06:30:06Z

37612: vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' case.

2016-01-15T06:29:09Z

This manifested, e.g., in 'git am' of a single patch that had a conflict.

37451: vcs_info: Declare "msgs" in early context

2015-12-30T14:23:08Z

The parameter *is* being declared with the redefinition of the function, but not in its initial form, which gets you a warning about the parameter being defined globally. This fixes it.

37345: VCS_INFO functions break with setopt no_unset

2015-12-23T00:57:45Z

With setopt no_unset in my config file, vcs_info fails with: VCS_INFO_maxexports:7: vcs: parameter not set

37347: Remove incorrect local for msgs in VCS info

2015-12-08T12:59:48Z

37252: vcs_info git: Compute %b correctly with "rebase --onto" of detached heads. (Follow-up to 36725.)

2015-11-30T03:42:47Z

37186: a couple more WARN_CREATE_GLOBAL fixes

2015-11-22T16:06:20Z

37025: vcs_info git: Add a cherry-pick patch-format

2015-11-13T20:17:27Z

36913 + 36945: vcs_info quilt: Pass patch subject lines to gen-applied-string

2015-10-24T20:42:26Z

The format used is '${patchname} ${subject}', which is analogous to the git backend.

36912: vcs_info quilt: Tolerate being in child of .pc's parent

2015-10-24T20:26:41Z

Without this, gen-applied-string would only be set when .pc is a child of cwd, not when it is a child of an ancestor of cwd.

36888: vcs_info: Prevent warn_create_global warning with '-preinit-' state

2015-10-18T18:40:18Z

This is related to 33405. Turns out that not all other calls to VCS_INFO_set are okay: With recent zsh versions the early call to that function with the '-preinit-' argument causes a warning like this: VCS_INFO_set:9: math parameter maxexports created globally in function VCS_INFO_set This fixes it.

36832: vcs_info: Remove dependency on "seq"

2015-10-11T10:54:30Z

The "seq" utility is usually available on GNU systems only. This exchanges calls to seq with pure zsh features. Also: Less forks are good.

36830: vcs_info: Silence an error message with new git versions

2015-10-11T10:29:41Z

Mikael informs me on IRC, that in new versions of git (he used 2.6.1) where the "am" subcommand is now a builtin, a file that is used by the git backend of vcs_info (namely .git/rebase-apply/msg-clean) is not available anymore, leading to an annoying error message: VCS_INFO_get_data_git:232: no such file or directory: .git/rebase-apply/msg-clean This patch checks for the availabiliy of the file before using it, and adjusts the value of the dependant values accordingly.

36725: vcs_info git: Compute %b correctly when "git am"-ing onto detached heads.

2015-09-30T21:43:37Z

Before this patch, $gitbranch would be set to empty, which caused VCS_INFO_get_data_git to early out with a failure status¹, consequently $vcs_info_msg_0_ would be empty. ¹ via the 'if [[ -z ]]' block around line 170.

36725: vcs_info git: Compute %b correctly when rebasing detached heads.

2015-09-30T21:43:37Z

This sets the %b expando to the hash of the before-the-merge HEAD, rather than to the literal string "detached HEAD". That hash is already available via the gen-applied-string hook.

36725: vcs_info git: Compute %b correctly when merging to detached heads.

2015-09-30T21:43:37Z

The %b expando should be the hash prior to the merge. The hash of the merge result is available as the %i expando and via the gen-applied-string hook.

36601: vcs_info: handle missing .git/rebase-apply/{next,msg-clean}

2015-09-28T18:03:12Z

When pressing Ctrl-C after `git am`, only `last` exists in `.git/rebase-apply/`, which is empty. This patch fixes it to fall back to "no patch applied" then.

36410: vcs_info git: Present merge heads as patches

2015-09-05T10:47:44Z

This shows, during 'git merge', the revision hashes of the "remote" head (the one that will become second parent of the commit) in the %m expando. Review-by: Frank Terbeck

36209: vcs_info: avoid grep error message when file is missing

2015-08-17T23:00:25Z

When running git rebase -m and a conflict occurs, the git-rebase-todo file is not present. This leads to an error from grep every time the shell prompt is printed when vcs_info is enabled. Avoid this message by checking if the file exists before trying to grep it.

36077: vcs_info: stop exporting everything

2015-08-12T02:31:22Z