From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, szeder@ira.uka.de,
"Shawn O. Pearce" <spearce@spearce.org>
Subject: [PATCH 1/3] for-each-ref: utilize core.warnambiguousrefs for strict refname:short format
Date: Mon, 22 Sep 2008 11:09:49 +0200 [thread overview]
Message-ID: <1222074591-26548-1-git-send-email-bert.wesarg@googlemail.com> (raw)
core.warnambiguousrefs is used to enable strict mode for the
abbreviation.
In strict mode, the abbreviated ref will never trigger the
'warn_ambiguous_refs' warning. I.e. for these refs:
refs/heads/xyzzy
refs/tags/xyzzy
the abbreviated forms are:
heads/xyzzy
tags/xyzzy
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
On Tue, Sep 9, 2008 at 10:05, Junio C Hamano <gitster@pobox.com> wrote:
> "Bert Wesarg" <bert.wesarg@googlemail.com> writes:
>
>> Any opinions, whether we want the 'strict' mode? i.e.:
>>
>> for refs/heads/xyzzy and refs/tags/xyzzy:
>>
>> loose mode (current implementation):
>>
>> refs/heads/xyzzy => heads/xyzzy
>> refs/tags/xyzzy => xyzzy
>>
>> there would be a ambiguous warning (if enabled) if you use xyzzy as a
>> tag, but it resolves correctly to the tag.
>>
>> strict mode:
>>
>> refs/heads/xyzzy => heads/xyzzy
>> refs/tags/xyzzy => tags/xyzzy
>>
>> will always produce a non-ambiguous short forms.
>
> I have no strong opinions either way, but if we want to pick only one, I
> suspect that the loose mode would be more appropriate for bash completion
> purposes exactly because:
>
> (1) the shorter form would match the users' expectations, and;
>
> (2) if it triggers ambiguity warning to use that result that matches
> users' expectations, it is a *good thing* --- it reminds the user
> that s/he is playing with fire _if_ the user is of careful type who
> enables the ambiguity warning.
>
> Thinking about it from a different angle, it would make more sense to use
> loose mode if the user does not have ambiguity warning configured, and use
> strict mode if the warning is enabled. Then people who will get warnings
> from ambiguity will not get an ambiguous completion, and people who won't
> will get shorter but still unambiguous completion.
Cc: git@vger.kernel.org
Cc: szeder@ira.uka.de
Cc: "Shawn O. Pearce" <spearce@spearce.org>
Documentation/git-for-each-ref.txt | 2 +
builtin-for-each-ref.c | 43 ++++++++++++++++++++++-------------
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 5061d3e..265bbf3 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -75,6 +75,8 @@ For all objects, the following names can be used:
refname::
The name of the ref (the part after $GIT_DIR/).
For a non-ambiguous short name of the ref append `:short`.
+ The option core.warnambiguousrefs is used to enable the strict mode
+ for the abbretiation.
objecttype::
The type of the object (`blob`, `tree`, `commit`, `tag`).
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 9b44092..e7b7712 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -571,7 +571,7 @@ static void gen_scanf_fmt(char *scanf_fmt, const char *rule)
/*
* Shorten the refname to an non-ambiguous form
*/
-static char *get_short_ref(struct refinfo *ref)
+static void get_short_ref(struct refinfo *ref, int strict, char **short_ref)
{
int i;
static char **scanf_fmts;
@@ -598,16 +598,16 @@ static char *get_short_ref(struct refinfo *ref)
}
}
- /* bail out if there are no rules */
- if (!nr_rules)
- return ref->refname;
-
/* buffer for scanf result, at most ref->refname must fit */
short_name = xstrdup(ref->refname);
+ *short_ref = short_name;
- /* skip first rule, it will always match */
- for (i = nr_rules - 1; i > 0 ; --i) {
- int j;
+ /* bail out if there are no rules */
+ if (!nr_rules)
+ return;
+
+ for (i = nr_rules - 1; i >= 0 ; --i) {
+ int j, rules_to_fail = i;
int short_name_len;
if (1 != sscanf(ref->refname, scanf_fmts[i], short_name))
@@ -616,13 +616,23 @@ static char *get_short_ref(struct refinfo *ref)
short_name_len = strlen(short_name);
/*
+ * in strict mode, all (except the matched one) rules
+ * must fail to resolve to a valid ref
+ */
+ if (strict)
+ rules_to_fail = nr_rules;
+ /*
* check if the short name resolves to a valid ref,
* but use only rules prior to the matched one
*/
- for (j = 0; j < i; j++) {
+ for (j = 0; j < rules_to_fail; j++) {
const char *rule = ref_rev_parse_rules[j];
unsigned char short_objectname[20];
+ /* skip matched rule */
+ if (i == j)
+ continue;
+
/*
* the short name is ambiguous, if it resolves
* (with this previous rule) to a valid ref
@@ -635,14 +645,14 @@ static char *get_short_ref(struct refinfo *ref)
/*
* short name is non-ambiguous if all previous rules
- * haven't resolved to a valid ref
+ * doesn't resolved to a valid ref
*/
- if (j == i)
- return short_name;
+ if (j == rules_to_fail)
+ return;
}
- free(short_name);
- return ref->refname;
+ /* can't abbreviate refname, return full name */
+ strcpy(short_name, ref->refname);
}
@@ -678,13 +688,14 @@ static void populate_value(struct refinfo *ref)
}
if (!prefixcmp(name, "refname")) {
const char *formatp = strchr(name, ':');
- const char *refname = ref->refname;
+ char *refname = ref->refname;
/* look for "short" refname format */
if (formatp) {
formatp++;
if (!strcmp(formatp, "short"))
- refname = get_short_ref(ref);
+ get_short_ref(ref, warn_ambiguous_refs,
+ &refname);
else
die("unknown refname format %s",
formatp);
--
1.6.0.1
next reply other threads:[~2008-09-22 9:11 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-22 9:09 Bert Wesarg [this message]
2008-09-22 9:09 ` [PATCH 2/3] for-each-ref: factor out get_short_ref() into refs.c:abbreviate_refname() Bert Wesarg
2008-09-22 9:09 ` [PATCH 3/3] git abbref-ref: new porcelain for abbreviate_ref() Bert Wesarg
2008-09-22 15:32 ` Shawn O. Pearce
2008-09-22 15:55 ` Junio C Hamano
2008-09-22 16:45 ` Bert Wesarg
2008-09-22 16:43 ` Bert Wesarg
2008-09-22 16:27 ` [PATCH 1/3] for-each-ref: utilize core.warnambiguousrefs for strict refname:short format Junio C Hamano
2008-09-22 18:00 ` Bert Wesarg
2008-10-17 23:58 ` Junio C Hamano
2008-10-18 1:50 ` Shawn O. Pearce
2008-10-18 6:55 ` Bert Wesarg
-- strict thread matches above, loose matches on Subject: below --
2009-04-07 7:02 [RFC/PATCH 0/5] making upstream branch information accessible Jeff King
2009-04-07 7:05 ` [PATCH 1/5] for-each-ref: refactor get_short_ref function Jeff King
2009-04-07 7:06 ` [PATCH 2/5] for-each-ref: refactor refname handling Jeff King
2009-04-08 6:22 ` Junio C Hamano
2009-04-08 6:27 ` Jeff King
2009-04-07 7:09 ` [PATCH 3/5] for-each-ref: add "upstream" format field Jeff King
2009-04-07 7:14 ` [PATCH 4/5] make get_short_ref a public function Jeff King
2009-04-07 7:39 ` Bert Wesarg
2009-04-09 8:18 ` Jeff King
2009-04-09 9:05 ` Bert Wesarg
2009-04-11 17:14 ` [PATCH&RFC] get_short_ref(): add strict mode Bert Wesarg
2009-04-11 19:23 ` Junio C Hamano
2009-04-11 19:50 ` Bert Wesarg
2009-04-11 20:35 ` [PATCH] for-each-ref: refname:short utilize core.warnAmbiguousRefs Bert Wesarg
2009-04-13 8:15 ` [PATCH 4/5] make get_short_ref a public function Jeff King
2009-04-07 7:57 ` Michael J Gruber
2009-04-07 7:16 ` [PATCH 5/5] branch: show upstream branch when double verbose Jeff King
2009-04-07 8:02 ` Michael J Gruber
2009-04-09 8:23 ` Jeff King
2009-04-09 10:15 ` Santi Béjar
2009-04-13 8:34 ` Jeff King
2009-04-13 17:04 ` Wincent Colaiuta
2009-04-07 8:12 ` Paolo Ciarrocchi
2009-04-07 7:33 ` [PATCH] for-each-ref: remove multiple xstrdup() in get_short_ref() Bert Wesarg
2009-04-07 7:44 ` Jeff King
2009-04-07 7:54 ` Bert Wesarg
2009-04-07 21:41 ` Jeff King
2009-04-07 7:44 ` Bert Wesarg
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1222074591-26548-1-git-send-email-bert.wesarg@googlemail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
--cc=szeder@ira.uka.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).