{"thread":{"id":"39450","subject":"[PATCH/WIP v3 1/4] for-each-ref: re-structure code for moving to 'ref-filter'","startedAt":"2015-05-28T17:38:02Z","lastAt":"2015-05-28T21:28:37Z","messageCount":15,"participants":["Karthik Nayak","Matthieu Moy","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":4},"messages":[{"id":"262345","messageId":"5567527A.6090607@gmail.com","threadId":"39450","inReplyTo":null,"subject":"[PATCH/WIP v3 1/4] for-each-ref: re-structure code for moving to 'ref-filter'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T17:38:02Z","receivedAt":"2015-05-28T17:38:02Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Hello,\n\nAfter the second version of the WIP/PATCH ($gmane/269836), This is a \nfollow up.\n\nChanges:\n*\tBroke down the first commit into 3 separate commits, cause they were \nlogically different and needed to built up incrementally.\n*\trenamed some functions which were made public so that they don't seem \nvague.\n*\tother small changes.\n-- \nRegards,\nKarthik\n"},{"id":"262346","messageId":"1432835025-13291-1-git-send-email-karthik.188@gmail.com","threadId":"39450","inReplyTo":"5567527A.6090607@gmail.com","subject":"[PATCH/WIP v3 1/4] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T17:43:42Z","receivedAt":"2015-05-28T17:43:42Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Extract two helper functions out of grab_single_ref(). Firstly,\nnew_refinfo() which is used to allocate memory for a new refinfo\nstructure and copy the objectname, refname and flag to it.\nSecondly, match_name_as_path() which when given an array of patterns\nand the refname checks if the refname matches any of the patterns\ngiven while the pattern is a pathname, also while supporting wild\ncharacters.\n\nThis is a preperatory patch for restructuring 'for-each-ref' and\nevntually moving most of it to 'ref-filter' to provide the\nfunctionality to similar commands via public API's.\n\nHelped-by: Junio C Hamano \nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 76 ++++++++++++++++++++++++++++----------------------\n 1 file changed, 43 insertions(+), 33 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 83f9cf9..919d45e 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -837,6 +837,43 @@ struct grab_ref_cbdata {\n };\n \n /*\n+ * Given a refname, return 1 if the refname matches with one of the patterns\n+ * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n+ * and so on, else return 0. Supports use of wild characters.\n+ */\n+static int match_name_as_path(const char **pattern, const char *refname)\n+{\n+\tint namelen = strlen(refname);\n+\tfor (; *pattern; pattern++) {\n+\t\tconst char *p = *pattern;\n+\t\tint plen = strlen(p);\n+\n+\t\tif ((plen <= namelen) &&\n+\t\t !strncmp(refname, p, plen) &&\n+\t\t (refname[plen] == '\\0' ||\n+\t\t refname[plen] == '/' ||\n+\t\t p[plen-1] == '/'))\n+\t\t\treturn 1;\n+\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n+\t\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* Allocate space for a new refinfo and copy the objectname and flag to it */\n+static struct refinfo *new_refinfo(const char *refname,\n+\t\t\t\t const unsigned char *objectname,\n+\t\t\t\t int flag)\n+{\n+\tstruct refinfo *ref = xcalloc(1, sizeof(struct refinfo));\n+\tref->refname = xstrdup(refname);\n+\thashcpy(ref->objectname, objectname);\n+\tref->flag = flag;\n+\n+\treturn ref;\n+}\n+\n+/*\n * A call-back given to for_each_ref(). Filter refs and keep them for\n * later object processing.\n */\n@@ -844,47 +881,20 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f\n {\n \tstruct grab_ref_cbdata *cb = cb_data;\n \tstruct refinfo *ref;\n-\tint cnt;\n \n \tif (flag & REF_BAD_NAME) {\n \t\t warning(\"ignoring ref with broken name %s\", refname);\n \t\t return 0;\n \t}\n \n-\tif (*cb->grab_pattern) {\n-\t\tconst char **pattern;\n-\t\tint namelen = strlen(refname);\n-\t\tfor (pattern = cb->grab_pattern; *pattern; pattern++) {\n-\t\t\tconst char *p = *pattern;\n-\t\t\tint plen = strlen(p);\n-\n-\t\t\tif ((plen <= namelen) &&\n-\t\t\t !strncmp(refname, p, plen) &&\n-\t\t\t (refname[plen] == '\\0' ||\n-\t\t\t refname[plen] == '/' ||\n-\t\t\t p[plen-1] == '/'))\n-\t\t\t\tbreak;\n-\t\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n-\t\t\t\tbreak;\n-\t\t}\n-\t\tif (!*pattern)\n-\t\t\treturn 0;\n-\t}\n+\tif (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname))\n+\t\treturn 0;\n \n-\t/*\n-\t * We do not open the object yet; sort may only need refname\n-\t * to do its job and the resulting list may yet to be pruned\n-\t * by maxcount logic.\n-\t */\n-\tref = xcalloc(1, sizeof(*ref));\n-\tref->refname = xstrdup(refname);\n-\thashcpy(ref->objectname, sha1);\n-\tref->flag = flag;\n+\tref = new_refinfo(refname, sha1, flag);\n+\n+\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n+\tcb->grab_array[cb->grab_cnt++] = ref;\n \n-\tcnt = cb->grab_cnt;\n-\tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n-\tcb->grab_array[cnt++] = ref;\n-\tcb->grab_cnt = cnt;\n \treturn 0;\n }\n \n-- \n2.4.1\n"},{"id":"262347","messageId":"1432835025-13291-2-git-send-email-karthik.188@gmail.com","threadId":"39450","inReplyTo":"5567527A.6090607@gmail.com","subject":"[PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T17:43:43Z","receivedAt":"2015-05-28T17:43:43Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'\nwhich will hold 'ref_filter' (Conditions to filter the refs on) and\n'ref_array' (The array of ref_array_items). Modify the code to use\nthese new structures.\n\nRe-order the fields in 'ref_array_item' so that refname can be\neventually converted to a FLEX_ARRAY.\n\nIntroduce 'ref_filter_clear_data' to clear all allocated memory.\n\nThis is a preparatory patch to eventually move code from 'for-each-ref'\nto 'ref-filter' and making it publically available.\n\nMentored-by: Christian Couder Mentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 103 +++++++++++++++++++++++++++++--------------------\n 1 file changed, 61 insertions(+), 42 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 919d45e..d9fd512 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -31,12 +31,26 @@ struct ref_sort {\n \tunsigned reverse : 1;\n };\n \n-struct refinfo {\n-\tchar *refname;\n+struct ref_array_item {\n \tunsigned char objectname[20];\n \tint flag;\n \tconst char *symref;\n \tstruct atom_value *value;\n+\tchar *refname;\n+};\n+\n+struct ref_array {\n+\tint nr, alloc;\n+\tstruct ref_array_item **items;\n+};\n+\n+struct ref_filter {\n+\tconst char **name_patterns;\n+};\n+\n+struct ref_filter_cbdata {\n+\tstruct ref_array array;\n+\tstruct ref_filter filter;\n };\n \n static struct {\n@@ -85,7 +99,7 @@ static struct {\n * a \"*\" to denote deref_tag().\n *\n * We parse given format string and sort specifiers, and make a list\n- * of properties that we need to extract out of objects. refinfo\n+ * of properties that we need to extract out of objects. ref_array_item\n * structure will hold an array of values extracted that can be\n * indexed with the \"atom number\", which is an index into this\n * array.\n@@ -622,7 +636,7 @@ static inline char *copy_advance(char *dst, const char *src)\n /*\n * Parse the object referred by ref, and grab needed value.\n */\n-static void populate_value(struct refinfo *ref)\n+static void populate_value(struct ref_array_item *ref)\n {\n \tvoid *buf;\n \tstruct object *obj;\n@@ -821,7 +835,7 @@ static void populate_value(struct refinfo *ref)\n * Given a ref, return the value for the atom. This lazily gets value\n * out of the object by calling populate value.\n */\n-static void get_value(struct refinfo *ref, int atom, struct atom_value **v)\n+static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n {\n \tif (!ref->value) {\n \t\tpopulate_value(ref);\n@@ -830,12 +844,6 @@ static void get_value(struct refinfo *ref, int atom, struct atom_value **v)\n \t*v = &ref->value[atom];\n }\n \n-struct grab_ref_cbdata {\n-\tstruct refinfo **grab_array;\n-\tconst char **grab_pattern;\n-\tint grab_cnt;\n-};\n-\n /*\n * Given a refname, return 1 if the refname matches with one of the patterns\n * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n@@ -860,12 +868,12 @@ static int match_name_as_path(const char **pattern, const char *refname)\n \treturn 0;\n }\n \n-/* Allocate space for a new refinfo and copy the objectname and flag to it */\n-static struct refinfo *new_refinfo(const char *refname,\n-\t\t\t\t const unsigned char *objectname,\n-\t\t\t\t int flag)\n+/* Allocate space for a new ref_array_item and copy the objectname and flag to it */\n+static struct ref_array_item *new_ref_array_item(const char *refname,\n+\t\t\t\t\t\t const unsigned char *objectname,\n+\t\t\t\t\t\t int flag)\n {\n-\tstruct refinfo *ref = xcalloc(1, sizeof(struct refinfo));\n+\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n \tref->refname = xstrdup(refname);\n \thashcpy(ref->objectname, objectname);\n \tref->flag = flag;\n@@ -879,26 +887,39 @@ static struct refinfo *new_refinfo(const char *refname,\n */\n static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n {\n-\tstruct grab_ref_cbdata *cb = cb_data;\n-\tstruct refinfo *ref;\n+\tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n+\tstruct ref_filter *filter = &ref_cbdata->filter;\n+\tstruct ref_array_item *ref;\n \n \tif (flag & REF_BAD_NAME) {\n-\t\t warning(\"ignoring ref with broken name %s\", refname);\n-\t\t return 0;\n+\t\twarning(\"ignoring ref with broken name %s\", refname);\n+\t\treturn 0;\n \t}\n \n-\tif (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname))\n+\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))\n \t\treturn 0;\n \n-\tref = new_refinfo(refname, sha1, flag);\n+\tref = new_ref_array_item(refname, sha1, flag);\n \n-\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n-\tcb->grab_array[cb->grab_cnt++] = ref;\n+\tREALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);\n+\tref_cbdata->array.items[ref_cbdata->array.nr++] = ref;\n \n \treturn 0;\n }\n \n-static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b)\n+/* Free all memory allocated for ref_filter_cbdata */\n+void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < ref_cbdata->array.nr; i++)\n+\t\tfree(ref_cbdata->array.items[i]);\n+\tfree(ref_cbdata->array.items);\n+\tref_cbdata->array.items = NULL;\n+\tref_cbdata->array.nr = ref_cbdata->array.alloc = 0;\n+}\n+\n+static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\n \tint cmp;\n@@ -925,8 +946,8 @@ static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b\n static struct ref_sort *ref_sort;\n static int compare_refs(const void *a_, const void *b_)\n {\n-\tstruct refinfo *a = *((struct refinfo **)a_);\n-\tstruct refinfo *b = *((struct refinfo **)b_);\n+\tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n+\tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n \tstruct ref_sort *s;\n \n \tfor (s = ref_sort; s; s = s->next) {\n@@ -937,10 +958,10 @@ static int compare_refs(const void *a_, const void *b_)\n \treturn 0;\n }\n \n-static void sort_refs(struct ref_sort *sort, struct refinfo **refs, int num_refs)\n+static void sort_refs(struct ref_sort *sort, struct ref_array *array)\n {\n \tref_sort = sort;\n-\tqsort(refs, num_refs, sizeof(struct refinfo *), compare_refs);\n+\tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n }\n \n static void print_value(struct atom_value *v, int quote_style)\n@@ -1007,7 +1028,7 @@ static void emit(const char *cp, const char *ep)\n \t}\n }\n \n-static void show_ref(struct refinfo *info, const char *format, int quote_style)\n+static void show_ref(struct ref_array_item *info, const char *format, int quote_style)\n {\n \tconst char *cp, *sp, *ep;\n \n@@ -1076,12 +1097,12 @@ static char const * const for_each_ref_usage[] = {\n \n int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n {\n-\tint i, num_refs;\n+\tint i;\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n \tstruct ref_sort *sort = NULL, **sort_tail = &sort;\n \tint maxcount = 0, quote_style = 0;\n-\tstruct refinfo **refs;\n-\tstruct grab_ref_cbdata cbdata;\n+\tstruct ref_filter_cbdata ref_cbdata;\n+\tmemset(&ref_cbdata, 0, sizeof(ref_cbdata));\n \n \tstruct option opts[] = {\n \t\tOPT_BIT('s', \"shell\", "e_style,\n@@ -1119,17 +1140,15 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t/* for warn_ambiguous_refs */\n \tgit_config(git_default_config, NULL);\n \n-\tmemset(&cbdata, 0, sizeof(cbdata));\n-\tcbdata.grab_pattern = argv;\n-\tfor_each_rawref(grab_single_ref, &cbdata);\n-\trefs = cbdata.grab_array;\n-\tnum_refs = cbdata.grab_cnt;\n+\tref_cbdata.filter.name_patterns = argv;\n+\tfor_each_rawref(grab_single_ref, &ref_cbdata);\n \n-\tsort_refs(sort, refs, num_refs);\n+\tsort_refs(sort, &ref_cbdata.array);\n \n-\tif (!maxcount || num_refs < maxcount)\n-\t\tmaxcount = num_refs;\n+\tif (!maxcount || ref_cbdata.array.nr < maxcount)\n+\t\tmaxcount = ref_cbdata.array.nr;\n \tfor (i = 0; i < maxcount; i++)\n-\t\tshow_ref(refs[i], format, quote_style);\n+\t\tshow_ref(ref_cbdata.array.items[i], format, quote_style);\n+\tref_filter_clear_data(&ref_cbdata);\n \treturn 0;\n }\n-- \n2.4.1\n"},{"id":"262348","messageId":"1432835025-13291-3-git-send-email-karthik.188@gmail.com","threadId":"39450","inReplyTo":"5567527A.6090607@gmail.com","subject":"[PATCH/WIP v3 3/4] for-each-ref: rename some functions and make them public","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T17:43:44Z","receivedAt":"2015-05-28T17:43:44Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Rename some of the functions and make them publically available.\nThis is a preparatory step for moving code from 'for-each-ref'\nto 'ref-filter' to make meaningful, targeted services available to\nother commands via public APIs.\n\nBased-on-patch-by: Jeff King \nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 45 +++++++++++++++++++++++----------------------\n 1 file changed, 23 insertions(+), 22 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex d9fd512..f045def 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -112,7 +112,7 @@ static int need_color_reset_at_eol;\n /*\n * Used to parse format string and sort specifiers\n */\n-static int parse_atom(const char *atom, const char *ep)\n+int parse_ref_filter_atom(const char *atom, const char *ep)\n {\n \tconst char *sp;\n \tint i, at;\n@@ -189,7 +189,7 @@ static const char *find_next(const char *cp)\n * Make sure the format string is well formed, and parse out\n * the used atoms.\n */\n-static int verify_format(const char *format)\n+int verify_ref_format(const char *format)\n {\n \tconst char *cp, *sp;\n \n@@ -201,7 +201,7 @@ static int verify_format(const char *format)\n \t\tif (!ep)\n \t\t\treturn error(\"malformed format string %s\", sp);\n \t\t/* sp points at \"%(\" and ep points at the closing \")\" */\n-\t\tat = parse_atom(sp + 2, ep);\n+\t\tat = parse_ref_filter_atom(sp + 2, ep);\n \t\tcp = ep + 1;\n \n \t\tif (skip_prefix(used_atom[at], \"color:\", &color))\n@@ -408,7 +408,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam\n \t/*\n \t * We got here because atomname ends in \"date\" or \"date\";\n \t * it's not possible that is not \":\" because\n-\t * parse_atom() wouldn't have allowed it, so we can assume that no\n+\t * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no\n \t * \":\" means no format is specified, and use the default.\n \t */\n \tformatp = strchr(atomname, ':');\n@@ -835,7 +835,7 @@ static void populate_value(struct ref_array_item *ref)\n * Given a ref, return the value for the atom. This lazily gets value\n * out of the object by calling populate value.\n */\n-static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n+static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n {\n \tif (!ref->value) {\n \t\tpopulate_value(ref);\n@@ -882,10 +882,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\n }\n \n /*\n- * A call-back given to for_each_ref(). Filter refs and keep them for\n+ * A call-back given to for_each_ref(). Filter refs and keep them for\n * later object processing.\n */\n-static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n {\n \tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n \tstruct ref_filter *filter = &ref_cbdata->filter;\n@@ -925,8 +925,8 @@ static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref\n \tint cmp;\n \tcmp_type cmp_type = used_atom_type[s->atom];\n \n-\tget_value(a, s->atom, &va);\n-\tget_value(b, s->atom, &vb);\n+\tget_ref_atom_value(a, s->atom, &va);\n+\tget_ref_atom_value(b, s->atom, &vb);\n \tswitch (cmp_type) {\n \tcase FIELD_STR:\n \t\tcmp = strcmp(va->s, vb->s);\n@@ -958,7 +958,7 @@ static int compare_refs(const void *a_, const void *b_)\n \treturn 0;\n }\n \n-static void sort_refs(struct ref_sort *sort, struct ref_array *array)\n+void sort_ref_array(struct ref_sort *sort, struct ref_array *array)\n {\n \tref_sort = sort;\n \tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n@@ -1028,7 +1028,7 @@ static void emit(const char *cp, const char *ep)\n \t}\n }\n \n-static void show_ref(struct ref_array_item *info, const char *format, int quote_style)\n+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)\n {\n \tconst char *cp, *sp, *ep;\n \n@@ -1038,7 +1038,7 @@ static void show_ref(struct ref_array_item *info, const char *format, int quote_\n \t\tep = strchr(sp, ')');\n \t\tif (cp < sp)\n \t\t\temit(cp, sp);\n-\t\tget_value(info, parse_atom(sp + 2, ep), &atomv);\n+\t\tget_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);\n \t\tprint_value(atomv, quote_style);\n \t}\n \tif (*cp) {\n@@ -1057,18 +1057,19 @@ static void show_ref(struct ref_array_item *info, const char *format, int quote_\n \tputchar('\\n');\n }\n \n-static struct ref_sort *default_sort(void)\n+/* If no sorting option is given, use refname to sort as default */\n+struct ref_sort *ref_default_sort(void)\n {\n \tstatic const char cstr_name[] = \"refname\";\n \n \tstruct ref_sort *sort = xcalloc(1, sizeof(*sort));\n \n \tsort->next = NULL;\n-\tsort->atom = parse_atom(cstr_name, cstr_name + strlen(cstr_name));\n+\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n \treturn sort;\n }\n \n-static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n+int opt_parse_ref_sort(const struct option *opt, const char *arg, int unset)\n {\n \tstruct ref_sort **sort_tail = opt->value;\n \tstruct ref_sort *s;\n@@ -1086,7 +1087,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n \t\targ++;\n \t}\n \tlen = strlen(arg);\n-\ts->atom = parse_atom(arg, arg+len);\n+\ts->atom = parse_ref_filter_atom(arg, arg+len);\n \treturn 0;\n }\n \n@@ -1118,7 +1119,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\tOPT_INTEGER( 0 , \"count\", &maxcount, N_(\"show only matched refs\")),\n \t\tOPT_STRING( 0 , \"format\", &format, N_(\"format\"), N_(\"format to use for the output\")),\n \t\tOPT_CALLBACK(0 , \"sort\", sort_tail, N_(\"key\"),\n-\t\t\t N_(\"field name to sort on\"), &opt_parse_sort),\n+\t\t\t N_(\"field name to sort on\"), &opt_parse_ref_sort),\n \t\tOPT_END(),\n \t};\n \n@@ -1131,24 +1132,24 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\terror(\"more than one quoting style?\");\n \t\tusage_with_options(for_each_ref_usage, opts);\n \t}\n-\tif (verify_format(format))\n+\tif (verify_ref_format(format))\n \t\tusage_with_options(for_each_ref_usage, opts);\n \n \tif (!sort)\n-\t\tsort = default_sort();\n+\t\tsort = ref_default_sort();\n \n \t/* for warn_ambiguous_refs */\n \tgit_config(git_default_config, NULL);\n \n \tref_cbdata.filter.name_patterns = argv;\n-\tfor_each_rawref(grab_single_ref, &ref_cbdata);\n+\tfor_each_rawref(ref_filter_handler, &ref_cbdata);\n \n-\tsort_refs(sort, &ref_cbdata.array);\n+\tsort_ref_array(sort, &ref_cbdata.array);\n \n \tif (!maxcount || ref_cbdata.array.nr < maxcount)\n \t\tmaxcount = ref_cbdata.array.nr;\n \tfor (i = 0; i < maxcount; i++)\n-\t\tshow_ref(ref_cbdata.array.items[i], format, quote_style);\n+\t\tshow_ref_array_item(ref_cbdata.array.items[i], format, quote_style);\n \tref_filter_clear_data(&ref_cbdata);\n \treturn 0;\n }\n-- \n2.4.1\n"},{"id":"262349","messageId":"1432835025-13291-4-git-send-email-karthik.188@gmail.com","threadId":"39450","inReplyTo":"5567527A.6090607@gmail.com","subject":"[PATCH/WIP v3 4/4] ref-filter: move code from 'for-each-ref'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T17:43:45Z","receivedAt":"2015-05-28T17:43:45Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Move most of the code from 'for-each-ref' to 'ref-filter' to make\nit publically available to other commands, this is to unify the code\nof 'tag -l', 'branch -l' and 'for-each-ref' so that they can share\ntheir implementations with each other.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n Makefile | 1 +\n builtin/for-each-ref.c | 1089 +-----------------------------------------------\n ref-filter.c | 1051 ++++++++++++++++++++++++++++++++++++++++++++++\n ref-filter.h | 66 +++\n 4 files changed, 1119 insertions(+), 1088 deletions(-)\n create mode 100644 ref-filter.c\n create mode 100644 ref-filter.h\n\ndiff --git a/Makefile b/Makefile\nindex 36655d5..068d313 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -761,6 +761,7 @@ LIB_OBJS += reachable.o\n LIB_OBJS += read-cache.o\n LIB_OBJS += reflog-walk.o\n LIB_OBJS += refs.o\n+LIB_OBJS += ref-filter.o\n LIB_OBJS += remote.o\n LIB_OBJS += replace_object.o\n LIB_OBJS += rerere.o\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex f045def..2f11c01 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -1,1095 +1,8 @@\n #include \"builtin.h\"\n #include \"cache.h\"\n #include \"refs.h\"\n-#include \"object.h\"\n-#include \"tag.h\"\n-#include \"commit.h\"\n-#include \"tree.h\"\n-#include \"blob.h\"\n-#include \"quote.h\"\n #include \"parse-options.h\"\n-#include \"remote.h\"\n-#include \"color.h\"\n-\n-/* Quoting styles */\n-#define QUOTE_NONE 0\n-#define QUOTE_SHELL 1\n-#define QUOTE_PERL 2\n-#define QUOTE_PYTHON 4\n-#define QUOTE_TCL 8\n-\n-typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;\n-\n-struct atom_value {\n-\tconst char *s;\n-\tunsigned long ul; /* used for sorting when not FIELD_STR */\n-};\n-\n-struct ref_sort {\n-\tstruct ref_sort *next;\n-\tint atom; /* index into used_atom array */\n-\tunsigned reverse : 1;\n-};\n-\n-struct ref_array_item {\n-\tunsigned char objectname[20];\n-\tint flag;\n-\tconst char *symref;\n-\tstruct atom_value *value;\n-\tchar *refname;\n-};\n-\n-struct ref_array {\n-\tint nr, alloc;\n-\tstruct ref_array_item **items;\n-};\n-\n-struct ref_filter {\n-\tconst char **name_patterns;\n-};\n-\n-struct ref_filter_cbdata {\n-\tstruct ref_array array;\n-\tstruct ref_filter filter;\n-};\n-\n-static struct {\n-\tconst char *name;\n-\tcmp_type cmp_type;\n-} valid_atom[] = {\n-\t{ \"refname\" },\n-\t{ \"objecttype\" },\n-\t{ \"objectsize\", FIELD_ULONG },\n-\t{ \"objectname\" },\n-\t{ \"tree\" },\n-\t{ \"parent\" },\n-\t{ \"numparent\", FIELD_ULONG },\n-\t{ \"object\" },\n-\t{ \"type\" },\n-\t{ \"tag\" },\n-\t{ \"author\" },\n-\t{ \"authorname\" },\n-\t{ \"authoremail\" },\n-\t{ \"authordate\", FIELD_TIME },\n-\t{ \"committer\" },\n-\t{ \"committername\" },\n-\t{ \"committeremail\" },\n-\t{ \"committerdate\", FIELD_TIME },\n-\t{ \"tagger\" },\n-\t{ \"taggername\" },\n-\t{ \"taggeremail\" },\n-\t{ \"taggerdate\", FIELD_TIME },\n-\t{ \"creator\" },\n-\t{ \"creatordate\", FIELD_TIME },\n-\t{ \"subject\" },\n-\t{ \"body\" },\n-\t{ \"contents\" },\n-\t{ \"contents:subject\" },\n-\t{ \"contents:body\" },\n-\t{ \"contents:signature\" },\n-\t{ \"upstream\" },\n-\t{ \"symref\" },\n-\t{ \"flag\" },\n-\t{ \"HEAD\" },\n-\t{ \"color\" },\n-};\n-\n-/*\n- * An atom is a valid field atom listed above, possibly prefixed with\n- * a \"*\" to denote deref_tag().\n- *\n- * We parse given format string and sort specifiers, and make a list\n- * of properties that we need to extract out of objects. ref_array_item\n- * structure will hold an array of values extracted that can be\n- * indexed with the \"atom number\", which is an index into this\n- * array.\n- */\n-static const char **used_atom;\n-static cmp_type *used_atom_type;\n-static int used_atom_cnt, need_tagged, need_symref;\n-static int need_color_reset_at_eol;\n-\n-/*\n- * Used to parse format string and sort specifiers\n- */\n-int parse_ref_filter_atom(const char *atom, const char *ep)\n-{\n-\tconst char *sp;\n-\tint i, at;\n-\n-\tsp = atom;\n-\tif (*sp == '*' && sp < ep)\n-\t\tsp++; /* deref */\n-\tif (ep <= sp)\n-\t\tdie(\"malformed field name: %.*s\", (int)(ep-atom), atom);\n-\n-\t/* Do we have the atom already used elsewhere? */\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tint len = strlen(used_atom[i]);\n-\t\tif (len == ep - atom && !memcmp(used_atom[i], atom, len))\n-\t\t\treturn i;\n-\t}\n-\n-\t/* Is the atom a valid one? */\n-\tfor (i = 0; i < ARRAY_SIZE(valid_atom); i++) {\n-\t\tint len = strlen(valid_atom[i].name);\n-\t\t/*\n-\t\t * If the atom name has a colon, strip it and everything after\n-\t\t * it off - it specifies the format for this entry, and\n-\t\t * shouldn't be used for checking against the valid_atom\n-\t\t * table.\n-\t\t */\n-\t\tconst char *formatp = strchr(sp, ':');\n-\t\tif (!formatp || ep < formatp)\n-\t\t\tformatp = ep;\n-\t\tif (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len))\n-\t\t\tbreak;\n-\t}\n-\n-\tif (ARRAY_SIZE(valid_atom) <= i)\n-\t\tdie(\"unknown field name: %.*s\", (int)(ep-atom), atom);\n-\n-\t/* Add it in, including the deref prefix */\n-\tat = used_atom_cnt;\n-\tused_atom_cnt++;\n-\tREALLOC_ARRAY(used_atom, used_atom_cnt);\n-\tREALLOC_ARRAY(used_atom_type, used_atom_cnt);\n-\tused_atom[at] = xmemdupz(atom, ep - atom);\n-\tused_atom_type[at] = valid_atom[i].cmp_type;\n-\tif (*atom == '*')\n-\t\tneed_tagged = 1;\n-\tif (!strcmp(used_atom[at], \"symref\"))\n-\t\tneed_symref = 1;\n-\treturn at;\n-}\n-\n-/*\n- * In a format string, find the next occurrence of %(atom).\n- */\n-static const char *find_next(const char *cp)\n-{\n-\twhile (*cp) {\n-\t\tif (*cp == '%') {\n-\t\t\t/*\n-\t\t\t * %( is the start of an atom;\n-\t\t\t * %% is a quoted per-cent.\n-\t\t\t */\n-\t\t\tif (cp[1] == '(')\n-\t\t\t\treturn cp;\n-\t\t\telse if (cp[1] == '%')\n-\t\t\t\tcp++; /* skip over two % */\n-\t\t\t/* otherwise this is a singleton, literal % */\n-\t\t}\n-\t\tcp++;\n-\t}\n-\treturn NULL;\n-}\n-\n-/*\n- * Make sure the format string is well formed, and parse out\n- * the used atoms.\n- */\n-int verify_ref_format(const char *format)\n-{\n-\tconst char *cp, *sp;\n-\n-\tneed_color_reset_at_eol = 0;\n-\tfor (cp = format; *cp && (sp = find_next(cp)); ) {\n-\t\tconst char *color, *ep = strchr(sp, ')');\n-\t\tint at;\n-\n-\t\tif (!ep)\n-\t\t\treturn error(\"malformed format string %s\", sp);\n-\t\t/* sp points at \"%(\" and ep points at the closing \")\" */\n-\t\tat = parse_ref_filter_atom(sp + 2, ep);\n-\t\tcp = ep + 1;\n-\n-\t\tif (skip_prefix(used_atom[at], \"color:\", &color))\n-\t\t\tneed_color_reset_at_eol = !!strcmp(color, \"reset\");\n-\t}\n-\treturn 0;\n-}\n-\n-/*\n- * Given an object name, read the object data and size, and return a\n- * \"struct object\". If the object data we are returning is also borrowed\n- * by the \"struct object\" representation, set *eaten as well---it is a\n- * signal from parse_object_buffer to us not to free the buffer.\n- */\n-static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned long *sz, int *eaten)\n-{\n-\tenum object_type type;\n-\tvoid *buf = read_sha1_file(sha1, &type, sz);\n-\n-\tif (buf)\n-\t\t*obj = parse_object_buffer(sha1, type, *sz, buf, eaten);\n-\telse\n-\t\t*obj = NULL;\n-\treturn buf;\n-}\n-\n-static int grab_objectname(const char *name, const unsigned char *sha1,\n-\t\t\t struct atom_value *v)\n-{\n-\tif (!strcmp(name, \"objectname\")) {\n-\t\tchar *s = xmalloc(41);\n-\t\tstrcpy(s, sha1_to_hex(sha1));\n-\t\tv->s = s;\n-\t\treturn 1;\n-\t}\n-\tif (!strcmp(name, \"objectname:short\")) {\n-\t\tv->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));\n-\t\treturn 1;\n-\t}\n-\treturn 0;\n-}\n-\n-/* See grab_values */\n-static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (!strcmp(name, \"objecttype\"))\n-\t\t\tv->s = typename(obj->type);\n-\t\telse if (!strcmp(name, \"objectsize\")) {\n-\t\t\tchar *s = xmalloc(40);\n-\t\t\tsprintf(s, \"%lu\", sz);\n-\t\t\tv->ul = sz;\n-\t\t\tv->s = s;\n-\t\t}\n-\t\telse if (deref)\n-\t\t\tgrab_objectname(name, obj->sha1, v);\n-\t}\n-}\n-\n-/* See grab_values */\n-static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tstruct tag *tag = (struct tag *) obj;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (!strcmp(name, \"tag\"))\n-\t\t\tv->s = tag->tag;\n-\t\telse if (!strcmp(name, \"type\") && tag->tagged)\n-\t\t\tv->s = typename(tag->tagged->type);\n-\t\telse if (!strcmp(name, \"object\") && tag->tagged) {\n-\t\t\tchar *s = xmalloc(41);\n-\t\t\tstrcpy(s, sha1_to_hex(tag->tagged->sha1));\n-\t\t\tv->s = s;\n-\t\t}\n-\t}\n-}\n-\n-/* See grab_values */\n-static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tstruct commit *commit = (struct commit *) obj;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (!strcmp(name, \"tree\")) {\n-\t\t\tchar *s = xmalloc(41);\n-\t\t\tstrcpy(s, sha1_to_hex(commit->tree->object.sha1));\n-\t\t\tv->s = s;\n-\t\t}\n-\t\tif (!strcmp(name, \"numparent\")) {\n-\t\t\tchar *s = xmalloc(40);\n-\t\t\tv->ul = commit_list_count(commit->parents);\n-\t\t\tsprintf(s, \"%lu\", v->ul);\n-\t\t\tv->s = s;\n-\t\t}\n-\t\telse if (!strcmp(name, \"parent\")) {\n-\t\t\tint num = commit_list_count(commit->parents);\n-\t\t\tint i;\n-\t\t\tstruct commit_list *parents;\n-\t\t\tchar *s = xmalloc(41 * num + 1);\n-\t\t\tv->s = s;\n-\t\t\tfor (i = 0, parents = commit->parents;\n-\t\t\t parents;\n-\t\t\t parents = parents->next, i = i + 41) {\n-\t\t\t\tstruct commit *parent = parents->item;\n-\t\t\t\tstrcpy(s+i, sha1_to_hex(parent->object.sha1));\n-\t\t\t\tif (parents->next)\n-\t\t\t\t\ts[i+40] = ' ';\n-\t\t\t}\n-\t\t\tif (!i)\n-\t\t\t\t*s = '\\0';\n-\t\t}\n-\t}\n-}\n-\n-static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz)\n-{\n-\tconst char *eol;\n-\twhile (*buf) {\n-\t\tif (!strncmp(buf, who, wholen) &&\n-\t\t buf[wholen] == ' ')\n-\t\t\treturn buf + wholen + 1;\n-\t\teol = strchr(buf, '\\n');\n-\t\tif (!eol)\n-\t\t\treturn \"\";\n-\t\teol++;\n-\t\tif (*eol == '\\n')\n-\t\t\treturn \"\"; /* end of header */\n-\t\tbuf = eol;\n-\t}\n-\treturn \"\";\n-}\n-\n-static const char *copy_line(const char *buf)\n-{\n-\tconst char *eol = strchrnul(buf, '\\n');\n-\treturn xmemdupz(buf, eol - buf);\n-}\n-\n-static const char *copy_name(const char *buf)\n-{\n-\tconst char *cp;\n-\tfor (cp = buf; *cp && *cp != '\\n'; cp++) {\n-\t\tif (!strncmp(cp, \" <\", 2))\n-\t\t\treturn xmemdupz(buf, cp - buf);\n-\t}\n-\treturn \"\";\n-}\n-\n-static const char *copy_email(const char *buf)\n-{\n-\tconst char *email = strchr(buf, '<');\n-\tconst char *eoemail;\n-\tif (!email)\n-\t\treturn \"\";\n-\teoemail = strchr(email, '>');\n-\tif (!eoemail)\n-\t\treturn \"\";\n-\treturn xmemdupz(email, eoemail + 1 - email);\n-}\n-\n-static char *copy_subject(const char *buf, unsigned long len)\n-{\n-\tchar *r = xmemdupz(buf, len);\n-\tint i;\n-\n-\tfor (i = 0; i < len; i++)\n-\t\tif (r[i] == '\\n')\n-\t\t\tr[i] = ' ';\n-\n-\treturn r;\n-}\n-\n-static void grab_date(const char *buf, struct atom_value *v, const char *atomname)\n-{\n-\tconst char *eoemail = strstr(buf, \"> \");\n-\tchar *zone;\n-\tunsigned long timestamp;\n-\tlong tz;\n-\tenum date_mode date_mode = DATE_NORMAL;\n-\tconst char *formatp;\n-\n-\t/*\n-\t * We got here because atomname ends in \"date\" or \"date\";\n-\t * it's not possible that is not \":\" because\n-\t * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no\n-\t * \":\" means no format is specified, and use the default.\n-\t */\n-\tformatp = strchr(atomname, ':');\n-\tif (formatp != NULL) {\n-\t\tformatp++;\n-\t\tdate_mode = parse_date_format(formatp);\n-\t}\n-\n-\tif (!eoemail)\n-\t\tgoto bad;\n-\ttimestamp = strtoul(eoemail + 2, &zone, 10);\n-\tif (timestamp == ULONG_MAX)\n-\t\tgoto bad;\n-\ttz = strtol(zone, NULL, 10);\n-\tif ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE)\n-\t\tgoto bad;\n-\tv->s = xstrdup(show_date(timestamp, tz, date_mode));\n-\tv->ul = timestamp;\n-\treturn;\n- bad:\n-\tv->s = \"\";\n-\tv->ul = 0;\n-}\n-\n-/* See grab_values */\n-static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tint wholen = strlen(who);\n-\tconst char *wholine = NULL;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (strncmp(who, name, wholen))\n-\t\t\tcontinue;\n-\t\tif (name[wholen] != 0 &&\n-\t\t strcmp(name + wholen, \"name\") &&\n-\t\t strcmp(name + wholen, \"email\") &&\n-\t\t !starts_with(name + wholen, \"date\"))\n-\t\t\tcontinue;\n-\t\tif (!wholine)\n-\t\t\twholine = find_wholine(who, wholen, buf, sz);\n-\t\tif (!wholine)\n-\t\t\treturn; /* no point looking for it */\n-\t\tif (name[wholen] == 0)\n-\t\t\tv->s = copy_line(wholine);\n-\t\telse if (!strcmp(name + wholen, \"name\"))\n-\t\t\tv->s = copy_name(wholine);\n-\t\telse if (!strcmp(name + wholen, \"email\"))\n-\t\t\tv->s = copy_email(wholine);\n-\t\telse if (starts_with(name + wholen, \"date\"))\n-\t\t\tgrab_date(wholine, v, name);\n-\t}\n-\n-\t/*\n-\t * For a tag or a commit object, if \"creator\" or \"creatordate\" is\n-\t * requested, do something special.\n-\t */\n-\tif (strcmp(who, \"tagger\") && strcmp(who, \"committer\"))\n-\t\treturn; /* \"author\" for commit object is not wanted */\n-\tif (!wholine)\n-\t\twholine = find_wholine(who, wholen, buf, sz);\n-\tif (!wholine)\n-\t\treturn;\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\n-\t\tif (starts_with(name, \"creatordate\"))\n-\t\t\tgrab_date(wholine, v, name);\n-\t\telse if (!strcmp(name, \"creator\"))\n-\t\t\tv->s = copy_line(wholine);\n-\t}\n-}\n-\n-static void find_subpos(const char *buf, unsigned long sz,\n-\t\t\tconst char **sub, unsigned long *sublen,\n-\t\t\tconst char **body, unsigned long *bodylen,\n-\t\t\tunsigned long *nonsiglen,\n-\t\t\tconst char **sig, unsigned long *siglen)\n-{\n-\tconst char *eol;\n-\t/* skip past header until we hit empty line */\n-\twhile (*buf && *buf != '\\n') {\n-\t\teol = strchrnul(buf, '\\n');\n-\t\tif (*eol)\n-\t\t\teol++;\n-\t\tbuf = eol;\n-\t}\n-\t/* skip any empty lines */\n-\twhile (*buf == '\\n')\n-\t\tbuf++;\n-\n-\t/* parse signature first; we might not even have a subject line */\n-\t*sig = buf + parse_signature(buf, strlen(buf));\n-\t*siglen = strlen(*sig);\n-\n-\t/* subject is first non-empty line */\n-\t*sub = buf;\n-\t/* subject goes to first empty line */\n-\twhile (buf < *sig && *buf && *buf != '\\n') {\n-\t\teol = strchrnul(buf, '\\n');\n-\t\tif (*eol)\n-\t\t\teol++;\n-\t\tbuf = eol;\n-\t}\n-\t*sublen = buf - *sub;\n-\t/* drop trailing newline, if present */\n-\tif (*sublen && (*sub)[*sublen - 1] == '\\n')\n-\t\t*sublen -= 1;\n-\n-\t/* skip any empty lines */\n-\twhile (*buf == '\\n')\n-\t\tbuf++;\n-\t*body = buf;\n-\t*bodylen = strlen(buf);\n-\t*nonsiglen = *sig - buf;\n-}\n-\n-/* See grab_values */\n-static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tint i;\n-\tconst char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;\n-\tunsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (!!deref != (*name == '*'))\n-\t\t\tcontinue;\n-\t\tif (deref)\n-\t\t\tname++;\n-\t\tif (strcmp(name, \"subject\") &&\n-\t\t strcmp(name, \"body\") &&\n-\t\t strcmp(name, \"contents\") &&\n-\t\t strcmp(name, \"contents:subject\") &&\n-\t\t strcmp(name, \"contents:body\") &&\n-\t\t strcmp(name, \"contents:signature\"))\n-\t\t\tcontinue;\n-\t\tif (!subpos)\n-\t\t\tfind_subpos(buf, sz,\n-\t\t\t\t &subpos, &sublen,\n-\t\t\t\t &bodypos, &bodylen, &nonsiglen,\n-\t\t\t\t &sigpos, &siglen);\n-\n-\t\tif (!strcmp(name, \"subject\"))\n-\t\t\tv->s = copy_subject(subpos, sublen);\n-\t\telse if (!strcmp(name, \"contents:subject\"))\n-\t\t\tv->s = copy_subject(subpos, sublen);\n-\t\telse if (!strcmp(name, \"body\"))\n-\t\t\tv->s = xmemdupz(bodypos, bodylen);\n-\t\telse if (!strcmp(name, \"contents:body\"))\n-\t\t\tv->s = xmemdupz(bodypos, nonsiglen);\n-\t\telse if (!strcmp(name, \"contents:signature\"))\n-\t\t\tv->s = xmemdupz(sigpos, siglen);\n-\t\telse if (!strcmp(name, \"contents\"))\n-\t\t\tv->s = xstrdup(subpos);\n-\t}\n-}\n-\n-/*\n- * We want to have empty print-string for field requests\n- * that do not apply (e.g. \"authordate\" for a tag object)\n- */\n-static void fill_missing_values(struct atom_value *val)\n-{\n-\tint i;\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tstruct atom_value *v = &val[i];\n-\t\tif (v->s == NULL)\n-\t\t\tv->s = \"\";\n-\t}\n-}\n-\n-/*\n- * val is a list of atom_value to hold returned values. Extract\n- * the values for atoms in used_atom array out of (obj, buf, sz).\n- * when deref is false, (obj, buf, sz) is the object that is\n- * pointed at by the ref itself; otherwise it is the object the\n- * ref (which is a tag) refers to.\n- */\n-static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n-{\n-\tgrab_common_values(val, deref, obj, buf, sz);\n-\tswitch (obj->type) {\n-\tcase OBJ_TAG:\n-\t\tgrab_tag_values(val, deref, obj, buf, sz);\n-\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n-\t\tgrab_person(\"tagger\", val, deref, obj, buf, sz);\n-\t\tbreak;\n-\tcase OBJ_COMMIT:\n-\t\tgrab_commit_values(val, deref, obj, buf, sz);\n-\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n-\t\tgrab_person(\"author\", val, deref, obj, buf, sz);\n-\t\tgrab_person(\"committer\", val, deref, obj, buf, sz);\n-\t\tbreak;\n-\tcase OBJ_TREE:\n-\t\t/* grab_tree_values(val, deref, obj, buf, sz); */\n-\t\tbreak;\n-\tcase OBJ_BLOB:\n-\t\t/* grab_blob_values(val, deref, obj, buf, sz); */\n-\t\tbreak;\n-\tdefault:\n-\t\tdie(\"Eh? Object of type %d?\", obj->type);\n-\t}\n-}\n-\n-static inline char *copy_advance(char *dst, const char *src)\n-{\n-\twhile (*src)\n-\t\t*dst++ = *src++;\n-\treturn dst;\n-}\n-\n-/*\n- * Parse the object referred by ref, and grab needed value.\n- */\n-static void populate_value(struct ref_array_item *ref)\n-{\n-\tvoid *buf;\n-\tstruct object *obj;\n-\tint eaten, i;\n-\tunsigned long size;\n-\tconst unsigned char *tagged;\n-\n-\tref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));\n-\n-\tif (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {\n-\t\tunsigned char unused1[20];\n-\t\tref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,\n-\t\t\t\t\t unused1, NULL);\n-\t\tif (!ref->symref)\n-\t\t\tref->symref = \"\";\n-\t}\n-\n-\t/* Fill in specials first */\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tconst char *name = used_atom[i];\n-\t\tstruct atom_value *v = &ref->value[i];\n-\t\tint deref = 0;\n-\t\tconst char *refname;\n-\t\tconst char *formatp;\n-\t\tstruct branch *branch = NULL;\n-\n-\t\tif (*name == '*') {\n-\t\t\tderef = 1;\n-\t\t\tname++;\n-\t\t}\n-\n-\t\tif (starts_with(name, \"refname\"))\n-\t\t\trefname = ref->refname;\n-\t\telse if (starts_with(name, \"symref\"))\n-\t\t\trefname = ref->symref ? ref->symref : \"\";\n-\t\telse if (starts_with(name, \"upstream\")) {\n-\t\t\t/* only local branches may have an upstream */\n-\t\t\tif (!starts_with(ref->refname, \"refs/heads/\"))\n-\t\t\t\tcontinue;\n-\t\t\tbranch = branch_get(ref->refname + 11);\n-\n-\t\t\tif (!branch || !branch->merge || !branch->merge[0] ||\n-\t\t\t !branch->merge[0]->dst)\n-\t\t\t\tcontinue;\n-\t\t\trefname = branch->merge[0]->dst;\n-\t\t} else if (starts_with(name, \"color:\")) {\n-\t\t\tchar color[COLOR_MAXLEN] = \"\";\n-\n-\t\t\tif (color_parse(name + 6, color) < 0)\n-\t\t\t\tdie(_(\"unable to parse format\"));\n-\t\t\tv->s = xstrdup(color);\n-\t\t\tcontinue;\n-\t\t} else if (!strcmp(name, \"flag\")) {\n-\t\t\tchar buf[256], *cp = buf;\n-\t\t\tif (ref->flag & REF_ISSYMREF)\n-\t\t\t\tcp = copy_advance(cp, \",symref\");\n-\t\t\tif (ref->flag & REF_ISPACKED)\n-\t\t\t\tcp = copy_advance(cp, \",packed\");\n-\t\t\tif (cp == buf)\n-\t\t\t\tv->s = \"\";\n-\t\t\telse {\n-\t\t\t\t*cp = '\\0';\n-\t\t\t\tv->s = xstrdup(buf + 1);\n-\t\t\t}\n-\t\t\tcontinue;\n-\t\t} else if (!deref && grab_objectname(name, ref->objectname, v)) {\n-\t\t\tcontinue;\n-\t\t} else if (!strcmp(name, \"HEAD\")) {\n-\t\t\tconst char *head;\n-\t\t\tunsigned char sha1[20];\n-\n-\t\t\thead = resolve_ref_unsafe(\"HEAD\", RESOLVE_REF_READING,\n-\t\t\t\t\t\t sha1, NULL);\n-\t\t\tif (!strcmp(ref->refname, head))\n-\t\t\t\tv->s = \"*\";\n-\t\t\telse\n-\t\t\t\tv->s = \" \";\n-\t\t\tcontinue;\n-\t\t} else\n-\t\t\tcontinue;\n-\n-\t\tformatp = strchr(name, ':');\n-\t\tif (formatp) {\n-\t\t\tint num_ours, num_theirs;\n-\n-\t\t\tformatp++;\n-\t\t\tif (!strcmp(formatp, \"short\"))\n-\t\t\t\trefname = shorten_unambiguous_ref(refname,\n-\t\t\t\t\t\t warn_ambiguous_refs);\n-\t\t\telse if (!strcmp(formatp, \"track\") &&\n-\t\t\t\t starts_with(name, \"upstream\")) {\n-\t\t\t\tchar buf[40];\n-\n-\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n-\t\t\t\t\t\t &num_theirs) != 1)\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tif (!num_ours && !num_theirs)\n-\t\t\t\t\tv->s = \"\";\n-\t\t\t\telse if (!num_ours) {\n-\t\t\t\t\tsprintf(buf, \"[behind %d]\", num_theirs);\n-\t\t\t\t\tv->s = xstrdup(buf);\n-\t\t\t\t} else if (!num_theirs) {\n-\t\t\t\t\tsprintf(buf, \"[ahead %d]\", num_ours);\n-\t\t\t\t\tv->s = xstrdup(buf);\n-\t\t\t\t} else {\n-\t\t\t\t\tsprintf(buf, \"[ahead %d, behind %d]\",\n-\t\t\t\t\t\tnum_ours, num_theirs);\n-\t\t\t\t\tv->s = xstrdup(buf);\n-\t\t\t\t}\n-\t\t\t\tcontinue;\n-\t\t\t} else if (!strcmp(formatp, \"trackshort\") &&\n-\t\t\t\t starts_with(name, \"upstream\")) {\n-\t\t\t\tassert(branch);\n-\n-\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n-\t\t\t\t\t\t\t&num_theirs) != 1)\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tif (!num_ours && !num_theirs)\n-\t\t\t\t\tv->s = \"=\";\n-\t\t\t\telse if (!num_ours)\n-\t\t\t\t\tv->s = \"<\";\n-\t\t\t\telse if (!num_theirs)\n-\t\t\t\t\tv->s = \">\";\n-\t\t\t\telse\n-\t\t\t\t\tv->s = \"<>\";\n-\t\t\t\tcontinue;\n-\t\t\t} else\n-\t\t\t\tdie(\"unknown %.*s format %s\",\n-\t\t\t\t (int)(formatp - name), name, formatp);\n-\t\t}\n-\n-\t\tif (!deref)\n-\t\t\tv->s = refname;\n-\t\telse {\n-\t\t\tint len = strlen(refname);\n-\t\t\tchar *s = xmalloc(len + 4);\n-\t\t\tsprintf(s, \"%s^{}\", refname);\n-\t\t\tv->s = s;\n-\t\t}\n-\t}\n-\n-\tfor (i = 0; i < used_atom_cnt; i++) {\n-\t\tstruct atom_value *v = &ref->value[i];\n-\t\tif (v->s == NULL)\n-\t\t\tgoto need_obj;\n-\t}\n-\treturn;\n-\n- need_obj:\n-\tbuf = get_obj(ref->objectname, &obj, &size, &eaten);\n-\tif (!buf)\n-\t\tdie(\"missing object %s for %s\",\n-\t\t sha1_to_hex(ref->objectname), ref->refname);\n-\tif (!obj)\n-\t\tdie(\"parse_object_buffer failed on %s for %s\",\n-\t\t sha1_to_hex(ref->objectname), ref->refname);\n-\n-\tgrab_values(ref->value, 0, obj, buf, size);\n-\tif (!eaten)\n-\t\tfree(buf);\n-\n-\t/*\n-\t * If there is no atom that wants to know about tagged\n-\t * object, we are done.\n-\t */\n-\tif (!need_tagged || (obj->type != OBJ_TAG))\n-\t\treturn;\n-\n-\t/*\n-\t * If it is a tag object, see if we use a value that derefs\n-\t * the object, and if we do grab the object it refers to.\n-\t */\n-\ttagged = ((struct tag *)obj)->tagged->sha1;\n-\n-\t/*\n-\t * NEEDSWORK: This derefs tag only once, which\n-\t * is good to deal with chains of trust, but\n-\t * is not consistent with what deref_tag() does\n-\t * which peels the onion to the core.\n-\t */\n-\tbuf = get_obj(tagged, &obj, &size, &eaten);\n-\tif (!buf)\n-\t\tdie(\"missing object %s for %s\",\n-\t\t sha1_to_hex(tagged), ref->refname);\n-\tif (!obj)\n-\t\tdie(\"parse_object_buffer failed on %s for %s\",\n-\t\t sha1_to_hex(tagged), ref->refname);\n-\tgrab_values(ref->value, 1, obj, buf, size);\n-\tif (!eaten)\n-\t\tfree(buf);\n-}\n-\n-/*\n- * Given a ref, return the value for the atom. This lazily gets value\n- * out of the object by calling populate value.\n- */\n-static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n-{\n-\tif (!ref->value) {\n-\t\tpopulate_value(ref);\n-\t\tfill_missing_values(ref->value);\n-\t}\n-\t*v = &ref->value[atom];\n-}\n-\n-/*\n- * Given a refname, return 1 if the refname matches with one of the patterns\n- * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n- * and so on, else return 0. Supports use of wild characters.\n- */\n-static int match_name_as_path(const char **pattern, const char *refname)\n-{\n-\tint namelen = strlen(refname);\n-\tfor (; *pattern; pattern++) {\n-\t\tconst char *p = *pattern;\n-\t\tint plen = strlen(p);\n-\n-\t\tif ((plen <= namelen) &&\n-\t\t !strncmp(refname, p, plen) &&\n-\t\t (refname[plen] == '\\0' ||\n-\t\t refname[plen] == '/' ||\n-\t\t p[plen-1] == '/'))\n-\t\t\treturn 1;\n-\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n-\t\t\treturn 1;\n-\t}\n-\treturn 0;\n-}\n-\n-/* Allocate space for a new ref_array_item and copy the objectname and flag to it */\n-static struct ref_array_item *new_ref_array_item(const char *refname,\n-\t\t\t\t\t\t const unsigned char *objectname,\n-\t\t\t\t\t\t int flag)\n-{\n-\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n-\tref->refname = xstrdup(refname);\n-\thashcpy(ref->objectname, objectname);\n-\tref->flag = flag;\n-\n-\treturn ref;\n-}\n-\n-/*\n- * A call-back given to for_each_ref(). Filter refs and keep them for\n- * later object processing.\n- */\n-int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n-{\n-\tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n-\tstruct ref_filter *filter = &ref_cbdata->filter;\n-\tstruct ref_array_item *ref;\n-\n-\tif (flag & REF_BAD_NAME) {\n-\t\twarning(\"ignoring ref with broken name %s\", refname);\n-\t\treturn 0;\n-\t}\n-\n-\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))\n-\t\treturn 0;\n-\n-\tref = new_ref_array_item(refname, sha1, flag);\n-\n-\tREALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);\n-\tref_cbdata->array.items[ref_cbdata->array.nr++] = ref;\n-\n-\treturn 0;\n-}\n-\n-/* Free all memory allocated for ref_filter_cbdata */\n-void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata)\n-{\n-\tint i;\n-\n-\tfor (i = 0; i < ref_cbdata->array.nr; i++)\n-\t\tfree(ref_cbdata->array.items[i]);\n-\tfree(ref_cbdata->array.items);\n-\tref_cbdata->array.items = NULL;\n-\tref_cbdata->array.nr = ref_cbdata->array.alloc = 0;\n-}\n-\n-static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)\n-{\n-\tstruct atom_value *va, *vb;\n-\tint cmp;\n-\tcmp_type cmp_type = used_atom_type[s->atom];\n-\n-\tget_ref_atom_value(a, s->atom, &va);\n-\tget_ref_atom_value(b, s->atom, &vb);\n-\tswitch (cmp_type) {\n-\tcase FIELD_STR:\n-\t\tcmp = strcmp(va->s, vb->s);\n-\t\tbreak;\n-\tdefault:\n-\t\tif (va->ul < vb->ul)\n-\t\t\tcmp = -1;\n-\t\telse if (va->ul == vb->ul)\n-\t\t\tcmp = 0;\n-\t\telse\n-\t\t\tcmp = 1;\n-\t\tbreak;\n-\t}\n-\treturn (s->reverse) ? -cmp : cmp;\n-}\n-\n-static struct ref_sort *ref_sort;\n-static int compare_refs(const void *a_, const void *b_)\n-{\n-\tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n-\tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n-\tstruct ref_sort *s;\n-\n-\tfor (s = ref_sort; s; s = s->next) {\n-\t\tint cmp = cmp_ref_sort(s, a, b);\n-\t\tif (cmp)\n-\t\t\treturn cmp;\n-\t}\n-\treturn 0;\n-}\n-\n-void sort_ref_array(struct ref_sort *sort, struct ref_array *array)\n-{\n-\tref_sort = sort;\n-\tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n-}\n-\n-static void print_value(struct atom_value *v, int quote_style)\n-{\n-\tstruct strbuf sb = STRBUF_INIT;\n-\tswitch (quote_style) {\n-\tcase QUOTE_NONE:\n-\t\tfputs(v->s, stdout);\n-\t\tbreak;\n-\tcase QUOTE_SHELL:\n-\t\tsq_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\tcase QUOTE_PERL:\n-\t\tperl_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\tcase QUOTE_PYTHON:\n-\t\tpython_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\tcase QUOTE_TCL:\n-\t\ttcl_quote_buf(&sb, v->s);\n-\t\tbreak;\n-\t}\n-\tif (quote_style != QUOTE_NONE) {\n-\t\tfputs(sb.buf, stdout);\n-\t\tstrbuf_release(&sb);\n-\t}\n-}\n-\n-static int hex1(char ch)\n-{\n-\tif ('0' <= ch && ch <= '9')\n-\t\treturn ch - '0';\n-\telse if ('a' <= ch && ch <= 'f')\n-\t\treturn ch - 'a' + 10;\n-\telse if ('A' <= ch && ch <= 'F')\n-\t\treturn ch - 'A' + 10;\n-\treturn -1;\n-}\n-static int hex2(const char *cp)\n-{\n-\tif (cp[0] && cp[1])\n-\t\treturn (hex1(cp[0]) << 4) | hex1(cp[1]);\n-\telse\n-\t\treturn -1;\n-}\n-\n-static void emit(const char *cp, const char *ep)\n-{\n-\twhile (*cp && (!ep || cp < ep)) {\n-\t\tif (*cp == '%') {\n-\t\t\tif (cp[1] == '%')\n-\t\t\t\tcp++;\n-\t\t\telse {\n-\t\t\t\tint ch = hex2(cp + 1);\n-\t\t\t\tif (0 <= ch) {\n-\t\t\t\t\tputchar(ch);\n-\t\t\t\t\tcp += 3;\n-\t\t\t\t\tcontinue;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tputchar(*cp);\n-\t\tcp++;\n-\t}\n-}\n-\n-void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)\n-{\n-\tconst char *cp, *sp, *ep;\n-\n-\tfor (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {\n-\t\tstruct atom_value *atomv;\n-\n-\t\tep = strchr(sp, ')');\n-\t\tif (cp < sp)\n-\t\t\temit(cp, sp);\n-\t\tget_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);\n-\t\tprint_value(atomv, quote_style);\n-\t}\n-\tif (*cp) {\n-\t\tsp = cp + strlen(cp);\n-\t\temit(cp, sp);\n-\t}\n-\tif (need_color_reset_at_eol) {\n-\t\tstruct atom_value resetv;\n-\t\tchar color[COLOR_MAXLEN] = \"\";\n-\n-\t\tif (color_parse(\"reset\", color) < 0)\n-\t\t\tdie(\"BUG: couldn't parse 'reset' as a color\");\n-\t\tresetv.s = color;\n-\t\tprint_value(&resetv, quote_style);\n-\t}\n-\tputchar('\\n');\n-}\n-\n-/* If no sorting option is given, use refname to sort as default */\n-struct ref_sort *ref_default_sort(void)\n-{\n-\tstatic const char cstr_name[] = \"refname\";\n-\n-\tstruct ref_sort *sort = xcalloc(1, sizeof(*sort));\n-\n-\tsort->next = NULL;\n-\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n-\treturn sort;\n-}\n-\n-int opt_parse_ref_sort(const struct option *opt, const char *arg, int unset)\n-{\n-\tstruct ref_sort **sort_tail = opt->value;\n-\tstruct ref_sort *s;\n-\tint len;\n-\n-\tif (!arg) /* should --no-sort void the list ? */\n-\t\treturn -1;\n-\n-\ts = xcalloc(1, sizeof(*s));\n-\ts->next = *sort_tail;\n-\t*sort_tail = s;\n-\n-\tif (*arg == '-') {\n-\t\ts->reverse = 1;\n-\t\targ++;\n-\t}\n-\tlen = strlen(arg);\n-\ts->atom = parse_ref_filter_atom(arg, arg+len);\n-\treturn 0;\n-}\n+#include \"ref-filter.h\"\n \n static char const * const for_each_ref_usage[] = {\n \tN_(\"git for-each-ref [] []\"),\ndiff --git a/ref-filter.c b/ref-filter.c\nnew file mode 100644\nindex 0000000..cdef681\n--- /dev/null\n+++ b/ref-filter.c\n@@ -0,0 +1,1051 @@\n+#include \"builtin.h\"\n+#include \"cache.h\"\n+#include \"parse-options.h\"\n+#include \"refs.h\"\n+#include \"ref-filter.h\"\n+#include \"wildmatch.h\"\n+#include \"commit.h\"\n+#include \"remote.h\"\n+#include \"color.h\"\n+#include \"tag.h\"\n+#include \"quote.h\"\n+\n+typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;\n+\n+static struct {\n+\tconst char *name;\n+\tcmp_type cmp_type;\n+} valid_atom[] = {\n+\t{ \"refname\" },\n+\t{ \"objecttype\" },\n+\t{ \"objectsize\", FIELD_ULONG },\n+\t{ \"objectname\" },\n+\t{ \"tree\" },\n+\t{ \"parent\" },\n+\t{ \"numparent\", FIELD_ULONG },\n+\t{ \"object\" },\n+\t{ \"type\" },\n+\t{ \"tag\" },\n+\t{ \"author\" },\n+\t{ \"authorname\" },\n+\t{ \"authoremail\" },\n+\t{ \"authordate\", FIELD_TIME },\n+\t{ \"committer\" },\n+\t{ \"committername\" },\n+\t{ \"committeremail\" },\n+\t{ \"committerdate\", FIELD_TIME },\n+\t{ \"tagger\" },\n+\t{ \"taggername\" },\n+\t{ \"taggeremail\" },\n+\t{ \"taggerdate\", FIELD_TIME },\n+\t{ \"creator\" },\n+\t{ \"creatordate\", FIELD_TIME },\n+\t{ \"subject\" },\n+\t{ \"body\" },\n+\t{ \"contents\" },\n+\t{ \"contents:subject\" },\n+\t{ \"contents:body\" },\n+\t{ \"contents:signature\" },\n+\t{ \"upstream\" },\n+\t{ \"symref\" },\n+\t{ \"flag\" },\n+\t{ \"HEAD\" },\n+\t{ \"color\" },\n+};\n+\n+/*\n+ * An atom is a valid field atom listed above, possibly prefixed with\n+ * a \"*\" to denote deref_tag().\n+ *\n+ * We parse given format string and sort specifiers, and make a list\n+ * of properties that we need to extract out of objects. ref_array_item\n+ * structure will hold an array of values extracted that can be\n+ * indexed with the \"atom number\", which is an index into this\n+ * array.\n+ */\n+static const char **used_atom;\n+static cmp_type *used_atom_type;\n+static int used_atom_cnt, need_tagged, need_symref;\n+static int need_color_reset_at_eol;\n+\n+/*\n+ * Used to parse format string and sort specifiers\n+ */\n+int parse_ref_filter_atom(const char *atom, const char *ep)\n+{\n+\tconst char *sp;\n+\tint i, at;\n+\n+\tsp = atom;\n+\tif (*sp == '*' && sp < ep)\n+\t\tsp++; /* deref */\n+\tif (ep <= sp)\n+\t\tdie(\"malformed field name: %.*s\", (int)(ep-atom), atom);\n+\n+\t/* Do we have the atom already used elsewhere? */\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tint len = strlen(used_atom[i]);\n+\t\tif (len == ep - atom && !memcmp(used_atom[i], atom, len))\n+\t\t\treturn i;\n+\t}\n+\n+\t/* Is the atom a valid one? */\n+\tfor (i = 0; i < ARRAY_SIZE(valid_atom); i++) {\n+\t\tint len = strlen(valid_atom[i].name);\n+\t\t/*\n+\t\t * If the atom name has a colon, strip it and everything after\n+\t\t * it off - it specifies the format for this entry, and\n+\t\t * shouldn't be used for checking against the valid_atom\n+\t\t * table.\n+\t\t */\n+\t\tconst char *formatp = strchr(sp, ':');\n+\t\tif (!formatp || ep < formatp)\n+\t\t\tformatp = ep;\n+\t\tif (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len))\n+\t\t\tbreak;\n+\t}\n+\n+\tif (ARRAY_SIZE(valid_atom) <= i)\n+\t\tdie(\"unknown field name: %.*s\", (int)(ep-atom), atom);\n+\n+\t/* Add it in, including the deref prefix */\n+\tat = used_atom_cnt;\n+\tused_atom_cnt++;\n+\tREALLOC_ARRAY(used_atom, used_atom_cnt);\n+\tREALLOC_ARRAY(used_atom_type, used_atom_cnt);\n+\tused_atom[at] = xmemdupz(atom, ep - atom);\n+\tused_atom_type[at] = valid_atom[i].cmp_type;\n+\tif (*atom == '*')\n+\t\tneed_tagged = 1;\n+\tif (!strcmp(used_atom[at], \"symref\"))\n+\t\tneed_symref = 1;\n+\treturn at;\n+}\n+\n+/*\n+ * In a format string, find the next occurrence of %(atom).\n+ */\n+static const char *find_next(const char *cp)\n+{\n+\twhile (*cp) {\n+\t\tif (*cp == '%') {\n+\t\t\t/*\n+\t\t\t * %( is the start of an atom;\n+\t\t\t * %% is a quoted per-cent.\n+\t\t\t */\n+\t\t\tif (cp[1] == '(')\n+\t\t\t\treturn cp;\n+\t\t\telse if (cp[1] == '%')\n+\t\t\t\tcp++; /* skip over two % */\n+\t\t\t/* otherwise this is a singleton, literal % */\n+\t\t}\n+\t\tcp++;\n+\t}\n+\treturn NULL;\n+}\n+\n+/*\n+ * Make sure the format string is well formed, and parse out\n+ * the used atoms.\n+ */\n+int verify_ref_format(const char *format)\n+{\n+\tconst char *cp, *sp;\n+\n+\tneed_color_reset_at_eol = 0;\n+\tfor (cp = format; *cp && (sp = find_next(cp)); ) {\n+\t\tconst char *color, *ep = strchr(sp, ')');\n+\t\tint at;\n+\n+\t\tif (!ep)\n+\t\t\treturn error(\"malformed format string %s\", sp);\n+\t\t/* sp points at \"%(\" and ep points at the closing \")\" */\n+\t\tat = parse_ref_filter_atom(sp + 2, ep);\n+\t\tcp = ep + 1;\n+\n+\t\tif (skip_prefix(used_atom[at], \"color:\", &color))\n+\t\t\tneed_color_reset_at_eol = !!strcmp(color, \"reset\");\n+\t}\n+\treturn 0;\n+}\n+\n+/*\n+ * Given an object name, read the object data and size, and return a\n+ * \"struct object\". If the object data we are returning is also borrowed\n+ * by the \"struct object\" representation, set *eaten as well---it is a\n+ * signal from parse_object_buffer to us not to free the buffer.\n+ */\n+static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned long *sz, int *eaten)\n+{\n+\tenum object_type type;\n+\tvoid *buf = read_sha1_file(sha1, &type, sz);\n+\n+\tif (buf)\n+\t\t*obj = parse_object_buffer(sha1, type, *sz, buf, eaten);\n+\telse\n+\t\t*obj = NULL;\n+\treturn buf;\n+}\n+\n+static int grab_objectname(const char *name, const unsigned char *sha1,\n+\t\t\t struct atom_value *v)\n+{\n+\tif (!strcmp(name, \"objectname\")) {\n+\t\tchar *s = xmalloc(41);\n+\t\tstrcpy(s, sha1_to_hex(sha1));\n+\t\tv->s = s;\n+\t\treturn 1;\n+\t}\n+\tif (!strcmp(name, \"objectname:short\")) {\n+\t\tv->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));\n+\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* See grab_values */\n+static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (!strcmp(name, \"objecttype\"))\n+\t\t\tv->s = typename(obj->type);\n+\t\telse if (!strcmp(name, \"objectsize\")) {\n+\t\t\tchar *s = xmalloc(40);\n+\t\t\tsprintf(s, \"%lu\", sz);\n+\t\t\tv->ul = sz;\n+\t\t\tv->s = s;\n+\t\t}\n+\t\telse if (deref)\n+\t\t\tgrab_objectname(name, obj->sha1, v);\n+\t}\n+}\n+\n+/* See grab_values */\n+static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tstruct tag *tag = (struct tag *) obj;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (!strcmp(name, \"tag\"))\n+\t\t\tv->s = tag->tag;\n+\t\telse if (!strcmp(name, \"type\") && tag->tagged)\n+\t\t\tv->s = typename(tag->tagged->type);\n+\t\telse if (!strcmp(name, \"object\") && tag->tagged) {\n+\t\t\tchar *s = xmalloc(41);\n+\t\t\tstrcpy(s, sha1_to_hex(tag->tagged->sha1));\n+\t\t\tv->s = s;\n+\t\t}\n+\t}\n+}\n+\n+/* See grab_values */\n+static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tstruct commit *commit = (struct commit *) obj;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (!strcmp(name, \"tree\")) {\n+\t\t\tchar *s = xmalloc(41);\n+\t\t\tstrcpy(s, sha1_to_hex(commit->tree->object.sha1));\n+\t\t\tv->s = s;\n+\t\t}\n+\t\tif (!strcmp(name, \"numparent\")) {\n+\t\t\tchar *s = xmalloc(40);\n+\t\t\tv->ul = commit_list_count(commit->parents);\n+\t\t\tsprintf(s, \"%lu\", v->ul);\n+\t\t\tv->s = s;\n+\t\t}\n+\t\telse if (!strcmp(name, \"parent\")) {\n+\t\t\tint num = commit_list_count(commit->parents);\n+\t\t\tint i;\n+\t\t\tstruct commit_list *parents;\n+\t\t\tchar *s = xmalloc(41 * num + 1);\n+\t\t\tv->s = s;\n+\t\t\tfor (i = 0, parents = commit->parents;\n+\t\t\t parents;\n+\t\t\t parents = parents->next, i = i + 41) {\n+\t\t\t\tstruct commit *parent = parents->item;\n+\t\t\t\tstrcpy(s+i, sha1_to_hex(parent->object.sha1));\n+\t\t\t\tif (parents->next)\n+\t\t\t\t\ts[i+40] = ' ';\n+\t\t\t}\n+\t\t\tif (!i)\n+\t\t\t\t*s = '\\0';\n+\t\t}\n+\t}\n+}\n+\n+static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz)\n+{\n+\tconst char *eol;\n+\twhile (*buf) {\n+\t\tif (!strncmp(buf, who, wholen) &&\n+\t\t buf[wholen] == ' ')\n+\t\t\treturn buf + wholen + 1;\n+\t\teol = strchr(buf, '\\n');\n+\t\tif (!eol)\n+\t\t\treturn \"\";\n+\t\teol++;\n+\t\tif (*eol == '\\n')\n+\t\t\treturn \"\"; /* end of header */\n+\t\tbuf = eol;\n+\t}\n+\treturn \"\";\n+}\n+\n+static const char *copy_line(const char *buf)\n+{\n+\tconst char *eol = strchrnul(buf, '\\n');\n+\treturn xmemdupz(buf, eol - buf);\n+}\n+\n+static const char *copy_name(const char *buf)\n+{\n+\tconst char *cp;\n+\tfor (cp = buf; *cp && *cp != '\\n'; cp++) {\n+\t\tif (!strncmp(cp, \" <\", 2))\n+\t\t\treturn xmemdupz(buf, cp - buf);\n+\t}\n+\treturn \"\";\n+}\n+\n+static const char *copy_email(const char *buf)\n+{\n+\tconst char *email = strchr(buf, '<');\n+\tconst char *eoemail;\n+\tif (!email)\n+\t\treturn \"\";\n+\teoemail = strchr(email, '>');\n+\tif (!eoemail)\n+\t\treturn \"\";\n+\treturn xmemdupz(email, eoemail + 1 - email);\n+}\n+\n+static char *copy_subject(const char *buf, unsigned long len)\n+{\n+\tchar *r = xmemdupz(buf, len);\n+\tint i;\n+\n+\tfor (i = 0; i < len; i++)\n+\t\tif (r[i] == '\\n')\n+\t\t\tr[i] = ' ';\n+\n+\treturn r;\n+}\n+\n+static void grab_date(const char *buf, struct atom_value *v, const char *atomname)\n+{\n+\tconst char *eoemail = strstr(buf, \"> \");\n+\tchar *zone;\n+\tunsigned long timestamp;\n+\tlong tz;\n+\tenum date_mode date_mode = DATE_NORMAL;\n+\tconst char *formatp;\n+\n+\t/*\n+\t * We got here because atomname ends in \"date\" or \"date\";\n+\t * it's not possible that is not \":\" because\n+\t * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no\n+\t * \":\" means no format is specified, and use the default.\n+\t */\n+\tformatp = strchr(atomname, ':');\n+\tif (formatp != NULL) {\n+\t\tformatp++;\n+\t\tdate_mode = parse_date_format(formatp);\n+\t}\n+\n+\tif (!eoemail)\n+\t\tgoto bad;\n+\ttimestamp = strtoul(eoemail + 2, &zone, 10);\n+\tif (timestamp == ULONG_MAX)\n+\t\tgoto bad;\n+\ttz = strtol(zone, NULL, 10);\n+\tif ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE)\n+\t\tgoto bad;\n+\tv->s = xstrdup(show_date(timestamp, tz, date_mode));\n+\tv->ul = timestamp;\n+\treturn;\n+ bad:\n+\tv->s = \"\";\n+\tv->ul = 0;\n+}\n+\n+/* See grab_values */\n+static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tint wholen = strlen(who);\n+\tconst char *wholine = NULL;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (strncmp(who, name, wholen))\n+\t\t\tcontinue;\n+\t\tif (name[wholen] != 0 &&\n+\t\t strcmp(name + wholen, \"name\") &&\n+\t\t strcmp(name + wholen, \"email\") &&\n+\t\t !starts_with(name + wholen, \"date\"))\n+\t\t\tcontinue;\n+\t\tif (!wholine)\n+\t\t\twholine = find_wholine(who, wholen, buf, sz);\n+\t\tif (!wholine)\n+\t\t\treturn; /* no point looking for it */\n+\t\tif (name[wholen] == 0)\n+\t\t\tv->s = copy_line(wholine);\n+\t\telse if (!strcmp(name + wholen, \"name\"))\n+\t\t\tv->s = copy_name(wholine);\n+\t\telse if (!strcmp(name + wholen, \"email\"))\n+\t\t\tv->s = copy_email(wholine);\n+\t\telse if (starts_with(name + wholen, \"date\"))\n+\t\t\tgrab_date(wholine, v, name);\n+\t}\n+\n+\t/*\n+\t * For a tag or a commit object, if \"creator\" or \"creatordate\" is\n+\t * requested, do something special.\n+\t */\n+\tif (strcmp(who, \"tagger\") && strcmp(who, \"committer\"))\n+\t\treturn; /* \"author\" for commit object is not wanted */\n+\tif (!wholine)\n+\t\twholine = find_wholine(who, wholen, buf, sz);\n+\tif (!wholine)\n+\t\treturn;\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\n+\t\tif (starts_with(name, \"creatordate\"))\n+\t\t\tgrab_date(wholine, v, name);\n+\t\telse if (!strcmp(name, \"creator\"))\n+\t\t\tv->s = copy_line(wholine);\n+\t}\n+}\n+\n+static void find_subpos(const char *buf, unsigned long sz,\n+\t\t\tconst char **sub, unsigned long *sublen,\n+\t\t\tconst char **body, unsigned long *bodylen,\n+\t\t\tunsigned long *nonsiglen,\n+\t\t\tconst char **sig, unsigned long *siglen)\n+{\n+\tconst char *eol;\n+\t/* skip past header until we hit empty line */\n+\twhile (*buf && *buf != '\\n') {\n+\t\teol = strchrnul(buf, '\\n');\n+\t\tif (*eol)\n+\t\t\teol++;\n+\t\tbuf = eol;\n+\t}\n+\t/* skip any empty lines */\n+\twhile (*buf == '\\n')\n+\t\tbuf++;\n+\n+\t/* parse signature first; we might not even have a subject line */\n+\t*sig = buf + parse_signature(buf, strlen(buf));\n+\t*siglen = strlen(*sig);\n+\n+\t/* subject is first non-empty line */\n+\t*sub = buf;\n+\t/* subject goes to first empty line */\n+\twhile (buf < *sig && *buf && *buf != '\\n') {\n+\t\teol = strchrnul(buf, '\\n');\n+\t\tif (*eol)\n+\t\t\teol++;\n+\t\tbuf = eol;\n+\t}\n+\t*sublen = buf - *sub;\n+\t/* drop trailing newline, if present */\n+\tif (*sublen && (*sub)[*sublen - 1] == '\\n')\n+\t\t*sublen -= 1;\n+\n+\t/* skip any empty lines */\n+\twhile (*buf == '\\n')\n+\t\tbuf++;\n+\t*body = buf;\n+\t*bodylen = strlen(buf);\n+\t*nonsiglen = *sig - buf;\n+}\n+\n+/* See grab_values */\n+static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tint i;\n+\tconst char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;\n+\tunsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (!!deref != (*name == '*'))\n+\t\t\tcontinue;\n+\t\tif (deref)\n+\t\t\tname++;\n+\t\tif (strcmp(name, \"subject\") &&\n+\t\t strcmp(name, \"body\") &&\n+\t\t strcmp(name, \"contents\") &&\n+\t\t strcmp(name, \"contents:subject\") &&\n+\t\t strcmp(name, \"contents:body\") &&\n+\t\t strcmp(name, \"contents:signature\"))\n+\t\t\tcontinue;\n+\t\tif (!subpos)\n+\t\t\tfind_subpos(buf, sz,\n+\t\t\t\t &subpos, &sublen,\n+\t\t\t\t &bodypos, &bodylen, &nonsiglen,\n+\t\t\t\t &sigpos, &siglen);\n+\n+\t\tif (!strcmp(name, \"subject\"))\n+\t\t\tv->s = copy_subject(subpos, sublen);\n+\t\telse if (!strcmp(name, \"contents:subject\"))\n+\t\t\tv->s = copy_subject(subpos, sublen);\n+\t\telse if (!strcmp(name, \"body\"))\n+\t\t\tv->s = xmemdupz(bodypos, bodylen);\n+\t\telse if (!strcmp(name, \"contents:body\"))\n+\t\t\tv->s = xmemdupz(bodypos, nonsiglen);\n+\t\telse if (!strcmp(name, \"contents:signature\"))\n+\t\t\tv->s = xmemdupz(sigpos, siglen);\n+\t\telse if (!strcmp(name, \"contents\"))\n+\t\t\tv->s = xstrdup(subpos);\n+\t}\n+}\n+\n+/*\n+ * We want to have empty print-string for field requests\n+ * that do not apply (e.g. \"authordate\" for a tag object)\n+ */\n+static void fill_missing_values(struct atom_value *val)\n+{\n+\tint i;\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tstruct atom_value *v = &val[i];\n+\t\tif (v->s == NULL)\n+\t\t\tv->s = \"\";\n+\t}\n+}\n+\n+/*\n+ * val is a list of atom_value to hold returned values. Extract\n+ * the values for atoms in used_atom array out of (obj, buf, sz).\n+ * when deref is false, (obj, buf, sz) is the object that is\n+ * pointed at by the ref itself; otherwise it is the object the\n+ * ref (which is a tag) refers to.\n+ */\n+static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz)\n+{\n+\tgrab_common_values(val, deref, obj, buf, sz);\n+\tswitch (obj->type) {\n+\tcase OBJ_TAG:\n+\t\tgrab_tag_values(val, deref, obj, buf, sz);\n+\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n+\t\tgrab_person(\"tagger\", val, deref, obj, buf, sz);\n+\t\tbreak;\n+\tcase OBJ_COMMIT:\n+\t\tgrab_commit_values(val, deref, obj, buf, sz);\n+\t\tgrab_sub_body_contents(val, deref, obj, buf, sz);\n+\t\tgrab_person(\"author\", val, deref, obj, buf, sz);\n+\t\tgrab_person(\"committer\", val, deref, obj, buf, sz);\n+\t\tbreak;\n+\tcase OBJ_TREE:\n+\t\t/* grab_tree_values(val, deref, obj, buf, sz); */\n+\t\tbreak;\n+\tcase OBJ_BLOB:\n+\t\t/* grab_blob_values(val, deref, obj, buf, sz); */\n+\t\tbreak;\n+\tdefault:\n+\t\tdie(\"Eh? Object of type %d?\", obj->type);\n+\t}\n+}\n+\n+static inline char *copy_advance(char *dst, const char *src)\n+{\n+\twhile (*src)\n+\t\t*dst++ = *src++;\n+\treturn dst;\n+}\n+\n+/*\n+ * Parse the object referred by ref, and grab needed value.\n+ */\n+static void populate_value(struct ref_array_item *ref)\n+{\n+\tvoid *buf;\n+\tstruct object *obj;\n+\tint eaten, i;\n+\tunsigned long size;\n+\tconst unsigned char *tagged;\n+\n+\tref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));\n+\n+\tif (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {\n+\t\tunsigned char unused1[20];\n+\t\tref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,\n+\t\t\t\t\t unused1, NULL);\n+\t\tif (!ref->symref)\n+\t\t\tref->symref = \"\";\n+\t}\n+\n+\t/* Fill in specials first */\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tconst char *name = used_atom[i];\n+\t\tstruct atom_value *v = &ref->value[i];\n+\t\tint deref = 0;\n+\t\tconst char *refname;\n+\t\tconst char *formatp;\n+\t\tstruct branch *branch = NULL;\n+\n+\t\tif (*name == '*') {\n+\t\t\tderef = 1;\n+\t\t\tname++;\n+\t\t}\n+\n+\t\tif (starts_with(name, \"refname\"))\n+\t\t\trefname = ref->refname;\n+\t\telse if (starts_with(name, \"symref\"))\n+\t\t\trefname = ref->symref ? ref->symref : \"\";\n+\t\telse if (starts_with(name, \"upstream\")) {\n+\t\t\t/* only local branches may have an upstream */\n+\t\t\tif (!starts_with(ref->refname, \"refs/heads/\"))\n+\t\t\t\tcontinue;\n+\t\t\tbranch = branch_get(ref->refname + 11);\n+\n+\t\t\tif (!branch || !branch->merge || !branch->merge[0] ||\n+\t\t\t !branch->merge[0]->dst)\n+\t\t\t\tcontinue;\n+\t\t\trefname = branch->merge[0]->dst;\n+\t\t} else if (starts_with(name, \"color:\")) {\n+\t\t\tchar color[COLOR_MAXLEN] = \"\";\n+\n+\t\t\tif (color_parse(name + 6, color) < 0)\n+\t\t\t\tdie(_(\"unable to parse format\"));\n+\t\t\tv->s = xstrdup(color);\n+\t\t\tcontinue;\n+\t\t} else if (!strcmp(name, \"flag\")) {\n+\t\t\tchar buf[256], *cp = buf;\n+\t\t\tif (ref->flag & REF_ISSYMREF)\n+\t\t\t\tcp = copy_advance(cp, \",symref\");\n+\t\t\tif (ref->flag & REF_ISPACKED)\n+\t\t\t\tcp = copy_advance(cp, \",packed\");\n+\t\t\tif (cp == buf)\n+\t\t\t\tv->s = \"\";\n+\t\t\telse {\n+\t\t\t\t*cp = '\\0';\n+\t\t\t\tv->s = xstrdup(buf + 1);\n+\t\t\t}\n+\t\t\tcontinue;\n+\t\t} else if (!deref && grab_objectname(name, ref->objectname, v)) {\n+\t\t\tcontinue;\n+\t\t} else if (!strcmp(name, \"HEAD\")) {\n+\t\t\tconst char *head;\n+\t\t\tunsigned char sha1[20];\n+\n+\t\t\thead = resolve_ref_unsafe(\"HEAD\", RESOLVE_REF_READING,\n+\t\t\t\t\t\t sha1, NULL);\n+\t\t\tif (!strcmp(ref->refname, head))\n+\t\t\t\tv->s = \"*\";\n+\t\t\telse\n+\t\t\t\tv->s = \" \";\n+\t\t\tcontinue;\n+\t\t} else\n+\t\t\tcontinue;\n+\n+\t\tformatp = strchr(name, ':');\n+\t\tif (formatp) {\n+\t\t\tint num_ours, num_theirs;\n+\n+\t\t\tformatp++;\n+\t\t\tif (!strcmp(formatp, \"short\"))\n+\t\t\t\trefname = shorten_unambiguous_ref(refname,\n+\t\t\t\t\t\t warn_ambiguous_refs);\n+\t\t\telse if (!strcmp(formatp, \"track\") &&\n+\t\t\t\t starts_with(name, \"upstream\")) {\n+\t\t\t\tchar buf[40];\n+\n+\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n+\t\t\t\t\t\t &num_theirs) != 1)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (!num_ours && !num_theirs)\n+\t\t\t\t\tv->s = \"\";\n+\t\t\t\telse if (!num_ours) {\n+\t\t\t\t\tsprintf(buf, \"[behind %d]\", num_theirs);\n+\t\t\t\t\tv->s = xstrdup(buf);\n+\t\t\t\t} else if (!num_theirs) {\n+\t\t\t\t\tsprintf(buf, \"[ahead %d]\", num_ours);\n+\t\t\t\t\tv->s = xstrdup(buf);\n+\t\t\t\t} else {\n+\t\t\t\t\tsprintf(buf, \"[ahead %d, behind %d]\",\n+\t\t\t\t\t\tnum_ours, num_theirs);\n+\t\t\t\t\tv->s = xstrdup(buf);\n+\t\t\t\t}\n+\t\t\t\tcontinue;\n+\t\t\t} else if (!strcmp(formatp, \"trackshort\") &&\n+\t\t\t\t starts_with(name, \"upstream\")) {\n+\t\t\t\tassert(branch);\n+\n+\t\t\t\tif (stat_tracking_info(branch, &num_ours,\n+\t\t\t\t\t\t\t&num_theirs) != 1)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (!num_ours && !num_theirs)\n+\t\t\t\t\tv->s = \"=\";\n+\t\t\t\telse if (!num_ours)\n+\t\t\t\t\tv->s = \"<\";\n+\t\t\t\telse if (!num_theirs)\n+\t\t\t\t\tv->s = \">\";\n+\t\t\t\telse\n+\t\t\t\t\tv->s = \"<>\";\n+\t\t\t\tcontinue;\n+\t\t\t} else\n+\t\t\t\tdie(\"unknown %.*s format %s\",\n+\t\t\t\t (int)(formatp - name), name, formatp);\n+\t\t}\n+\n+\t\tif (!deref)\n+\t\t\tv->s = refname;\n+\t\telse {\n+\t\t\tint len = strlen(refname);\n+\t\t\tchar *s = xmalloc(len + 4);\n+\t\t\tsprintf(s, \"%s^{}\", refname);\n+\t\t\tv->s = s;\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < used_atom_cnt; i++) {\n+\t\tstruct atom_value *v = &ref->value[i];\n+\t\tif (v->s == NULL)\n+\t\t\tgoto need_obj;\n+\t}\n+\treturn;\n+\n+ need_obj:\n+\tbuf = get_obj(ref->objectname, &obj, &size, &eaten);\n+\tif (!buf)\n+\t\tdie(\"missing object %s for %s\",\n+\t\t sha1_to_hex(ref->objectname), ref->refname);\n+\tif (!obj)\n+\t\tdie(\"parse_object_buffer failed on %s for %s\",\n+\t\t sha1_to_hex(ref->objectname), ref->refname);\n+\n+\tgrab_values(ref->value, 0, obj, buf, size);\n+\tif (!eaten)\n+\t\tfree(buf);\n+\n+\t/*\n+\t * If there is no atom that wants to know about tagged\n+\t * object, we are done.\n+\t */\n+\tif (!need_tagged || (obj->type != OBJ_TAG))\n+\t\treturn;\n+\n+\t/*\n+\t * If it is a tag object, see if we use a value that derefs\n+\t * the object, and if we do grab the object it refers to.\n+\t */\n+\ttagged = ((struct tag *)obj)->tagged->sha1;\n+\n+\t/*\n+\t * NEEDSWORK: This derefs tag only once, which\n+\t * is good to deal with chains of trust, but\n+\t * is not consistent with what deref_tag() does\n+\t * which peels the onion to the core.\n+\t */\n+\tbuf = get_obj(tagged, &obj, &size, &eaten);\n+\tif (!buf)\n+\t\tdie(\"missing object %s for %s\",\n+\t\t sha1_to_hex(tagged), ref->refname);\n+\tif (!obj)\n+\t\tdie(\"parse_object_buffer failed on %s for %s\",\n+\t\t sha1_to_hex(tagged), ref->refname);\n+\tgrab_values(ref->value, 1, obj, buf, size);\n+\tif (!eaten)\n+\t\tfree(buf);\n+}\n+\n+/*\n+ * Given a ref, return the value for the atom. This lazily gets value\n+ * out of the object by calling populate value.\n+ */\n+static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v)\n+{\n+\tif (!ref->value) {\n+\t\tpopulate_value(ref);\n+\t\tfill_missing_values(ref->value);\n+\t}\n+\t*v = &ref->value[atom];\n+}\n+\n+/*\n+ * Given a refname, return 1 if the refname matches with one of the patterns\n+ * while the pattern is a pathname like 'refs/tags' or 'refs/heads/master'\n+ * and so on, else return 0. Supports use of wild characters.\n+ */\n+static int match_name_as_path(const char **pattern, const char *refname)\n+{\n+\tint namelen = strlen(refname);\n+\tfor (; *pattern; pattern++) {\n+\t\tconst char *p = *pattern;\n+\t\tint plen = strlen(p);\n+\n+\t\tif ((plen <= namelen) &&\n+\t\t !strncmp(refname, p, plen) &&\n+\t\t (refname[plen] == '\\0' ||\n+\t\t refname[plen] == '/' ||\n+\t\t p[plen-1] == '/'))\n+\t\t\treturn 1;\n+\t\tif (!wildmatch(p, refname, WM_PATHNAME, NULL))\n+\t\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/* Allocate space for a new ref_array_item and copy the objectname and flag to it */\n+static struct ref_array_item *new_ref_array_item(const char *refname,\n+\t\t\t\t\t\t const unsigned char *objectname,\n+\t\t\t\t\t\t int flag)\n+{\n+\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item));\n+\tref->refname = xstrdup(refname);\n+\thashcpy(ref->objectname, objectname);\n+\tref->flag = flag;\n+\n+\treturn ref;\n+}\n+\n+/*\n+ * A call-back given to for_each_ref(). Filter refs and keep them for\n+ * later object processing.\n+ */\n+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data)\n+{\n+\tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n+\tstruct ref_filter *filter = &ref_cbdata->filter;\n+\tstruct ref_array_item *ref;\n+\n+\tif (flag & REF_BAD_NAME) {\n+\t\twarning(\"ignoring ref with broken name %s\", refname);\n+\t\treturn 0;\n+\t}\n+\n+\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))\n+\t\treturn 0;\n+\n+\tref = new_ref_array_item(refname, sha1, flag);\n+\n+\tREALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1);\n+\tref_cbdata->array.items[ref_cbdata->array.nr++] = ref;\n+\n+\treturn 0;\n+}\n+\n+/* Free all memory allocated for ref_filter_cbdata */\n+void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < ref_cbdata->array.nr; i++)\n+\t\tfree(ref_cbdata->array.items[i]);\n+\tfree(ref_cbdata->array.items);\n+\tref_cbdata->array.items = NULL;\n+\tref_cbdata->array.nr = ref_cbdata->array.alloc = 0;\n+}\n+\n+static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b)\n+{\n+\tstruct atom_value *va, *vb;\n+\tint cmp;\n+\tcmp_type cmp_type = used_atom_type[s->atom];\n+\n+\tget_ref_atom_value(a, s->atom, &va);\n+\tget_ref_atom_value(b, s->atom, &vb);\n+\tswitch (cmp_type) {\n+\tcase FIELD_STR:\n+\t\tcmp = strcmp(va->s, vb->s);\n+\t\tbreak;\n+\tdefault:\n+\t\tif (va->ul < vb->ul)\n+\t\t\tcmp = -1;\n+\t\telse if (va->ul == vb->ul)\n+\t\t\tcmp = 0;\n+\t\telse\n+\t\t\tcmp = 1;\n+\t\tbreak;\n+\t}\n+\treturn (s->reverse) ? -cmp : cmp;\n+}\n+\n+static struct ref_sort *ref_sort;\n+static int compare_refs(const void *a_, const void *b_)\n+{\n+\tstruct ref_array_item *a = *((struct ref_array_item **)a_);\n+\tstruct ref_array_item *b = *((struct ref_array_item **)b_);\n+\tstruct ref_sort *s;\n+\n+\tfor (s = ref_sort; s; s = s->next) {\n+\t\tint cmp = cmp_ref_sort(s, a, b);\n+\t\tif (cmp)\n+\t\t\treturn cmp;\n+\t}\n+\treturn 0;\n+}\n+\n+void sort_ref_array(struct ref_sort *sort, struct ref_array *array)\n+{\n+\tref_sort = sort;\n+\tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n+}\n+\n+static void print_value(struct atom_value *v, int quote_style)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tswitch (quote_style) {\n+\tcase QUOTE_NONE:\n+\t\tfputs(v->s, stdout);\n+\t\tbreak;\n+\tcase QUOTE_SHELL:\n+\t\tsq_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\tcase QUOTE_PERL:\n+\t\tperl_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\tcase QUOTE_PYTHON:\n+\t\tpython_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\tcase QUOTE_TCL:\n+\t\ttcl_quote_buf(&sb, v->s);\n+\t\tbreak;\n+\t}\n+\tif (quote_style != QUOTE_NONE) {\n+\t\tfputs(sb.buf, stdout);\n+\t\tstrbuf_release(&sb);\n+\t}\n+}\n+\n+static int hex1(char ch)\n+{\n+\tif ('0' <= ch && ch <= '9')\n+\t\treturn ch - '0';\n+\telse if ('a' <= ch && ch <= 'f')\n+\t\treturn ch - 'a' + 10;\n+\telse if ('A' <= ch && ch <= 'F')\n+\t\treturn ch - 'A' + 10;\n+\treturn -1;\n+}\n+static int hex2(const char *cp)\n+{\n+\tif (cp[0] && cp[1])\n+\t\treturn (hex1(cp[0]) << 4) | hex1(cp[1]);\n+\telse\n+\t\treturn -1;\n+}\n+\n+static void emit(const char *cp, const char *ep)\n+{\n+\twhile (*cp && (!ep || cp < ep)) {\n+\t\tif (*cp == '%') {\n+\t\t\tif (cp[1] == '%')\n+\t\t\t\tcp++;\n+\t\t\telse {\n+\t\t\t\tint ch = hex2(cp + 1);\n+\t\t\t\tif (0 <= ch) {\n+\t\t\t\t\tputchar(ch);\n+\t\t\t\t\tcp += 3;\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tputchar(*cp);\n+\t\tcp++;\n+\t}\n+}\n+\n+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)\n+{\n+\tconst char *cp, *sp, *ep;\n+\n+\tfor (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {\n+\t\tstruct atom_value *atomv;\n+\n+\t\tep = strchr(sp, ')');\n+\t\tif (cp < sp)\n+\t\t\temit(cp, sp);\n+\t\tget_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);\n+\t\tprint_value(atomv, quote_style);\n+\t}\n+\tif (*cp) {\n+\t\tsp = cp + strlen(cp);\n+\t\temit(cp, sp);\n+\t}\n+\tif (need_color_reset_at_eol) {\n+\t\tstruct atom_value resetv;\n+\t\tchar color[COLOR_MAXLEN] = \"\";\n+\n+\t\tif (color_parse(\"reset\", color) < 0)\n+\t\t\tdie(\"BUG: couldn't parse 'reset' as a color\");\n+\t\tresetv.s = color;\n+\t\tprint_value(&resetv, quote_style);\n+\t}\n+\tputchar('\\n');\n+}\n+\n+/* If no sorting option is given, use refname to sort as default */\n+struct ref_sort *ref_default_sort(void)\n+{\n+\tstatic const char cstr_name[] = \"refname\";\n+\n+\tstruct ref_sort *sort = xcalloc(1, sizeof(*sort));\n+\n+\tsort->next = NULL;\n+\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n+\treturn sort;\n+}\n+\n+int opt_parse_ref_sort(const struct option *opt, const char *arg, int unset)\n+{\n+\tstruct ref_sort **sort_tail = opt->value;\n+\tstruct ref_sort *s;\n+\tint len;\n+\n+\tif (!arg) /* should --no-sort void the list ? */\n+\t\treturn -1;\n+\n+\ts = xcalloc(1, sizeof(*s));\n+\ts->next = *sort_tail;\n+\t*sort_tail = s;\n+\n+\tif (*arg == '-') {\n+\t\ts->reverse = 1;\n+\t\targ++;\n+\t}\n+\tlen = strlen(arg);\n+\ts->atom = parse_ref_filter_atom(arg, arg+len);\n+\treturn 0;\n+}\ndiff --git a/ref-filter.h b/ref-filter.h\nnew file mode 100644\nindex 0000000..dacae59\n--- /dev/null\n+++ b/ref-filter.h\n@@ -0,0 +1,66 @@\n+#ifndef REF_FILTER_H\n+#define REF_FILTER_H\n+\n+#include \"sha1-array.h\"\n+#include \"refs.h\"\n+#include \"commit.h\"\n+#include \"parse-options.h\"\n+\n+/* Quoting styles */\n+#define QUOTE_NONE 0\n+#define QUOTE_SHELL 1\n+#define QUOTE_PERL 2\n+#define QUOTE_PYTHON 4\n+#define QUOTE_TCL 8\n+\n+struct atom_value {\n+\tconst char *s;\n+\tunsigned long ul; /* used for sorting when not FIELD_STR */\n+};\n+\n+struct ref_sort {\n+\tstruct ref_sort *next;\n+\tint atom; /* index into used_atom array */\n+\tunsigned reverse : 1;\n+};\n+\n+struct ref_array_item {\n+\tunsigned char objectname[20];\n+\tint flag;\n+\tconst char *symref;\n+\tstruct atom_value *value;\n+\tchar *refname;\n+};\n+\n+struct ref_array {\n+\tint nr, alloc;\n+\tstruct ref_array_item **items;\n+};\n+\n+struct ref_filter {\n+\tconst char **name_patterns;\n+};\n+\n+struct ref_filter_cbdata {\n+\tstruct ref_array array;\n+\tstruct ref_filter filter;\n+};\n+\n+/* Callback function for for_each_*ref(). This filters the refs based on the filters set */\n+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data);\n+/* Clear all memory allocated to ref_filter_data */\n+void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata);\n+/* Parse format string and sort specifiers */\n+int parse_ref_filter_atom(const char *atom, const char *ep);\n+/* Used to verify if the given format is correct and to parse out the used atoms */\n+int verify_ref_format(const char *format);\n+/* Sort the given ref_array as per the ref_sort provided */\n+void sort_ref_array(struct ref_sort *sort, struct ref_array *array);\n+/* Print the ref using the given format and quote_style */\n+void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style);\n+/* Callback function for parsing the sort option */\n+int opt_parse_ref_sort(const struct option *opt, const char *arg, int unset);\n+/* Default sort option based on refname */\n+struct ref_sort *ref_default_sort(void);\n+\n+#endif /* REF_FILTER_H */\n-- \n2.4.1\n"},{"id":"262370","messageId":"vpqr3q0o3yr.fsf@anie.imag.fr","threadId":"39450","inReplyTo":"1432835025-13291-1-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH/WIP v3 1/4] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-05-28T20:13:32Z","receivedAt":"2015-05-28T20:13:32Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> This is a preperatory patch for restructuring 'for-each-ref' and\n> evntually moving most of it to 'ref-filter' to provide the\n\ns/evntually/eventually/\n\nThe patch looks much nicer now.\n\n> -\tint cnt;\n> [...]\n> +\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n> +\tcb->grab_array[cb->grab_cnt++] = ref;\n> \n> -\tcnt = cb->grab_cnt;\n> -\tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n> -\tcb->grab_array[cnt++] = ref;\n> -\tcb->grab_cnt = cnt;\n\nThis hunk is not advertized in the commit message, and I had to fight a\nbit to understand what it does with \"we're extracting helper functions\"\nin mind. It would have been much easier to review in a separate patch\nentitled \"for-each-ref: simplify code\" for example.\n\nBut I agree that your version is simpler indeed.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"262371","messageId":"vpqegm0o3dx.fsf@anie.imag.fr","threadId":"39450","inReplyTo":"1432835025-13291-2-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-05-28T20:26:02Z","receivedAt":"2015-05-28T20:26:02Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'\n\nThe fact that you need to use \"and\" to describe your changes is a hint\nthat you can split better.\n\nThe patch looks much better, but I think you still need to split more to\nmake it easier to review.\n\n> - * of properties that we need to extract out of objects. refinfo\n> + * of properties that we need to extract out of objects. ref_array_item\n\nNot very important, but two spaces after a period is what one is\nsupposed to do in English. Not everybody follow the rule, but it seems\nbackward to change the code to break it.\n\n> \tif (flag & REF_BAD_NAME) {\n> -\t\t warning(\"ignoring ref with broken name %s\", refname);\n> -\t\t return 0;\n> +\t\twarning(\"ignoring ref with broken name %s\", refname);\n> +\t\treturn 0;\n\nWhitespace fix mixed with actual code.\n\n> -static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b)\n> +/* Free all memory allocated for ref_filter_cbdata */\n> +void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata)\n> +{\n> +\tint i;\n> +\n> +\tfor (i = 0; i < ref_cbdata->array.nr; i++)\n> +\t\tfree(ref_cbdata->array.items[i]);\n> +\tfree(ref_cbdata->array.items);\n> +\tref_cbdata->array.items = NULL;\n> +\tref_cbdata->array.nr = ref_cbdata->array.alloc = 0;\n> +}\n\nAnd this one is a real behavior change, which would be much better\ndocumented in its own patch with a proper commit message (we had a\nmemory leak before, we didn't care because it happened right before\nexiting, but we can't accept that in a clean library).\n\nReviewing is not just about having a look and seeing if there's\nsomething stupid. Reviewers are actually taking a lot of time to see if\nthe patch does not introduce new bugs, or looking for better ways to do\nthe same thing. Be nice with them!\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"262372","messageId":"55677B7D.3060209@gmail.com","threadId":"39450","inReplyTo":"vpqr3q0o3yr.fsf@anie.imag.fr","subject":"Re: [PATCH/WIP v3 1/4] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T20:33:01Z","receivedAt":"2015-05-28T20:33:01Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 05/29/2015 01:43 AM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n>> This is a preperatory patch for restructuring 'for-each-ref' and\n>> evntually moving most of it to 'ref-filter' to provide the\n>\n> s/evntually/eventually/\n\nNoted.\n\n\n>\n> The patch looks much nicer now.\n>\n>> -\tint cnt;\n>> [...]\n>> +\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n>> +\tcb->grab_array[cb->grab_cnt++] = ref;\n>>\n>> -\tcnt = cb->grab_cnt;\n>> -\tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n>> -\tcb->grab_array[cnt++] = ref;\n>> -\tcb->grab_cnt = cnt;\n>\n> This hunk is not advertized in the commit message, and I had to fight a\n> bit to understand what it does with \"we're extracting helper functions\"\n> in mind. It would have been much easier to review in a separate patch\n> entitled \"for-each-ref: simplify code\" for example.\n>\n> But I agree that your version is simpler indeed.\n>\n\nWill put it in a separate patch. Thanks for the review.\n\n-- \nRegards,\nKarthik\n"},{"id":"262373","messageId":"vpq382go2yz.fsf@anie.imag.fr","threadId":"39450","inReplyTo":"1432835025-13291-4-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH/WIP v3 4/4] ref-filter: move code from 'for-each-ref'","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-05-28T20:35:00Z","receivedAt":"2015-05-28T20:35:00Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> Move most of the code from 'for-each-ref' to 'ref-filter' to make\n> it publically available to other commands, this is to unify the code\n\ns/publically/publicly/\n\n> --- /dev/null\n> +++ b/ref-filter.h\n\nMoving file to the .h file should be done in a separate patch. I don't\nwant to review the 1050 lines of cut-and-paste other than by doing the\ncut-and-paste myself and see if I get the same result, but this part is\nnot as straightforward and needs proper thinking and review.\n\nIn short: the big code movement should be *only* a cut-and-paste, alone\nin its own patch.\n\nOn overall, we're getting close to an acceptable version for these 4\npatches. My advice: prioritize polishing these few patches, so that we\ncan do a detailed review and then consider this part \"done\" (either\nmerged in git.git or not, but I'd like to avoid having to review the\ncode movement & refactoring again when we move to the next patches).\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"262374","messageId":"55677C7F.6080400@gmail.com","threadId":"39450","inReplyTo":"vpqegm0o3dx.fsf@anie.imag.fr","subject":"Re: [PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T20:37:19Z","receivedAt":"2015-05-28T20:37:19Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 05/29/2015 01:56 AM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n>> Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'\n>\n> The fact that you need to use \"and\" to describe your changes is a hint\n> that you can split better.\n>\n\nBut the patch alone wouldn't make much sense here, as the whole idea is \nthe introduction of the new structures and renaming 'refinfo' to \n'ref_array_item' was more of a byproduct to go along with the new \nstructures introduced.\n\n >\n> The patch looks much better, but I think you still need to split more to\n> make it easier to review.\n>\n>> - * of properties that we need to extract out of objects. refinfo\n>> + * of properties that we need to extract out of objects. ref_array_item\n>\n> Not very important, but two spaces after a period is what one is\n> supposed to do in English. Not everybody follow the rule, but it seems\n> backward to change the code to break it.\n>\n\nI'm just so used to single spacing, Will change it.\n\n>> \tif (flag & REF_BAD_NAME) {\n>> -\t\t warning(\"ignoring ref with broken name %s\", refname);\n>> -\t\t return 0;\n>> +\t\twarning(\"ignoring ref with broken name %s\", refname);\n>> +\t\treturn 0;\n>\n> Whitespace fix mixed with actual code.\n>\n\nNoted.\n\n\n>> -static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b)\n>> +/* Free all memory allocated for ref_filter_cbdata */\n>> +void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata)\n>> +{\n>> +\tint i;\n>> +\n>> +\tfor (i = 0; i < ref_cbdata->array.nr; i++)\n>> +\t\tfree(ref_cbdata->array.items[i]);\n>> +\tfree(ref_cbdata->array.items);\n>> +\tref_cbdata->array.items = NULL;\n>> +\tref_cbdata->array.nr = ref_cbdata->array.alloc = 0;\n>> +}\n>\n> And this one is a real behavior change, which would be much better\n> documented in its own patch with a proper commit message (we had a\n> memory leak before, we didn't care because it happened right before\n> exiting, but we can't accept that in a clean library).\n>\n\nOk will put that into a separate commit.\n\n\n> Reviewing is not just about having a look and seeing if there's\n> something stupid. Reviewers are actually taking a lot of time to see if\n> the patch does not introduce new bugs, or looking for better ways to do\n> the same thing. Be nice with them!\n>\n\nThanks for the effort from your side, will try to split things as much \nas possible and make it easier for Reviewers.\n\n-- \nRegards,\nKarthik\n"},{"id":"262376","messageId":"vpq8uc8l9k0.fsf@anie.imag.fr","threadId":"39450","inReplyTo":"55677C7F.6080400@gmail.com","subject":"Re: [PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-05-28T20:41:03Z","receivedAt":"2015-05-28T20:41:03Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Karthik Nayak writes:\n\n> On 05/29/2015 01:56 AM, Matthieu Moy wrote:\n>> Karthik Nayak writes:\n>>\n>>> Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'\n>>\n>> The fact that you need to use \"and\" to describe your changes is a hint\n>> that you can split better.\n>>\n>\n> But the patch alone wouldn't make much sense here, as the whole idea\n> is the introduction of the new structures and renaming 'refinfo' to\n> ref_array_item' was more of a byproduct to go along with the new\n> structures introduced.\n\nThe point of separating them is that the rename implies a relatively\nlong patch (you have 17 occurences of 'refinfo' in the deletion part of\nyour patch), but it is straightforward to review (apply, run \"git diff\n--color-words\" and press space a few times). But it is no longer so\nsimple once you mix it with anything else.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"262377","messageId":"55677DDC.2070601@gmail.com","threadId":"39450","inReplyTo":"vpq8uc8l9k0.fsf@anie.imag.fr","subject":"Re: [PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T20:43:08Z","receivedAt":"2015-05-28T20:43:08Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 05/29/2015 02:11 AM, Matthieu Moy wrote:\n> The point of separating them is that the rename implies a relatively\n> long patch (you have 17 occurences of 'refinfo' in the deletion part of\n> your patch), but it is straightforward to review (apply, run \"git diff\n> --color-words\" and press space a few times). But it is no longer so\n> simple once you mix it with anything else.\n>\nMakes sense, thanks for putting it out.\n\n-- \nRegards,\nKarthik\n"},{"id":"262379","messageId":"55677EAE.5060205@gmail.com","threadId":"39450","inReplyTo":"vpq382go2yz.fsf@anie.imag.fr","subject":"Re: [PATCH/WIP v3 4/4] ref-filter: move code from 'for-each-ref'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-05-28T20:46:38Z","receivedAt":"2015-05-28T20:46:38Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 05/29/2015 02:05 AM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n>> Move most of the code from 'for-each-ref' to 'ref-filter' to make\n>> it publically available to other commands, this is to unify the code\n>\n> s/publically/publicly/\n>\n>> --- /dev/null\n>> +++ b/ref-filter.h\n>\n> Moving file to the .h file should be done in a separate patch. I don't\n> want to review the 1050 lines of cut-and-paste other than by doing the\n> cut-and-paste myself and see if I get the same result, but this part is\n> not as straightforward and needs proper thinking and review.\n>\n> In short: the big code movement should be *only* a cut-and-paste, alone\n> in its own patch.\n>\n\nOk, will separate it into two patches.\n\n >\n> On overall, we're getting close to an acceptable version for these 4\n> patches. My advice: prioritize polishing these few patches, so that we\n> can do a detailed review and then consider this part \"done\" (either\n> merged in git.git or not, but I'd like to avoid having to review the\n> code movement & refactoring again when we move to the next patches).\n>\n\nSure I'll fix changes suggested by you and push to Github probably by \ntonight (IST), will wait for a day or two to see if there are more \nsuggestions by others on the mailing list before sending a new patch \nseries here.\n\n-- \nRegards,\nKarthik\n"},{"id":"262381","messageId":"xmqqmw0ofljj.fsf@gitster.dls.corp.google.com","threadId":"39450","inReplyTo":"vpqegm0o3dx.fsf@anie.imag.fr","subject":"Re: [PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-28T21:18:40Z","receivedAt":"2015-05-28T21:18:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> Not very important, but two spaces after a period is what one is\n> supposed to do in English. Not everybody follow the rule, but it seems\n> backward to change the code to break it.\n\nI am old fashioned enough to personally agree, but this practice\nthat originates in the typewriter era is frowned upon in many\ncircles, including those who work with professional typesetters, I\nthink.\n\nSent off-list to reduce noise level; this is an issue that attracts\na lot of useless comments.\n"},{"id":"262383","messageId":"xmqqiobcfl2y.fsf@gitster.dls.corp.google.com","threadId":"39450","inReplyTo":"xmqqmw0ofljj.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH/WIP v3 2/4] for-each-ref: introduce new structures for better organisation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-05-28T21:28:37Z","receivedAt":"2015-05-28T21:28:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Sent off-list to reduce noise level; this is an issue that attracts\n> a lot of useless comments.\n\nHeh, somehow I screwed up and sent on-list X-<.\n"}]}