From: Jim Meyering <jim@meyering.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Paul Mackerras <paulus@samba.org>, git list <git@vger.kernel.org>
Subject: Re: [PATCH] gitk: make "git describe" output clickable, too
Date: Wed, 01 Feb 2012 14:17:13 +0100 [thread overview]
Message-ID: <871uqeelra.fsf@rho.meyering.net> (raw)
In-Reply-To: <7v62hl4llk.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 12 Dec 2011 11:48:55 -0800")
Junio C Hamano wrote:
> Jim Meyering <jim@meyering.net> writes:
>
>> I noticed that automake's contribution guidelines suggest using
>> "git describe" output in commit logs to reference previous commits.
>> By contrast, in coreutils, I had acquired the habit of using a bare SHA1
>> prefix (8 hex digits), since gitk creates clickable links for that, and
>> not for "git describe" output.
>>
>> I prefer the readability of the full "git describe" output, yet want to
>> retain the gitk links, so wrote the following that renders as clickable
>> not just SHA1-like strings, but also an SHA1-like string that is
>> prefixed by "-g".
>>
>> Signed-off-by: Jim Meyering <meyering@redhat.com>
>> ---
>> This is relative to master.
>> Think of this as mere proof-of-concept:
>
> Paul, I think this makes tons of sense. Comments?
Thanks for the feedback, Junio.
>> Ideally, the string preceding the -g would be used to disambiguate
>> the SHA1 prefix, but that would require more code.
>>
>> I confess that I haven't looked to see if documentation needs
>> to be updated or if this would merit test suite additions.
>>
>> gitk-git/gitk | 6 +++++-
>> 1 files changed, 5 insertions(+), 1 deletions(-)
>>
>> diff --git a/gitk-git/gitk b/gitk-git/gitk
>> index 4cde0c4..f8eb613 100755
>> --- a/gitk-git/gitk
>> +++ b/gitk-git/gitk
>> @@ -6688,7 +6688,7 @@ proc appendwithlinks {text tags} {
>>
>> set start [$ctext index "end - 1c"]
>> $ctext insert end $text $tags
>> - set links [regexp -indices -all -inline {\m[0-9a-f]{6,40}\M} $text]
>> + set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
>> foreach l $links {
>> set s [lindex $l 0]
>> set e [lindex $l 1]
>> @@ -6704,6 +6704,10 @@ proc appendwithlinks {text tags} {
>> proc setlink {id lk} {
>> global curview ctext pendinglinks
>>
>> + if {[string range $id 0 1] eq "-g"} {
>> + set id [string range $id 2 end]
>> + }
>> +
>> set known 0
>> if {[string length $id] < 40} {
>> set matches [longid $id]
>> --
>> 1.7.8.163.g9859a
prev parent reply other threads:[~2012-02-01 13:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-10 15:08 [PATCH] gitk: make "git describe" output clickable, too Jim Meyering
2011-12-12 19:48 ` Junio C Hamano
2012-02-01 13:17 ` Jim Meyering [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871uqeelra.fsf@rho.meyering.net \
--to=jim@meyering.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox