From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23870 invoked by alias); 28 Sep 2012 21:52:09 -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: 30701 Received: (qmail 13701 invoked from network); 28 Sep 2012 21:52:05 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 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 Subject: [PATCH 2/2] Added an hg hook example to restore the 40-char hash Date: Fri, 28 Sep 2012 23:44:06 +0200 Message-Id: <1348868646-24756-2-git-send-email-ft@bewatermyfriend.org> X-Mailer: git-send-email 1.7.12.1.382.gb0576a6 In-Reply-To: <1348868646-24756-1-git-send-email-ft@bewatermyfriend.org> References: <1348868646-24756-1-git-send-email-ft@bewatermyfriend.org> X-Df-Sender: [pbs]NDMwNDQ0 From: Seth House In addition this removes the hg example to truncate the 40-char hash since that is now the default behavior. --- Misc/vcs_info-examples | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples index 0afb790..b07bfc6 100644 --- a/Misc/vcs_info-examples +++ b/Misc/vcs_info-examples @@ -129,32 +129,29 @@ zstyle ':vcs_info:*+*:*' debug false ### Truncate Long Hashes ### Truncate a long hash to 12 characters (which is usually unique enough) -# NOTE: On Mercurial this will hide the second parent hash during a merge -# (see an example below on how to retain both parents) # Use zformat syntax (remember %i is the hash): %12.12i # git: zstyle ':vcs_info:git*' formats "(%s)-[%12.12i %b]-" # hash & branch -# hg: -# First, remove the hash from the default 'branchformat': -zstyle ':vcs_info:hg:*' branchformat '%b' -# Then add the hash to 'formats' as %i and truncate it to 12 chars: -zstyle ':vcs_info:hg:*' formats ' (%s)-[%12.12i %b]-' -### hg: Truncate long hash to 12-chars but also allow for multiple parents -# Hashes are joined with a + to mirror the output of `hg id`. -zstyle ':vcs_info:hg+set-hgrev-format:*' hooks hg-shorthash -function +vi-hg-shorthash() { - local -a parents - - parents=( ${(s:+:)hook_com[hash]} ) - parents=( ${(@r:12:)parents} ) - hook_com[rev-replace]=${(j:+:)parents} - - ret=1 +### Fetch the full 40-character Mercurial revision id +# There is no great way to obtain branch, local rev, and untracked changes in +# addition to the full 40-character global rev id with a single invocation of +# Mercurial. This hook obtains the full global rev id using hexdump (in the +# same way the use-simple flag does) while retaining all the other vcs_info +# default functionality and information. +zstyle ':vcs_info:hg*+set-message:*' hooks hg-fullglobalrev + +# Output the full 40-char global rev id +function +vi-hg-fullglobalrev() { + local dirstatefile="${hook_com[base]}/.hg/dirstate" + local grevid="$(hexdump -n 20 -e '1/1 "%02x"' ${dirstatefile})" + # Omit %h from your hgrevformat since it will be included below + hook_com[revision]="${hook_com[revision]} ${grevid}" } + ### Display the existence of files not yet known to VCS ### git: Show marker (T) if there are untracked files in repository -- 1.7.12.1.382.gb0576a6