about summary refs log tree commit diff
path: root/Functions/VCS_Info
Commit message (Collapse)AuthorAgeFilesLines
* 39046 + 39061: New :P history modifier.Daniel Shahaf2016-08-221-1/+1
|
* 38610: vcs_info quilt: Extract a patch subject, 2.0.Daniel Shahaf2016-06-061-4/+38
|
* 38609: vcs_info quilt: Factor out a helper function. No functional change.Daniel Shahaf2016-06-061-13/+22
|
* unposted: Fix typo in comment.Daniel Shahaf2016-01-151-2/+2
|
* 37612: vcs_info git: Set $git_patches_unapplied correctly for 'rebase-apply' ↵Daniel Shahaf2016-01-151-1/+3
| | | | | | case. This manifested, e.g., in 'git am' of a single patch that had a conflict.
* 37451: vcs_info: Declare "msgs" in early contextFrank Terbeck2015-12-301-1/+1
| | | | | | 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_unsetPhilip Sequeira2015-12-232-2/+2
| | | | | 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 infoPeter Stephenson2015-12-081-1/+0
|
* 37252: vcs_info git: Compute %b correctly with "rebase --onto" of detached ↵Daniel Shahaf2015-11-301-1/+2
| | | | heads. (Follow-up to 36725.)
* 37186: a couple more WARN_CREATE_GLOBAL fixesPeter Stephenson2015-11-221-0/+1
|
* 37025: vcs_info git: Add a cherry-pick patch-formatDaniel Shahaf2015-11-131-0/+22
|
* 36913 + 36945: vcs_info quilt: Pass patch subject lines to gen-applied-stringDaniel Shahaf2015-10-241-0/+30
| | | | The format used is '${patchname} ${subject}', which is analogous to the git backend.
* 36912: vcs_info quilt: Tolerate being in child of .pc's parentDaniel Shahaf2015-10-241-0/+1
| | | | | 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-' stateFrank Terbeck2015-10-181-0/+2
| | | | | | | | | | | 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"Frank Terbeck2015-10-111-2/+3
| | | | | | 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 versionsFrank Terbeck2015-10-111-12/+22
| | | | | | | | | | | | 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.Daniel Shahaf2015-09-301-0/+1
| | | | | | | | 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.Daniel Shahaf2015-09-301-0/+4
| | | | | | 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.Daniel Shahaf2015-09-301-1/+1
| | | | | 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}Daniel Hahler2015-09-281-11/+14
| | | | | | | 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 patchesDaniel Shahaf2015-09-051-0/+17
| | | | | | | 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 missingbrian m. carlson2015-08-181-1/+3
| | | | | | | 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 everythingMikael Magnusson2015-08-1212-21/+22
|
* 34673: vcs_info git: Fix error message when rebase hasn't startedDaniel Shahaf2015-03-091-0/+1
|
* vcs_info hg: Support inactive bookmarksDaniel Shahaf2015-01-251-0/+17
| | | | (Similar to git detached heads)
* PATCH: 34333: vcs_info quilt: fix unapplied detection in subdirMarc Finet2015-01-221-13/+17
| | | | | | | | | | | | | When patches are applied, let quilt use .pc without forcing the patch directory, this will fix the unapplied detection when being in subdir. When no patches are applied, use zstyle quilt-patch-dir then QUILT_PATCHES then "patches" for path to search for patches. Note: prefer setting quilt-patch-dir rather than QUILT_PATCHES for absolute path because when patches are applied, quilt unapplied will not return the correct list (i.e. the whole list rather that the one specified by .pc/.quilt_series).
* 33405: vcs_info: Make sure maxexports is set when VCS_INFO_set is calledFrank Terbeck2014-10-091-0/+1
| | | | Reported-by: From: Marco Hinz <mh.codebro@gmail.com>
* 33391: vcs_info git: fix applied patch detection on git amMarc Finet2014-10-091-10/+7
| | | | | | | | | git-am also uses .git/rebase-apply for patch list but the file original-commit does not exist (as no commit exist). This patch handles both git rebase and git am. Also: - get the first line (rather than the first char) when the message contains only one line; - remove unused function (ironically that should have been used here).
* 33277: Fix VCS_INFO_reposub's command expansionFrank Terbeck2014-09-291-3/+4
| | | | Reported-by: Marco Hinz <mh.codebro@gmail.com>
* 33217: vcs_info: use `--ignore-submodules=dirty` with diff/diff-indexDaniel Hahler2014-09-221-3/+3
| | | | | | | | | | | This will detect changes to submodules from the superproject's perspective, e.g. after `git rm submodule`. >From GIT-DIFF-INDEX(1)/GIT-DIFF(1): Using "dirty" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0).
* 33184: vcs_info git: consider patches for rebaseMarc Finet2014-09-161-42/+74
| | | | | | | | Since a rebase contains a list of patches to re-apply, re-use the facility for stgit to have the same mechanism. The patch list given to the gen-{un,}applied-string hooks is an array with the sha1 and the subject of the commit. On rebase merge, the applied patches prior to current contains only a number and "?".
* 33188: vcs_info git: set rrn before using itMarc Finet2014-09-161-2/+2
| | | | | This would fix handling get-revision, check-for-changes or check-for-staged-changes when set per repository.
* 33145: vcs_info git: fix applied-string nameMarc Finet2014-09-141-1/+1
| | | | | Documentation and hg backend use applied-string. patch-string does not appear anywhere.
* 33148: vcs_info quilt: refactor standalone detectionMarc Finet2014-09-141-5/+3
| | | | | | Since VCS_INFO_bydir_detect always uses the vcs_comm[detect_need_file], it should be cleared when querying it without file.
* 33147: vcs_info git: detect revert or cherry-pick with multiple commitsMarc Finet2014-09-141-0/+5
| | | | | When revert or cherry-pick involve many commits the .git/sequencer directory holds context for the action and no CHERRY_PICK_HEAD exist.
* 33047: use git to simplify massively source distribution file selectionPeter Stephenson2014-08-232-44/+0
|
* 32662: vcs_info git: Fix stagedstr for empty reposDaniel Shahaf2014-06-021-4/+10
| | | | | | In empty repositories, HEAD is an unresolvable symbolic ref. Start computing stagedstr/unstagedstr in that case; for the former, use a different method than the non-empty-repository case.
* 32621: vcs_info svn: 'Fix set-branch-format' when in subdirsDaniel Shahaf2014-05-291-7/+15
| | | | | | | The previous code would fail to detect the wcroot with Subversion 1.7+ when cwd is at least two levels below the root (i.e., ../../.svn exists and ../.svn doesn't), and would then pass to the hook the revision and basename of cwd rather than of the wcroot.
* 32619: vcs_info svn: Use the revision of cwdDaniel Shahaf2014-05-291-3/+5
| | | | | | | Previously, the value of the wc root would be used. In Subversion, it makes more sense to use the revision of cwd, since all commands (e.g., 'svn ci', 'svnversion') operate only on cwd and below, not on wcroot and below.
* 32597: vcs_info git: Describe detached heads symbolically.Daniel Shahaf2014-05-061-1/+1
| | | | | | | This makes %b expand to a refname rather than a sha1 when HEAD is detached but happens to match some ref (branch, tag, etc). The resulting output will typically contain a slash (e.g., "tags/v1.0.2", "heads/mybranch"), which helps distinguish it from the output in the "HEAD is a symbolic ref" case.
* 32528: vcs_info: Add check-for-staged-changesDaniel Shahaf2014-04-051-5/+16
|
* 32264: vcs_info, hg: Support detecting repos using ShareExtensionFrank Terbeck2014-01-171-1/+1
|
* 32089: tweak to detect Subversion repositoryDaniel Shahaf2013-12-051-1/+1
|
* 32066: fix %r and %S in vcs_info formats when a repository subdirectory is ↵Barton E. Schaefer2013-11-292-3/+3
| | | | | | accessed via a symlink 31985 Clemens Hammacher and 32064 Hong Xu
* 31485: vcs_info, git: Avoid error messages for `guilt' usersFrank Terbeck2013-06-181-1/+3
| | | | | | | | | | Guilt uses the same internal directory for keeping state as stgit, but it doesn't use the same files (not surprisingly). This caused error messages due to missing files. This fixes that by making the "stgit-active?" test stricter. Reported-by: Axel Beckert <abe@debian.org>
* 31136: vcs_info: just set parameters instead of passing over a pipeMikael Magnusson2013-03-101-12/+9
|
* 30639: Add support for showing the current action is cherry-pick to vcs_info ↵Mikael Magnusson2013-03-101-0/+11
| | | | git backend
* Baptiste Daroussin: 30703: VCS_INFO_detect_fossil: Fix fossil detection on unixFrank Terbeck2012-09-281-1/+1
|
* Seth House: 30702: contrib.yo, VCS_INFO_get_data_hg: Removed --debug flag ↵Frank Terbeck2012-09-281-3/+6
| | | | from the hg vcs_info backend
* Stepan Koltsov: vcs_info: %a to output number of all patches in ↵Frank Terbeck2012-08-173-8/+11
| | | | (no)?patch-format styles