From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17032 invoked by alias); 15 Feb 2010 23:58:20 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 27714 Received: (qmail 7817 invoked from network); 15 Feb 2010 23:58:18 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS autolearn=ham version=3.2.5 Received-SPF: none (ns1.primenet.com.au: domain at bewatermyfriend.org does not designate permitted sender hosts) From: Frank Terbeck To: zsh-workers@zsh.org Cc: Seth House Subject: PATCH: (1/3) vcs_info: hg fixes and enhancements Date: Tue, 16 Feb 2010 00:52:13 +0100 Message-Id: <1266277935-18165-2-git-send-email-ft@bewatermyfriend.org> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1266277935-18165-1-git-send-email-ft@bewatermyfriend.org> References: <1266277935-18165-1-git-send-email-ft@bewatermyfriend.org> X-Df-Sender: 430444 From: Seth House --- Doc/Zsh/contrib.yo | 13 +++++--- Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 36 ++++++++++++++-------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index b815e01..2c3fc39 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -532,14 +532,17 @@ example(zstyle ':vcs_info:*' disable-patterns "$HOME/.zsh+LPAR()|/*+RPAR()") ) kindex(check-for-changes) item(tt(check-for-changes))( -If enabled, this style (currently only used by the tt(git) backend) causes the -tt(%c) and tt(%u) format escapes to be filled with information. The strings -filled into these escapes can be controlled via the var(stagedstr) and -var(unstagedstr) styles. +If enabled, this style causes the tt(%c) and tt(%u) format escapes to be filled +with information. The strings filled into these escapes can be controlled via +the var(stagedstr) and var(unstagedstr) styles. The only backends that +currently support this option are tt(git) and tt(hg) (tt(hg) only supports +unstaged). Note, that the actions taken if this style is enabled are potentially expensive (read: they take time, depending on how big the current repository is). -Therefore, it is disabled by default. +Therefore, it is disabled by default. In order to use this style with +the tt(hg) backend you must also use the var(get-revision) style to avoid +having to start the interpretrer more than once. ) kindex(stagedstr) item(tt(stagedstr))( diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index 0b66463..6689015 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -3,7 +3,8 @@ ## Distributed under the same BSD-ish license as zsh itself. setopt localoptions NO_shwordsplit -local file hgbranch hgbranch_name hgbase hghash hglrev hgmisc r_branch r_info revformat +local file hgbranch hgbranch_name hgbase hglhash hgshash hglrev hgmisc \ + r_branch hgchanges revformat VCS_INFO_hg_get_mq_top_patch () { local patchdir=$1 @@ -29,27 +30,36 @@ else hgbranch_name="default" fi -hghash='' +hglhash='' hglrev='' if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then # Calling the 'hg' program is quite a bit too slow for prompts. # If there's a way around that, I'd be interested. # Disabled by default anyway, so no harm done. - HGRCPATH="/dev/null" ${vcs_comm[cmd]} branches \ - | while read -r r_branch r_info ; do - if [[ ${r_branch} == ${hgbranch_name} ]] ; then - match=() - : ${r_info/(#b)([^:]##):(*)} - hglrev=${match[1]} - hghash=${match[2]} - break + if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" \ + "check-for-changes" ; then + + HGRCPATH="/dev/null" ${vcs_comm[cmd]} id -i -n -b \ + | read -r hglhash hglrev r_branch + + # Are there uncommitted-changes? + if [[ $hglrev[-1] == + ]] ; then + hgchanges=1 fi - done + + # Remove uncommitted-changes marker, if any + hglrev=${hglrev/+/} + hglhash=${hglhash/+/} + else + HGRCPATH="/dev/null" ${vcs_comm[cmd]} \ + parents --template="{node} {node|short} {rev} {branches}\n" \ + | read -r hglhash hgshash hglrev r_branch + fi if [[ -n ${hglrev} ]] ; then zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" hgrevformat revformat || revformat="%r:%h" - zformat -f hglrev "${revformat}" "r:${hglrev}" "h:${hghash}" + zformat -f hglrev "${revformat}" "r:${hglrev}" "h:${hglhash}" zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" branchformat hgbranch || hgbranch="%b:%r" zformat -f hgbranch "${hgbranch}" "b:${hgbranch_name}" "r:${hglrev}" fi @@ -67,5 +77,5 @@ else hgmisc='' fi -VCS_INFO_formats '' "${hgbranch}" "${hgbase}" '' '' "${hglrev}" "${hgmisc}" +VCS_INFO_formats '' "${hgbranch}" "${hgbase}" '' "${hgchanges}" "${hglrev}" "${hgmisc}" return 0 -- 1.7.0