Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: PATCH: add support for stgit in VCS_Info

2009/5/22 Frank Terbeck <ft@xxxxxxxxxxxxxxxxxxx>
Julien Langer <julien.langer@xxxxxxxxxxxxxx>:
> This patch adds some support for stgit to VCS_Info. It displays the
> currently active patch and the number of unapplied patches.
> The additional info is configured via a new "stgitformat" style and is put
> into the "misc" part of the prompt. I don't know if this is the best idea,
> what do you (Frank?) think?

One thing, the rest of VCS_INFO_get_data_git() uses four spaces for
indenting and the patch mixes tabs into that.

Also when introducing a new style, a documentation update would be
nice. :)

Ok, here's the updated patch.

- Julien

add support for stgit

From: Julien Langer <julien.langer@xxxxxxxxx>


 Doc/Zsh/contrib.yo                                |   22 ++++++++--
 Functions/VCS_Info/Backends/VCS_INFO_get_data_git |   47 +++++++++++++++++++++
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 620aaea..4131d66 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -486,6 +486,13 @@ want var(vcs_info) to completely take over the generation of your prompt.
 You would do something like tt(PS1='${vcs_info_msg_0_}') to accomplish
+The tt(git) backend replaces var(%m) in the formats and
+actionformats styles with tt(stgit)-specific information for
+tt(stgit)-initialized branches. This style let's you modify how that string
+should look like.
 Defines the maximum number if
@@ -605,6 +612,7 @@ sitem(tt(formats))(" (%s)-[%b|%a]-")
 sitem(tt(actionformats))(" (%s)-[%b]-")
 sitem(tt(branchformat))("%b:%r" (for bzr, svn and svk))
+sitem(tt(stgitformat))(" %p (%c)")
 sitem(tt(disable))((empty list))
@@ -638,9 +646,10 @@ var(repoXY).)
 sitem(tt(%S))(subdirectory within a repository. If tt($PWD) is
 var(/foo/bar/reposXY/beer/tasty), tt(%S) is var(beer/tasty).)
 sitem(tt(%m))(A "misc" replacement. It is at the discretion of the backend
-to decide what this replacement expands to. It is currently used only by
-the tt(hg) backend. The hg backend replaces tt(%m) with the global hash
-value of the current revision.)
+to decide what this replacement expands to. It is currently used by
+the tt(hg) and tt(git) backends. The tt(hg) backend replaces tt(%m) with the
+global hash value of the current revision and the tt(git) backend replaces it
+with the string from the var(stgitformat) style.)
 In tt(branchformat) these replacements are done:
@@ -650,6 +659,13 @@ sitem(tt(%b))(the branch name)
 sitem(tt(%r))(the current revision number)
+In tt(stgitformat) these replacements are done:
+sitem(tt(%p))(the name of the patch currently on top of the stack)
+sitem(tt(%c))(the number of unapplied patches)
 Not all vcs backends have to support all replacements. For tt(nvcsformats)
 no replacements are performed at all. It is just a string.
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index faab2b8..a536165 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -89,6 +89,36 @@ VCS_INFO_git_getbranch () {
     return 0
+VCS_INFO_git_get_stgit_top_patch () {
+    local patchdir=$1
+    if [[ -d "$patchdir" ]]; then
+        local -a patches
+        patches=(${(f)"$(< "${patchdir}/applied")"})
+        printf '%s' $patches[-1]
+        return 0
+    fi
+    return 1
+VCS_INFO_git_get_stgit_unapplied() {
+    local patchdir=$1
+    if [[ -d "$patchdir" ]]; then
+        local -a patches
+        patches=(${(f)"$(< "${patchdir}/unapplied")"})
+        if [[ -z $patches[@] ]]; then
+            printf 0
+        else
+            printf '%d' $#patches
+        fi
+        return 0
+    fi
+    return 1
 gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
 if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision && \
@@ -117,5 +147,20 @@ VCS_INFO_adjust
 gitaction="$(VCS_INFO_git_getaction ${gitdir})"
 gitbase=${PWD%/${$( ${vcs_comm[cmd]} rev-parse --show-prefix )%/##}}
-VCS_INFO_formats "${gitaction}" "${gitbranch}" "${gitbase}" "${gitstaged}" "${gitunstaged}" "${gitsha1}" ''
+local patchdir=${gitdir}/patches/${gitbranch}
+if [[ -d $patchdir ]] ; then
+    stgitpatch=$(VCS_INFO_git_get_stgit_top_patch "${patchdir}")
+    stgitunapplied=$(VCS_INFO_git_get_stgit_unapplied "${patchdir}")
+    stgitpatch=${stgitpatch:-"no patch applied"}
+    zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" stgitformat stgitmsg || stgitmsg=" %p (%c)"
+    zformat -f stgitmsg "${stgitmsg}" "p:${stgitpatch}" "c:${stgitunapplied}"
+    gitmisc=${stgitmsg}
+    gitmisc=''
+VCS_INFO_formats "${gitaction}" "${gitbranch}" "${gitbase}" "${gitstaged}" "${gitunstaged}" "${gitsha1}" "${gitmisc}"
 return 0

Messages sorted by: Reverse Date, Date, Thread, Author