Moves the function get_short_ref() from builtin-for-each-ref.c into refs.c
as function abbreviate_refname().
Signed-off-by: Bert Wesarg <bert.wesarg@xxxxxxxxxxxxxx>
---
Cc: git@xxxxxxxxxxxxxxx
Cc: szeder@xxxxxxxxxx
Cc: "Shawn O. Pearce" <spearce@xxxxxxxxxxx>
builtin-for-each-ref.c | 116 +----------------------------------------------
cache.h | 1 +
refs.c | 110 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 114 insertions(+), 113 deletions(-)
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index e7b7712..06fd6a2 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -546,117 +546,6 @@ static void grab_values(struct atom_value *val, int deref, struct object *obj, v
}
/*
- * generate a format suitable for scanf from a ref_rev_parse_rules
- * rule, that is replace the "%.*s" spec with a "%s" spec
- */
-static void gen_scanf_fmt(char *scanf_fmt, const char *rule)
-{
- char *spec;
-
- spec = strstr(rule, "%.*s");
- if (!spec || strstr(spec + 4, "%.*s"))
- die("invalid rule in ref_rev_parse_rules: %s", rule);
-
- /* copy all until spec */
- strncpy(scanf_fmt, rule, spec - rule);
- scanf_fmt[spec - rule] = '\0';
- /* copy new spec */
- strcat(scanf_fmt, "%s");
- /* copy remaining rule */
- strcat(scanf_fmt, spec + 4);
-
- return;
-}
-
-/*
- * Shorten the refname to an non-ambiguous form
- */
-static void get_short_ref(struct refinfo *ref, int strict, char **short_ref)
-{
- int i;
- static char **scanf_fmts;
- static int nr_rules;
- char *short_name;
-
- /* pre generate scanf formats from ref_rev_parse_rules[] */
- if (!nr_rules) {
- size_t total_len = 0;
-
- /* the rule list is NULL terminated, count them first */
- for (; ref_rev_parse_rules[nr_rules]; nr_rules++)
- /* no +1 because strlen("%s") < strlen("%.*s") */
- total_len += strlen(ref_rev_parse_rules[nr_rules]);
-
- scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len);
-
- total_len = 0;
- for (i = 0; i < nr_rules; i++) {
- scanf_fmts[i] = (char *)&scanf_fmts[nr_rules]
- + total_len;
- gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]);
- total_len += strlen(ref_rev_parse_rules[i]);
- }
- }
-
- /* buffer for scanf result, at most ref->refname must fit */
- short_name = xstrdup(ref->refname);
- *short_ref = short_name;
-
- /* 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))
- continue;
-
- 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 < 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
- * read_ref() returns 0 on success
- */
- if (!read_ref(mkpath(rule, short_name_len, short_name),
- short_objectname))
- break;
- }
-
- /*
- * short name is non-ambiguous if all previous rules
- * doesn't resolved to a valid ref
- */
- if (j == rules_to_fail)
- return;
- }
-
- /* can't abbreviate refname, return full name */
- strcpy(short_name, ref->refname);
-}
-
-
-/*
* Parse the object referred by ref, and grab needed value.
*/
static void populate_value(struct refinfo *ref)
@@ -694,8 +583,9 @@ static void populate_value(struct refinfo *ref)
if (formatp) {
formatp++;
if (!strcmp(formatp, "short"))
- get_short_ref(ref, warn_ambiguous_refs,
- &refname);
+ abbreviate_refname(ref->refname,
+ warn_ambiguous_refs,
+ &refname);
else
die("unknown refname format %s",
formatp);
diff --git a/cache.h b/cache.h
index de8c2b6..8a128a5 100644
--- a/cache.h
+++ b/cache.h
@@ -582,6 +582,7 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);
extern const char *ref_rev_parse_rules[];
extern const char *ref_fetch_rules[];
+extern void abbreviate_refname(const char *refname, int strict, char **abbrev_name);
extern int create_symref(const char *ref, const char *refs_heads_master, const char *logmsg);
extern int validate_headref(const char *ref);
diff --git a/refs.c b/refs.c
index b680750..f370081 100644
--- a/refs.c
+++ b/refs.c
@@ -730,6 +730,116 @@ int refname_match(const char *abbrev_name, const char *full_name, const char **r
return 0;
}
+/*
+ * generate a format suitable for scanf from a ref_rev_parse_rules rule
+ * that is replace the "%.*s" spec with a "%s" spec
+ */
+static void gen_scanf_fmt(char *scanf_fmt, const char *rule)
+{
+ char *spec;
+
+ spec = strstr(rule, "%.*s");
+ if (!spec || strstr(spec + 4, "%.*s"))
+ die("invalid rule in ref_rev_parse_rules: %s", rule);
+
+ /* copy all until spec */
+ strncpy(scanf_fmt, rule, spec - rule);
+ scanf_fmt[spec - rule] = '\0';
+ /* copy new spec */
+ strcat(scanf_fmt, "%s");
+ /* copy remaining rule */
+ strcat(scanf_fmt, spec + 4);
+}
+
+/*
+ * Abbreviate refname to an non-ambiguous form, undefined if refname is not
+ * a fully quallified refname
+ */
+void abbreviate_refname(const char *refname, int strict, char **abbrev_name)
+{
+ int i;
+ static char **scanf_fmts;
+ static int nr_rules;
+ char *abbrev;
+
+ /* pre generate scanf formats from ref_rev_parse_rules[] */
+ if (!nr_rules) {
+ size_t total_len = 0;
+
+ /* the rule list is NULL terminated, count them first */
+ for (; ref_rev_parse_rules[nr_rules]; nr_rules++)
+ /* no +1 because strlen("%s") < strlen("%.*s") */
+ total_len += strlen(ref_rev_parse_rules[nr_rules]);
+
+ scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len);
+
+ total_len = 0;
+ for (i = 0; i < nr_rules; i++) {
+ scanf_fmts[i] = (char *)&scanf_fmts[nr_rules]
+ + total_len;
+ gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]);
+ total_len += strlen(ref_rev_parse_rules[i]);
+ }
+ }
+
+ /* buffer for scanf result, at most refname must fit */
+ abbrev = xstrdup(refname);
+ *abbrev_name = abbrev;
+
+ /* 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 abbrev_len;
+
+ if (1 != sscanf(refname, scanf_fmts[i], abbrev))
+ continue;
+
+ abbrev_len = strlen(abbrev);
+
+ /*
+ * 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,
+ */
+ for (j = 0; j < rules_to_fail; j++) {
+ const char *rule = ref_rev_parse_rules[j];
+ unsigned char abbrev_objectname[20];
+
+ /* skip matched rule */
+ if (i == j)
+ continue;
+
+ /*
+ * the abbreviated name is ambiguous,
+ * if it resolves to a valid ref
+ *
+ * read_ref() returns 0 on success
+ */
+ if (!read_ref(mkpath(rule, abbrev_len, abbrev),
+ abbrev_objectname))
+ break;
+ }
+
+ /*
+ * abbrev is non-ambiguous if all rules
+ * doesn't resolved to a valid ref
+ */
+ if (j == rules_to_fail)
+ return;
+ }
+
+ /* can't abbreviate refname, return full name */
+ strcpy(abbrev, refname);
+}
+
static struct ref_lock *verify_lock(struct ref_lock *lock,
const unsigned char *old_sha1, int mustexist)
{
--
1.6.0.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
