| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
| |
This changes the behaviour on "unknown" git-rebase actions (those other
than pick/reword/edit/fixup/squash/execute).
|
| |
|
|
|
|
|
|
| |
case.
This manifested, e.g., in 'git am' of a single patch that had a conflict.
|
|
|
|
| |
heads. (Follow-up to 36725.)
|
| |
|
|
|
|
|
|
| |
The "seq" utility is usually available on GNU systems only. This
exchanges calls to seq with pure zsh features. Also: Less forks are
good.
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
| |
(Similar to git detached heads)
|
|
|
|
|
|
|
|
|
| |
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).
|
|
|
|
|
|
|
|
|
|
|
| |
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).
|
|
|
|
|
|
|
|
| |
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 "?".
|
|
|
|
|
| |
This would fix handling get-revision, check-for-changes or
check-for-staged-changes when set per repository.
|
|
|
|
|
| |
Documentation and hg backend use applied-string. patch-string does not
appear anywhere.
|
|
|
|
|
| |
When revert or cherry-pick involve many commits the .git/sequencer
directory holds context for the action and no CHERRY_PICK_HEAD exist.
|
| |
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
accessed via a symlink
31985 Clemens Hammacher and 32064 Hong Xu
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
| |
git backend
|
| |
|
|
|
|
| |
from the hg vcs_info backend
|
|
|
|
| |
(no)?patch-format styles
|
| |
|
| |
|
|
|
|
| |
support subversion 1.7.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
`check-for-changes' and freshly initialised repositories.
|
|
|
|
| |
always return `default' as the branch name.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Here's a diff-stat:
Doc/Zsh/contrib.yo | 506 ++++++++++++++-------
Functions/VCS_Info/.distfiles | 1 +
Functions/VCS_Info/Backends/VCS_INFO_detect_hg | 14 +-
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 35 +-
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 295 +++++++++----
Functions/VCS_Info/VCS_INFO_formats | 26 +-
Functions/VCS_Info/VCS_INFO_hook | 10 +-
Functions/VCS_Info/VCS_INFO_quilt | 190 ++++++++
Functions/VCS_Info/vcs_info | 30 +-
Misc/.distfiles | 1 +
Misc/vcs_info-examples | 496 ++++++++++++++++++++
11 files changed, 1303 insertions(+), 301 deletions(-)
The major changes are vast improvements for the mercurial (hg) backend
(which was done almost entirely by Seth); improved documentation (mostly
done by Simon and again Seth); quilt support (as an addon and stand
alone, see the manual for details); a number of new hooks and a fair
share of bugfixes.
|