{"thread":{"id":"39600","subject":"[PATCH v7 0/12] Create ref-filter from for-each-ref","startedAt":"2015-06-11T16:07:47Z","lastAt":"2015-06-12T21:22:08Z","messageCount":32,"participants":["Karthik Nayak","Matthieu Moy","Junio C Hamano","Christian Couder","karthik nayak"],"isPatch":true,"patchVersion":7,"patchTotal":12},"messages":[{"id":"263600","messageId":"5579B253.4020804@gmail.com","threadId":"39600","inReplyTo":null,"subject":"[PATCH v7 0/12] Create ref-filter from for-each-ref","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:07:47Z","receivedAt":"2015-06-11T16:07:47Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"The previous version of this patch can be found here:\nhttp://thread.gmane.org/gmane.comp.version-control.git/270922\n\nChanges found in this version:\n* Various changes to the 'filter_refs()' function.\n* Split 'for-each-ref: clean up code' into two commits.\n* Other small changes.\n\n-- \nRegards,\nKarthik\n"},{"id":"263603","messageId":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"5579B253.4020804@gmail.com","subject":"[PATCH v7 01/12] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:52Z","receivedAt":"2015-06-11T16:09:52Z","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 supports wildcard\ncharacters.\n\nThis is a preperatory patch for restructuring 'for-each-ref' and\neventually 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 | 64 ++++++++++++++++++++++++++++++++------------------\n 1 file changed, 41 insertions(+), 23 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex f7e51a7..67c8b62 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -851,6 +851,44 @@ struct grab_ref_cbdata {\n };\n \n /*\n+ * Return 1 if the refname matches with one of the patterns,\n+ * otherwise 0. The patterns can be literal prefix (e.g. a\n+ * refname \"refs/heads/master\" matches a pattern \"refs/heads/\")\n+ * or a wildcard (e.g. the same ref matches \"refs/heads/m*\",too).\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@@ -866,35 +904,15 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\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, oid->hash);\n-\tref->flag = flag;\n+\tref = new_refinfo(refname, oid->hash, flag);\n \n \tcnt = cb->grab_cnt;\n \tREALLOC_ARRAY(cb->grab_array, cnt + 1);\n-- \n2.4.2\n"},{"id":"263614","messageId":"1434039003-10928-2-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 02/12] for-each-ref: clean up code","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:53Z","receivedAt":"2015-06-11T16:09:53Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"In 'grab_single_ref()' remove the extra count variable 'cnt' and\nuse the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly\ninstead.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 7 ++-----\n 1 file changed, 2 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 67c8b62..0dd2df2 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -897,7 +897,6 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\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@@ -914,10 +913,8 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\n \t */\n \tref = new_refinfo(refname, oid->hash, flag);\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+\tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n+\tcb->grab_array[cb->grab_cnt++] = ref;\n \treturn 0;\n }\n \n-- \n2.4.2\n"},{"id":"263602","messageId":"1434039003-10928-3-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:54Z","receivedAt":"2015-06-11T16:09:54Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"The comment in 'ref_sort' hasn't been changed 9f613dd.\nChange the comment to reflect changes made in the code since\n9f613dd.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 0dd2df2..bfad03f 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -27,7 +27,7 @@ struct atom_value {\n \n struct ref_sort {\n \tstruct ref_sort *next;\n-\tint atom; /* index into used_atom array */\n+\tint atom; /* index into 'struct atom_value *' array */\n \tunsigned reverse : 1;\n };\n \n-- \n2.4.2\n"},{"id":"263604","messageId":"1434039003-10928-4-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 04/12] for-each-ref: rename 'refinfo' to 'ref_array_item'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:55Z","receivedAt":"2015-06-11T16:09:55Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Rename 'refinfo' to 'ref_array_item' as a preparatory step for\nintroduction of new structures in the forthcoming patch.\n\nRe-order the fields in 'ref_array_item' so that refname can be\neventually converted to a FLEX_ARRAY.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 40 ++++++++++++++++++++--------------------\n 1 file changed, 20 insertions(+), 20 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex bfad03f..8c44b49 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -31,12 +31,12 @@ 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 static struct {\n@@ -86,7 +86,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@@ -623,7 +623,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@@ -835,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@@ -845,7 +845,7 @@ static void get_value(struct refinfo *ref, int atom, struct atom_value **v)\n }\n \n struct grab_ref_cbdata {\n-\tstruct refinfo **grab_array;\n+\tstruct ref_array_item **grab_array;\n \tconst char **grab_pattern;\n \tint grab_cnt;\n };\n@@ -875,12 +875,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@@ -896,7 +896,7 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\n \t\t\t int flag, void *cb_data)\n {\n \tstruct grab_ref_cbdata *cb = cb_data;\n-\tstruct refinfo *ref;\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@@ -911,14 +911,14 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\n \t * to do its job and the resulting list may yet to be pruned\n \t * by maxcount logic.\n \t */\n-\tref = new_refinfo(refname, oid->hash, flag);\n+\tref = new_ref_array_item(refname, oid->hash, flag);\n \n \tREALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1);\n \tcb->grab_array[cb->grab_cnt++] = ref;\n \treturn 0;\n }\n \n-static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b)\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@@ -945,8 +945,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@@ -957,10 +957,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_item **refs, int num_refs)\n {\n \tref_sort = sort;\n-\tqsort(refs, num_refs, sizeof(struct refinfo *), compare_refs);\n+\tqsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs);\n }\n \n static void print_value(struct atom_value *v, int quote_style)\n@@ -1027,7 +1027,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@@ -1100,7 +1100,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\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 ref_array_item **refs;\n \tstruct grab_ref_cbdata cbdata;\n \n \tstruct option opts[] = {\n-- \n2.4.2\n"},{"id":"263605","messageId":"1434039003-10928-5-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 05/12] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:56Z","receivedAt":"2015-06-11T16:09:56Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce 'ref_filter_cbdata' which will hold 'ref_filter'\n(conditions to filter the refs on) and 'ref_array' (the array\nof ref_array_items). Modify the code to use these new structures.\n\nThis is a preparatory patch to eventually move code from 'for-each-ref'\nto 'ref-filter' and make it publicly available.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 54 ++++++++++++++++++++++++++++----------------------\n 1 file changed, 30 insertions(+), 24 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 8c44b49..913d757 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -39,6 +39,20 @@ struct ref_array_item {\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@@ -844,12 +858,6 @@ static void get_value(struct ref_array_item *ref, int atom, struct atom_value **\n \t*v = &ref->value[atom];\n }\n \n-struct grab_ref_cbdata {\n-\tstruct ref_array_item **grab_array;\n-\tconst char **grab_pattern;\n-\tint grab_cnt;\n-};\n-\n /*\n * Return 1 if the refname matches with one of the patterns,\n * otherwise 0. The patterns can be literal prefix (e.g. a\n@@ -895,7 +903,8 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\n static int grab_single_ref(const char *refname, const struct object_id *oid,\n \t\t\t int flag, void *cb_data)\n {\n-\tstruct grab_ref_cbdata *cb = cb_data;\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@@ -903,7 +912,7 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\n \t\t return 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 \t/*\n@@ -913,8 +922,8 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\n \t */\n \tref = new_ref_array_item(refname, oid->hash, 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 \treturn 0;\n }\n \n@@ -957,10 +966,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 ref_array_item **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 ref_array_item *), 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@@ -1096,12 +1105,11 @@ 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 ref_array_item **refs;\n-\tstruct grab_ref_cbdata cbdata;\n+\tstruct ref_filter_cbdata ref_cbdata;\n \n \tstruct option opts[] = {\n \t\tOPT_BIT('s', \"shell\", "e_style,\n@@ -1139,17 +1147,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+\tmemset(&ref_cbdata, 0, sizeof(ref_cbdata));\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 \treturn 0;\n }\n-- \n2.4.2\n"},{"id":"263607","messageId":"1434039003-10928-6-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 06/12] for-each-ref: introduce 'ref_array_clear()'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:57Z","receivedAt":"2015-06-11T16:09:57Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce and implement 'ref_array_clear()' which will free\nall allocated memory for 'ref_array'.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 21 +++++++++++++++++++++\n 1 file changed, 21 insertions(+)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 913d757..58396b2 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -927,6 +927,26 @@ static int grab_single_ref(const char *refname, const struct object_id *oid,\n \treturn 0;\n }\n \n+/* Free memory allocated for a ref_array_item */\n+static void free_array_item(struct ref_array_item *item)\n+{\n+\tfree((char *)item->symref);\n+\tfree(item->refname);\n+\tfree(item);\n+}\n+\n+/* Free all memory allocated for ref_array */\n+void ref_array_clear(struct ref_array *array)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < array->nr; i++)\n+\t\tfree_array_item(array->items[i]);\n+\tfree(array->items);\n+\tarray->items = NULL;\n+\tarray->nr = 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@@ -1157,5 +1177,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\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+\tref_array_clear(&ref_cbdata.array);\n \treturn 0;\n }\n-- \n2.4.2\n"},{"id":"263612","messageId":"1434039003-10928-7-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 07/12] for-each-ref: rename some functions and make them public","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:58Z","receivedAt":"2015-06-11T16:09:58Z","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 publicly 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\nFunctions renamed are:\nparse_atom()\t\t-> \tparse_ref_filter_atom()\nverify_format()\t\t-> \tverify_ref_format()\nget_value()\t\t-> \tget_ref_atom_value()\ngrab_single_ref()\t-> \tref_filter_handler()\nsort_refs()\t\t->\tref_array_sort()\nshow_ref()\t\t->\tshow_ref_array_item()\ndefault_sort()\t\t->\tref_default_sorting()\nopt_parse_sort()\t->\tparse_opt_ref_sorting()\ncmp_ref_sort()\t\t->\tcmp_ref_sorting()\n\nRename 'struct ref_sort' to 'struct ref_sorting' in this context.\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 | 68 +++++++++++++++++++++++++-------------------------\n 1 file changed, 34 insertions(+), 34 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 58396b2..4a6eaba 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -25,8 +25,8 @@ struct atom_value {\n \tunsigned long ul; /* used for sorting when not FIELD_STR */\n };\n \n-struct ref_sort {\n-\tstruct ref_sort *next;\n+struct ref_sorting {\n+\tstruct ref_sorting *next;\n \tint atom; /* index into 'struct atom_value *' array */\n \tunsigned reverse : 1;\n };\n@@ -113,7 +113,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@@ -190,7 +190,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@@ -202,7 +202,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@@ -409,7 +409,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@@ -849,7 +849,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@@ -900,8 +900,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\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 struct object_id *oid,\n-\t\t\t int flag, void *cb_data)\n+int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data)\n {\n \tstruct ref_filter_cbdata *ref_cbdata = cb_data;\n \tstruct ref_filter *filter = &ref_cbdata->filter;\n@@ -947,14 +946,14 @@ void ref_array_clear(struct ref_array *array)\n \tarray->nr = 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+static int cmp_ref_sorting(struct ref_sorting *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_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@@ -971,24 +970,24 @@ static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref\n \treturn (s->reverse) ? -cmp : cmp;\n }\n \n-static struct ref_sort *ref_sort;\n+static struct ref_sorting *ref_sorting;\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+\tstruct ref_sorting *s;\n \n-\tfor (s = ref_sort; s; s = s->next) {\n-\t\tint cmp = cmp_ref_sort(s, a, b);\n+\tfor (s = ref_sorting; s; s = s->next) {\n+\t\tint cmp = cmp_ref_sorting(s, a, b);\n \t\tif (cmp)\n \t\t\treturn cmp;\n \t}\n \treturn 0;\n }\n \n-static void sort_refs(struct ref_sort *sort, struct ref_array *array)\n+void ref_array_sort(struct ref_sorting *sort, struct ref_array *array)\n {\n-\tref_sort = sort;\n+\tref_sorting = sort;\n \tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n }\n \n@@ -1056,7 +1055,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@@ -1066,7 +1065,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@@ -1085,21 +1084,22 @@ 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_sorting *ref_default_sorting(void)\n {\n \tstatic const char cstr_name[] = \"refname\";\n \n-\tstruct ref_sort *sort = xcalloc(1, sizeof(*sort));\n+\tstruct ref_sorting *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 parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n {\n-\tstruct ref_sort **sort_tail = opt->value;\n-\tstruct ref_sort *s;\n+\tstruct ref_sorting **sort_tail = opt->value;\n+\tstruct ref_sorting *s;\n \tint len;\n \n \tif (!arg) /* should --no-sort void the list ? */\n@@ -1114,7 +1114,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@@ -1127,7 +1127,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n {\n \tint i;\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n-\tstruct ref_sort *sort = NULL, **sort_tail = &sort;\n+\tstruct ref_sorting *sort = NULL, **sort_tail = &sort;\n \tint maxcount = 0, quote_style = 0;\n \tstruct ref_filter_cbdata ref_cbdata;\n \n@@ -1145,7 +1145,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\"), &parse_opt_ref_sorting),\n \t\tOPT_END(),\n \t};\n \n@@ -1158,25 +1158,25 @@ 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_sorting();\n \n \t/* for warn_ambiguous_refs */\n \tgit_config(git_default_config, NULL);\n \n \tmemset(&ref_cbdata, 0, sizeof(ref_cbdata));\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+\tref_array_sort(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_array_clear(&ref_cbdata.array);\n \treturn 0;\n }\n-- \n2.4.2\n"},{"id":"263613","messageId":"1434039003-10928-8-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 08/12] for-each-ref: rename variables called sort to sorting","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:09:59Z","receivedAt":"2015-06-11T16:09:59Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Rename all the variables called sort to sorting to match the\nfunction/structure name changes made in the previous patch.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 28 ++++++++++++++--------------\n 1 file changed, 14 insertions(+), 14 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 4a6eaba..3cf456a 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -985,9 +985,9 @@ static int compare_refs(const void *a_, const void *b_)\n \treturn 0;\n }\n \n-void ref_array_sort(struct ref_sorting *sort, struct ref_array *array)\n+void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)\n {\n-\tref_sorting = sort;\n+\tref_sorting = sorting;\n \tqsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);\n }\n \n@@ -1089,16 +1089,16 @@ struct ref_sorting *ref_default_sorting(void)\n {\n \tstatic const char cstr_name[] = \"refname\";\n \n-\tstruct ref_sorting *sort = xcalloc(1, sizeof(*sort));\n+\tstruct ref_sorting *sorting = xcalloc(1, sizeof(*sorting));\n \n-\tsort->next = NULL;\n-\tsort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n-\treturn sort;\n+\tsorting->next = NULL;\n+\tsorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n+\treturn sorting;\n }\n \n int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n {\n-\tstruct ref_sorting **sort_tail = opt->value;\n+\tstruct ref_sorting **sorting_tail = opt->value;\n \tstruct ref_sorting *s;\n \tint len;\n \n@@ -1106,8 +1106,8 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n \t\treturn -1;\n \n \ts = xcalloc(1, sizeof(*s));\n-\ts->next = *sort_tail;\n-\t*sort_tail = s;\n+\ts->next = *sorting_tail;\n+\t*sorting_tail = s;\n \n \tif (*arg == '-') {\n \t\ts->reverse = 1;\n@@ -1127,7 +1127,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n {\n \tint i;\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n-\tstruct ref_sorting *sort = NULL, **sort_tail = &sort;\n+\tstruct ref_sorting *sorting = NULL, **sorting_tail = &sorting;\n \tint maxcount = 0, quote_style = 0;\n \tstruct ref_filter_cbdata ref_cbdata;\n \n@@ -1144,7 +1144,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\tOPT_GROUP(\"\"),\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\tOPT_CALLBACK(0 , \"sort\", sorting_tail, N_(\"key\"),\n \t\t\t N_(\"field name to sort on\"), &parse_opt_ref_sorting),\n \t\tOPT_END(),\n \t};\n@@ -1161,8 +1161,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \tif (verify_ref_format(format))\n \t\tusage_with_options(for_each_ref_usage, opts);\n \n-\tif (!sort)\n-\t\tsort = ref_default_sorting();\n+\tif (!sorting)\n+\t\tsorting = ref_default_sorting();\n \n \t/* for warn_ambiguous_refs */\n \tgit_config(git_default_config, NULL);\n@@ -1171,7 +1171,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \tref_cbdata.filter.name_patterns = argv;\n \tfor_each_rawref(ref_filter_handler, &ref_cbdata);\n \n-\tref_array_sort(sort, &ref_cbdata.array);\n+\tref_array_sort(sorting, &ref_cbdata.array);\n \n \tif (!maxcount || ref_cbdata.array.nr < maxcount)\n \t\tmaxcount = ref_cbdata.array.nr;\n-- \n2.4.2\n"},{"id":"263606","messageId":"1434039003-10928-9-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 09/12] ref-filter: add 'ref-filter.h'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:10:00Z","receivedAt":"2015-06-11T16:10:00Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"This is step one of creating a common library for 'for-each-ref',\n'branch -l' and 'tag -l'. This creates a header file with the\nfunctions and data structures that ref-filter will provide.\nWe move the data structures created in for-each-ref to this header\nfile.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n builtin/for-each-ref.c | 41 +------------------------------\n ref-filter.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 67 insertions(+), 40 deletions(-)\n create mode 100644 ref-filter.h\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 3cf456a..2fbbc59 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -10,49 +10,10 @@\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+#include \"ref-filter.h\"\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_sorting {\n-\tstruct ref_sorting *next;\n-\tint atom; /* index into 'struct atom_value *' 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;\ndiff --git a/ref-filter.h b/ref-filter.h\nnew file mode 100644\nindex 0000000..d9e043f\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_sorting {\n+\tstruct ref_sorting *next;\n+\tint atom; /* index into 'struct atom_value *' 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 struct object_id *oid, int flag, void *cb_data);\n+/* Clear all memory allocated to ref_array */\n+void ref_array_clear(struct ref_array *array);\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_sorting provided */\n+void ref_array_sort(struct ref_sorting *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 parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);\n+/* Default sort option based on refname */\n+struct ref_sorting *ref_default_sorting(void);\n+\n+#endif /* REF_FILTER_H */\n-- \n2.4.2\n"},{"id":"263608","messageId":"1434039003-10928-10-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 10/12] ref-filter: move code from 'for-each-ref'","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:10:01Z","receivedAt":"2015-06-11T16:10:01Z","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 publicly 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\nAdd 'ref-filter' to the Makefile, this completes the movement of code\nfrom 'for-each-ref' to 'ref-filter'.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n Makefile | 1 +\n builtin/for-each-ref.c | 1074 -----------------------------------------------\n ref-filter.c | 1078 ++++++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 1079 insertions(+), 1074 deletions(-)\n create mode 100644 ref-filter.c\n\ndiff --git a/Makefile b/Makefile\nindex 54ec511..d715b66 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -762,6 +762,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 2fbbc59..637fc4a 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -2,1083 +2,9 @@\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 #include \"ref-filter.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{ \"push\" },\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\tconst char *branch_name;\n-\t\t\t/* only local branches may have an upstream */\n-\t\t\tif (!skip_prefix(ref->refname, \"refs/heads/\",\n-\t\t\t\t\t &branch_name))\n-\t\t\t\tcontinue;\n-\t\t\tbranch = branch_get(branch_name);\n-\n-\t\t\trefname = branch_get_upstream(branch, NULL);\n-\t\t\tif (!refname)\n-\t\t\t\tcontinue;\n-\t\t} else if (starts_with(name, \"push\")) {\n-\t\t\tconst char *branch_name;\n-\t\t\tif (!skip_prefix(ref->refname, \"refs/heads/\",\n-\t\t\t\t\t &branch_name))\n-\t\t\t\tcontinue;\n-\t\t\tbranch = branch_get(branch_name);\n-\n-\t\t\trefname = branch_get_push(branch, NULL);\n-\t\t\tif (!refname)\n-\t\t\t\tcontinue;\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\t starts_with(name, \"push\"))) {\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, NULL))\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\t starts_with(name, \"push\"))) {\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, NULL))\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- * Return 1 if the refname matches with one of the patterns,\n- * otherwise 0. The patterns can be literal prefix (e.g. a\n- * refname \"refs/heads/master\" matches a pattern \"refs/heads/\")\n- * or a wildcard (e.g. the same ref matches \"refs/heads/m*\",too).\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 struct object_id *oid, 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\t warning(\"ignoring ref with broken name %s\", refname);\n-\t\t return 0;\n-\t}\n-\n-\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, 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 = new_ref_array_item(refname, oid->hash, 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-\treturn 0;\n-}\n-\n-/* Free memory allocated for a ref_array_item */\n-static void free_array_item(struct ref_array_item *item)\n-{\n-\tfree((char *)item->symref);\n-\tfree(item->refname);\n-\tfree(item);\n-}\n-\n-/* Free all memory allocated for ref_array */\n-void ref_array_clear(struct ref_array *array)\n-{\n-\tint i;\n-\n-\tfor (i = 0; i < array->nr; i++)\n-\t\tfree_array_item(array->items[i]);\n-\tfree(array->items);\n-\tarray->items = NULL;\n-\tarray->nr = array->alloc = 0;\n-}\n-\n-static int cmp_ref_sorting(struct ref_sorting *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_sorting *ref_sorting;\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_sorting *s;\n-\n-\tfor (s = ref_sorting; s; s = s->next) {\n-\t\tint cmp = cmp_ref_sorting(s, a, b);\n-\t\tif (cmp)\n-\t\t\treturn cmp;\n-\t}\n-\treturn 0;\n-}\n-\n-void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)\n-{\n-\tref_sorting = sorting;\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_sorting *ref_default_sorting(void)\n-{\n-\tstatic const char cstr_name[] = \"refname\";\n-\n-\tstruct ref_sorting *sorting = xcalloc(1, sizeof(*sorting));\n-\n-\tsorting->next = NULL;\n-\tsorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n-\treturn sorting;\n-}\n-\n-int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n-{\n-\tstruct ref_sorting **sorting_tail = opt->value;\n-\tstruct ref_sorting *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 = *sorting_tail;\n-\t*sorting_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-\n static char const * const for_each_ref_usage[] = {\n \tN_(\"git for-each-ref [] []\"),\n \tNULL\ndiff --git a/ref-filter.c b/ref-filter.c\nnew file mode 100644\nindex 0000000..74fe295\n--- /dev/null\n+++ b/ref-filter.c\n@@ -0,0 +1,1078 @@\n+#include \"builtin.h\"\n+#include \"cache.h\"\n+#include \"parse-options.h\"\n+#include \"refs.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+#include \"ref-filter.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{ \"push\" },\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\tconst char *branch_name;\n+\t\t\t/* only local branches may have an upstream */\n+\t\t\tif (!skip_prefix(ref->refname, \"refs/heads/\",\n+\t\t\t\t\t &branch_name))\n+\t\t\t\tcontinue;\n+\t\t\tbranch = branch_get(branch_name);\n+\n+\t\t\trefname = branch_get_upstream(branch, NULL);\n+\t\t\tif (!refname)\n+\t\t\t\tcontinue;\n+\t\t} else if (starts_with(name, \"push\")) {\n+\t\t\tconst char *branch_name;\n+\t\t\tif (!skip_prefix(ref->refname, \"refs/heads/\",\n+\t\t\t\t\t &branch_name))\n+\t\t\t\tcontinue;\n+\t\t\tbranch = branch_get(branch_name);\n+\n+\t\t\trefname = branch_get_push(branch, NULL);\n+\t\t\tif (!refname)\n+\t\t\t\tcontinue;\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\t starts_with(name, \"push\"))) {\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, NULL))\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\t starts_with(name, \"push\"))) {\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, NULL))\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+ * Return 1 if the refname matches with one of the patterns,\n+ * otherwise 0. The patterns can be literal prefix (e.g. a\n+ * refname \"refs/heads/master\" matches a pattern \"refs/heads/\")\n+ * or a wildcard (e.g. the same ref matches \"refs/heads/m*\",too).\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 struct object_id *oid, 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\t warning(\"ignoring ref with broken name %s\", refname);\n+\t\t return 0;\n+\t}\n+\n+\tif (*filter->name_patterns && !match_name_as_path(filter->name_patterns, 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 = new_ref_array_item(refname, oid->hash, 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+\treturn 0;\n+}\n+\n+/* Free memory allocated for a ref_array_item */\n+static void free_array_item(struct ref_array_item *item)\n+{\n+\tfree((char *)item->symref);\n+\tfree(item->refname);\n+\tfree(item);\n+}\n+\n+/* Free all memory allocated for ref_array */\n+void ref_array_clear(struct ref_array *array)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < array->nr; i++)\n+\t\tfree_array_item(array->items[i]);\n+\tfree(array->items);\n+\tarray->items = NULL;\n+\tarray->nr = array->alloc = 0;\n+}\n+\n+static int cmp_ref_sorting(struct ref_sorting *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_sorting *ref_sorting;\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_sorting *s;\n+\n+\tfor (s = ref_sorting; s; s = s->next) {\n+\t\tint cmp = cmp_ref_sorting(s, a, b);\n+\t\tif (cmp)\n+\t\t\treturn cmp;\n+\t}\n+\treturn 0;\n+}\n+\n+void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)\n+{\n+\tref_sorting = sorting;\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_sorting *ref_default_sorting(void)\n+{\n+\tstatic const char cstr_name[] = \"refname\";\n+\n+\tstruct ref_sorting *sorting = xcalloc(1, sizeof(*sorting));\n+\n+\tsorting->next = NULL;\n+\tsorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name));\n+\treturn sorting;\n+}\n+\n+int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)\n+{\n+\tstruct ref_sorting **sorting_tail = opt->value;\n+\tstruct ref_sorting *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 = *sorting_tail;\n+\t*sorting_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-- \n2.4.2\n"},{"id":"263610","messageId":"1434039003-10928-11-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 11/12] for-each-ref: introduce filter_refs()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:10:02Z","receivedAt":"2015-06-11T16:10:02Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce filter_refs() which will act as an API for filtering\na set of refs. Based on the type of refs the user has requested,\nwe iterate through those refs and apply filters as per the\ngiven ref_filter structure and finally store the filtered refs\nin the ref_array structure.\n\nCurrently this will wrap around ref_filter_handler(). Hence,\nref_filter_handler is made file scope static.\n\nAs users of this API will no longer send a ref_filter_cbdata\nstructure directly, we make the elements of ref_filter_cbdata\npointers. We can now use the information given by the users\nto obtain our own ref_filter_cbdata structure. Changes are made to\nsupport the change in ref_filter_cbdata structure.\n\nMake 'for-each-ref' use this API.\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 | 21 +++++++++++----------\n ref-filter.c | 30 ++++++++++++++++++++++++++----\n ref-filter.h | 16 ++++++++++++----\n 3 files changed, 49 insertions(+), 18 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 637fc4a..e2f15e6 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -16,7 +16,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n \tstruct ref_sorting *sorting = NULL, **sorting_tail = &sorting;\n \tint maxcount = 0, quote_style = 0;\n-\tstruct ref_filter_cbdata ref_cbdata;\n+\tstruct ref_array array;\n+\tstruct ref_filter filter;\n \n \tstruct option opts[] = {\n \t\tOPT_BIT('s', \"shell\", "e_style,\n@@ -54,16 +55,16 @@ 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(&ref_cbdata, 0, sizeof(ref_cbdata));\n-\tref_cbdata.filter.name_patterns = argv;\n-\tfor_each_rawref(ref_filter_handler, &ref_cbdata);\n+\tmemset(&array, 0, sizeof(array));\n+\tmemset(&filter, 0, sizeof(filter));\n+\tfilter.name_patterns = argv;\n+\tfilter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN, &filter);\n+\tref_array_sort(sorting, &array);\n \n-\tref_array_sort(sorting, &ref_cbdata.array);\n-\n-\tif (!maxcount || ref_cbdata.array.nr < maxcount)\n-\t\tmaxcount = ref_cbdata.array.nr;\n+\tif (!maxcount || array.nr < maxcount)\n+\t\tmaxcount = array.nr;\n \tfor (i = 0; i < maxcount; i++)\n-\t\tshow_ref_array_item(ref_cbdata.array.items[i], format, quote_style);\n-\tref_array_clear(&ref_cbdata.array);\n+\t\tshow_ref_array_item(array.items[i], format, quote_style);\n+\tref_array_clear(&array);\n \treturn 0;\n }\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 74fe295..6f7defc 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -859,10 +859,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\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 struct object_id *oid, int flag, void *cb_data)\n+static int ref_filter_handler(const char *refname, const struct object_id *oid, 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_filter *filter = ref_cbdata->filter;\n \tstruct ref_array_item *ref;\n \n \tif (flag & REF_BAD_NAME) {\n@@ -880,8 +880,8 @@ int ref_filter_handler(const char *refname, const struct object_id *oid, int fla\n \t */\n \tref = new_ref_array_item(refname, oid->hash, 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+\tREALLOC_ARRAY(ref_cbdata->array->items, ref_cbdata->array->nr + 1);\n+\tref_cbdata->array->items[ref_cbdata->array->nr++] = ref;\n \treturn 0;\n }\n \n@@ -905,6 +905,28 @@ void ref_array_clear(struct ref_array *array)\n \tarray->nr = array->alloc = 0;\n }\n \n+/*\n+ * API for filtering a set of refs. Based on the type of refs the user\n+ * has requested, we iterate through those refs and apply filters\n+ * as per the given ref_filter structure and finally store the\n+ * filtered refs in the ref_array structure.\n+ */\n+int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter)\n+{\n+\tstruct ref_filter_cbdata ref_cbdata;\n+\n+\tref_cbdata.array = array;\n+\tref_cbdata.filter = filter;\n+\n+\tif (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN))\n+\t\treturn for_each_rawref(ref_filter_handler, &ref_cbdata);\n+\telse if (type & FILTER_REFS_ALL)\n+\t\treturn for_each_ref(ref_filter_handler, &ref_cbdata);\n+\telse\n+\t\tdie(\"filter_refs: invalid type\");\n+\treturn 0;\n+}\n+\n static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\ndiff --git a/ref-filter.h b/ref-filter.h\nindex d9e043f..f917ebc 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -13,6 +13,9 @@\n #define QUOTE_PYTHON 4\n #define QUOTE_TCL 8\n \n+#define FILTER_REFS_INCLUDE_BROKEN 0x1\n+#define FILTER_REFS_ALL 0x2\n+\n struct atom_value {\n \tconst char *s;\n \tunsigned long ul; /* used for sorting when not FIELD_STR */\n@@ -42,12 +45,17 @@ struct ref_filter {\n };\n \n struct ref_filter_cbdata {\n-\tstruct ref_array array;\n-\tstruct ref_filter filter;\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 struct object_id *oid, int flag, void *cb_data);\n+/*\n+ * API for filtering a set of refs. Based on the type of refs the user\n+ * has requested, we iterate through those refs and apply filters\n+ * as per the given ref_filter structure and finally store the\n+ * filtered refs in the ref_array structure.\n+ */\n+int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter);\n /* Clear all memory allocated to ref_array */\n void ref_array_clear(struct ref_array *array);\n /* Parse format string and sort specifiers */\n-- \n2.4.2\n"},{"id":"263609","messageId":"1434039003-10928-12-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 12/12] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T16:10:03Z","receivedAt":"2015-06-11T16:10:03Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"This would remove the need of using a pointer to store refname.\n\nMentored-by: Christian Couder \nMentored-by: Matthieu Moy \nSigned-off-by: Karthik Nayak \n---\n ref-filter.c | 7 ++++---\n ref-filter.h | 2 +-\n 2 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 6f7defc..310ecd6 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -847,8 +847,10 @@ 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+\tsize_t len = strlen(refname);\n+\tstruct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item) + len + 1);\n+\tmemcpy(ref->refname, refname, len);\n+\tref->refname[len] = '\\0';\n \thashcpy(ref->objectname, objectname);\n \tref->flag = flag;\n \n@@ -889,7 +891,6 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,\n static void free_array_item(struct ref_array_item *item)\n {\n \tfree((char *)item->symref);\n-\tfree(item->refname);\n \tfree(item);\n }\n \ndiff --git a/ref-filter.h b/ref-filter.h\nindex f917ebc..6ab2a75 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -32,7 +32,7 @@ struct ref_array_item {\n \tint flag;\n \tconst char *symref;\n \tstruct atom_value *value;\n-\tchar *refname;\n+\tchar refname[FLEX_ARRAY];\n };\n \n struct ref_array {\n-- \n2.4.2\n"},{"id":"263615","messageId":"vpq1thixjs3.fsf@anie.imag.fr","threadId":"39600","inReplyTo":"1434039003-10928-11-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH v7 11/12] for-each-ref: introduce filter_refs()","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-11T17:00:12Z","receivedAt":"2015-06-11T17:00:12Z","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> +\tfilter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN, &filter);\n\nI think it is more common to have options at the end, so I'd write it as\n\nfilter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);\n\n(changing the declaration too, obviously)\n\nI really like the way cmd_for_each_ref looks like now.\n\n> @@ -905,6 +905,28 @@ void ref_array_clear(struct ref_array *array)\n> \tarray->nr = array->alloc = 0;\n> }\n> \n> +/*\n> + * API for filtering a set of refs. Based on the type of refs the user\n> + * has requested, we iterate through those refs and apply filters\n> + * as per the given ref_filter structure and finally store the\n> + * filtered refs in the ref_array structure.\n> + */\n> +int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter)\n> +{\n> +\tstruct ref_filter_cbdata ref_cbdata;\n> +\n> +\tref_cbdata.array = array;\n> +\tref_cbdata.filter = filter;\n> +\n> +\tif (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN))\n> +\t\treturn for_each_rawref(ref_filter_handler, &ref_cbdata);\n> +\telse if (type & FILTER_REFS_ALL)\n> +\t\treturn for_each_ref(ref_filter_handler, &ref_cbdata);\n> +\telse\n> +\t\tdie(\"filter_refs: invalid type\");\n> +\treturn 0;\n> +}\n\nI thought you would make a helper function that would return a pointer\nto either for_each_rawref or for_each_ref (or another later), but that\nwould probably be overkill.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263616","messageId":"vpqtwuew52l.fsf@anie.imag.fr","threadId":"39600","inReplyTo":"5579B253.4020804@gmail.com","subject":"Re: [PATCH v7 0/12] Create ref-filter from for-each-ref","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-11T17:03:14Z","receivedAt":"2015-06-11T17:03:14Z","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> The previous version of this patch can be found here:\n> http://thread.gmane.org/gmane.comp.version-control.git/270922\n>\n> Changes found in this version:\n> * Various changes to the 'filter_refs()' function.\n> * Split 'for-each-ref: clean up code' into two commits.\n> * Other small changes.\n\nMy previous comments are all taken into account. The whole series looks\ngood to me now.\n\nThanks,\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263617","messageId":"5579C28E.10208@gmail.com","threadId":"39600","inReplyTo":"vpq1thixjs3.fsf@anie.imag.fr","subject":"Re: [PATCH v7 11/12] for-each-ref: introduce filter_refs()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T17:17:02Z","receivedAt":"2015-06-11T17:17:02Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/11/2015 10:30 PM, Matthieu Moy wrote:\n>\n> I think it is more common to have options at the end, so I'd write it as\n>\n> filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);\n>\n> (changing the declaration too, obviously)\n>\n> I really like the way cmd_for_each_ref looks like now.\n>\n\nOk! will reply to this mail with a small changed patch!\n\n>\n> I thought you would make a helper function that would return a pointer\n> to either for_each_rawref or for_each_ref (or another later), but that\n> would probably be overkill.\n>\n\nYea that does seem like an overkill!\n\n-- \nRegards,\nKarthik\n"},{"id":"263618","messageId":"1434043289-21536-1-git-send-email-karthik.188@gmail.com","threadId":"39600","inReplyTo":"1434039003-10928-11-git-send-email-karthik.188@gmail.com","subject":"[PATCH v7 11/12] for-each-ref: introduce filter_refs()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T17:21:29Z","receivedAt":"2015-06-11T17:21:29Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Introduce filter_refs() which will act as an API for filtering\na set of refs. Based on the type of refs the user has requested,\nwe iterate through those refs and apply filters as per the\ngiven ref_filter structure and finally store the filtered refs\nin the ref_array structure.\n\nCurrently this will wrap around ref_filter_handler(). Hence,\nref_filter_handler is made file scope static.\n\nAs users of this API will no longer send a ref_filter_cbdata\nstructure directly, we make the elements of ref_filter_cbdata\npointers. We can now use the information given by the users\nto obtain our own ref_filter_cbdata structure. Changes are made to\nsupport the change in ref_filter_cbdata structure.\n\nMake 'for-each-ref' use this API.\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 | 21 +++++++++++----------\n ref-filter.c | 30 ++++++++++++++++++++++++++----\n ref-filter.h | 16 ++++++++++++----\n 3 files changed, 49 insertions(+), 18 deletions(-)\n\ndiff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\nindex 637fc4a..7919206 100644\n--- a/builtin/for-each-ref.c\n+++ b/builtin/for-each-ref.c\n@@ -16,7 +16,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \tconst char *format = \"%(objectname) %(objecttype)\\t%(refname)\";\n \tstruct ref_sorting *sorting = NULL, **sorting_tail = &sorting;\n \tint maxcount = 0, quote_style = 0;\n-\tstruct ref_filter_cbdata ref_cbdata;\n+\tstruct ref_array array;\n+\tstruct ref_filter filter;\n \n \tstruct option opts[] = {\n \t\tOPT_BIT('s', \"shell\", "e_style,\n@@ -54,16 +55,16 @@ 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(&ref_cbdata, 0, sizeof(ref_cbdata));\n-\tref_cbdata.filter.name_patterns = argv;\n-\tfor_each_rawref(ref_filter_handler, &ref_cbdata);\n+\tmemset(&array, 0, sizeof(array));\n+\tmemset(&filter, 0, sizeof(filter));\n+\tfilter.name_patterns = argv;\n+\tfilter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);\n+\tref_array_sort(sorting, &array);\n \n-\tref_array_sort(sorting, &ref_cbdata.array);\n-\n-\tif (!maxcount || ref_cbdata.array.nr < maxcount)\n-\t\tmaxcount = ref_cbdata.array.nr;\n+\tif (!maxcount || array.nr < maxcount)\n+\t\tmaxcount = array.nr;\n \tfor (i = 0; i < maxcount; i++)\n-\t\tshow_ref_array_item(ref_cbdata.array.items[i], format, quote_style);\n-\tref_array_clear(&ref_cbdata.array);\n+\t\tshow_ref_array_item(array.items[i], format, quote_style);\n+\tref_array_clear(&array);\n \treturn 0;\n }\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 74fe295..9371091 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -859,10 +859,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname,\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 struct object_id *oid, int flag, void *cb_data)\n+static int ref_filter_handler(const char *refname, const struct object_id *oid, 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_filter *filter = ref_cbdata->filter;\n \tstruct ref_array_item *ref;\n \n \tif (flag & REF_BAD_NAME) {\n@@ -880,8 +880,8 @@ int ref_filter_handler(const char *refname, const struct object_id *oid, int fla\n \t */\n \tref = new_ref_array_item(refname, oid->hash, 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+\tREALLOC_ARRAY(ref_cbdata->array->items, ref_cbdata->array->nr + 1);\n+\tref_cbdata->array->items[ref_cbdata->array->nr++] = ref;\n \treturn 0;\n }\n \n@@ -905,6 +905,28 @@ void ref_array_clear(struct ref_array *array)\n \tarray->nr = array->alloc = 0;\n }\n \n+/*\n+ * API for filtering a set of refs. Based on the type of refs the user\n+ * has requested, we iterate through those refs and apply filters\n+ * as per the given ref_filter structure and finally store the\n+ * filtered refs in the ref_array structure.\n+ */\n+int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type)\n+{\n+\tstruct ref_filter_cbdata ref_cbdata;\n+\n+\tref_cbdata.array = array;\n+\tref_cbdata.filter = filter;\n+\n+\tif (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN))\n+\t\treturn for_each_rawref(ref_filter_handler, &ref_cbdata);\n+\telse if (type & FILTER_REFS_ALL)\n+\t\treturn for_each_ref(ref_filter_handler, &ref_cbdata);\n+\telse\n+\t\tdie(\"filter_refs: invalid type\");\n+\treturn 0;\n+}\n+\n static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)\n {\n \tstruct atom_value *va, *vb;\ndiff --git a/ref-filter.h b/ref-filter.h\nindex d9e043f..3999340 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -13,6 +13,9 @@\n #define QUOTE_PYTHON 4\n #define QUOTE_TCL 8\n \n+#define FILTER_REFS_INCLUDE_BROKEN 0x1\n+#define FILTER_REFS_ALL 0x2\n+\n struct atom_value {\n \tconst char *s;\n \tunsigned long ul; /* used for sorting when not FIELD_STR */\n@@ -42,12 +45,17 @@ struct ref_filter {\n };\n \n struct ref_filter_cbdata {\n-\tstruct ref_array array;\n-\tstruct ref_filter filter;\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 struct object_id *oid, int flag, void *cb_data);\n+/*\n+ * API for filtering a set of refs. Based on the type of refs the user\n+ * has requested, we iterate through those refs and apply filters\n+ * as per the given ref_filter structure and finally store the\n+ * filtered refs in the ref_array structure.\n+ */\n+int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type);\n /* Clear all memory allocated to ref_array */\n void ref_array_clear(struct ref_array *array);\n /* Parse format string and sort specifiers */\n-- \n2.4.2\n"},{"id":"263620","messageId":"vpqwpzarvl6.fsf@anie.imag.fr","threadId":"39600","inReplyTo":"1434039003-10928-5-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-11T17:41:41Z","receivedAt":"2015-06-11T17:41:41Z","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> +struct ref_filter_cbdata {\n> +\tstruct ref_array array;\n> +\tstruct ref_filter filter;\n> +};\n\nI didn't notice this at first, but why introduce the structure like this\nwhen you are going to turn it into pointers later in PATCH 7:\n\nKarthik Nayak writes:\n\n> --- a/ref-filter.h\n> +++ b/ref-filter.h\n> @@ -42,12 +45,17 @@ struct ref_filter {\n> };\n> \n> struct ref_filter_cbdata {\n> -\tstruct ref_array array;\n> -\tstruct ref_filter filter;\n> +\tstruct ref_array *array;\n> +\tstruct ref_filter *filter;\n> };\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263623","messageId":"5579CBE0.3050301@gmail.com","threadId":"39600","inReplyTo":"vpqwpzarvl6.fsf@anie.imag.fr","subject":"Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T17:56:48Z","receivedAt":"2015-06-11T17:56:48Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/11/2015 11:11 PM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n> > +struct ref_filter_cbdata {\n> > + struct ref_array array;\n> > + struct ref_filter filter;\n> > +};\n>\n> I didn't notice this at first, but why introduce the structure like this\n> when you are going to turn it into pointers later in PATCH 7:\nHere it is serving to for-each-ref, so I kept it this way so as to ensure\nthat currently as per this patch\n\nstruct ref_filter_cbdata ref_cbdata;\n\nwould be the only declaration needed in for-each-ref.c\nIf I made them pointers here I would need to have\n\nstruct ref_filter_cbdata ref_cbdata;\nstruct ref_filter filter;\nstruct ref_array array;\nref_cbdata.filter = &filter;\nref_cbdata.array = &array;\n\nAnd this seemed like an overhead.\nIf you still think I need to change the code to reflect the change early on\nI will gladly do a re-roll.\n\n\n\n-- \nRegards,\nKarthik\n"},{"id":"263629","messageId":"vpq4mmeqcrr.fsf@anie.imag.fr","threadId":"39600","inReplyTo":"5579CBE0.3050301@gmail.com","subject":"Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-11T19:13:28Z","receivedAt":"2015-06-11T19:13:28Z","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 06/11/2015 11:11 PM, Matthieu Moy wrote:\n>> Karthik Nayak writes:\n>>\n>> > +struct ref_filter_cbdata {\n>> > + struct ref_array array;\n>> > + struct ref_filter filter;\n>> > +};\n>>\n>> I didn't notice this at first, but why introduce the structure like this\n>> when you are going to turn it into pointers later in PATCH 7:\n> Here it is serving to for-each-ref, so I kept it this way so as to ensure\n> that currently as per this patch\n>\n> struct ref_filter_cbdata ref_cbdata;\n>\n> would be the only declaration needed in for-each-ref.c\n> If I made them pointers here I would need to have\n>\n> struct ref_filter_cbdata ref_cbdata;\n> struct ref_filter filter;\n> struct ref_array array;\n> ref_cbdata.filter = &filter;\n> ref_cbdata.array = &array;\n\n... but after PATCH 7, filter and array are passed to ref_filter so you\ndon't have this overhead anyway. Makes sense.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263631","messageId":"5579DFC0.6030002@gmail.com","threadId":"39600","inReplyTo":"vpq4mmeqcrr.fsf@anie.imag.fr","subject":"Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-11T19:21:36Z","receivedAt":"2015-06-11T19:21:36Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/12/2015 12:43 AM, Matthieu Moy wrote:\n> Karthik Nayak writes:\n>\n> > On 06/11/2015 11:11 PM, Matthieu Moy wrote:\n> >> Karthik Nayak writes:\n> >>\n> >>> +struct ref_filter_cbdata {\n> >>> + struct ref_array array;\n> >>> + struct ref_filter filter;\n> >>> +};\n> >>\n> >> I didn't notice this at first, but why introduce the structure like this\n> >> when you are going to turn it into pointers later in PATCH 7:\n> > Here it is serving to for-each-ref, so I kept it this way so as to ensure\n> > that currently as per this patch\n> >\n> > struct ref_filter_cbdata ref_cbdata;\n> >\n> > would be the only declaration needed in for-each-ref.c\n> > If I made them pointers here I would need to have\n> >\n> > struct ref_filter_cbdata ref_cbdata;\n> > struct ref_filter filter;\n> > struct ref_array array;\n> > ref_cbdata.filter = &filter;\n> > ref_cbdata.array = &array;\n>\n> ... but after PATCH 7, filter and array are passed to ref_filter so you\n> don't have this overhead anyway. Makes sense.\n>\nYes, there we wouldn't have a ref_cbdata in 'for-each-ref'.\nBut this would be taken care of in 'filter_refs()'.\n\"Makes sense.\" Not sure if you're agreeing with me or you want me to re-roll.\n\n-- \nRegards,\nKarthik\n"},{"id":"263635","messageId":"vpqbngmni25.fsf@anie.imag.fr","threadId":"39600","inReplyTo":"5579DFC0.6030002@gmail.com","subject":"Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2015-06-11T19:47:30Z","receivedAt":"2015-06-11T19:47:30Z","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>> ... but after PATCH 7, filter and array are passed to ref_filter so you\n>> don't have this overhead anyway. Makes sense.\n>>\n> Yes, there we wouldn't have a ref_cbdata in 'for-each-ref'.\n> But this would be taken care of in 'filter_refs()'.\n> \"Makes sense.\" Not sure if you're agreeing with me or you want me to\n> re-roll.\n\nI'm agreeing with you.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"263676","messageId":"xmqq616sesw7.fsf@gitster.dls.corp.google.com","threadId":"39600","inReplyTo":"1434039003-10928-1-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH v7 01/12] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-12T17:30:32Z","receivedAt":"2015-06-12T17:30:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak writes:\n\n> Extract two helper functions out of grab_single_ref(). Firstly,\n> new_refinfo() which is used to allocate memory for a new refinfo\n> structure and copy the objectname, refname and flag to it.\n> Secondly, match_name_as_path() which when given an array of patterns\n> and the refname checks if the refname matches any of the patterns\n> given while the pattern is a pathname, also supports wildcard\n> characters.\n>\n> This is a preperatory patch for restructuring 'for-each-ref' and\n> eventually moving most of it to 'ref-filter' to provide the\n> functionality to similar commands via public API's.\n>\n> Helped-by: Junio C Hamano \n> Mentored-by: Christian Couder \n> Mentored-by: Matthieu Moy \n> Signed-off-by: Karthik Nayak \n> ---\n> builtin/for-each-ref.c | 64 ++++++++++++++++++++++++++++++++------------------\n> 1 file changed, 41 insertions(+), 23 deletions(-)\n>\n> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\n> index f7e51a7..67c8b62 100644\n> --- a/builtin/for-each-ref.c\n> +++ b/builtin/for-each-ref.c\n> @@ -851,6 +851,44 @@ struct grab_ref_cbdata {\n> };\n> \n> /*\n> + * Return 1 if the refname matches with one of the patterns,\n\ns/with //;\n\n> + * otherwise 0. The patterns can be literal prefix (e.g. a\n> + * refname \"refs/heads/master\" matches a pattern \"refs/heads/\")\n> + * or a wildcard (e.g. the same ref matches \"refs/heads/m*\",too).\n> + */\n\nI know this was my bad suggestion, but \"refs/heads/m\" can be thought\nof as a \"literal prefix\" that may match \"refs/heads/master\"; we do\nnot want to make that match, so perhaps \"literal\" is a bad way to\nsay this. \"A pattern can be a path prefix or a worldcard\"?\n"},{"id":"263678","messageId":"557B17CB.70001@gmail.com","threadId":"39600","inReplyTo":"xmqq616sesw7.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v7 01/12] for-each-ref: extract helper functions out of grab_single_ref()","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-12T17:32:59Z","receivedAt":"2015-06-12T17:32:59Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/12/2015 11:00 PM, Junio C Hamano wrote:\n> Karthik Nayak writes:\n>\n>> Extract two helper functions out of grab_single_ref(). Firstly,\n>> new_refinfo() which is used to allocate memory for a new refinfo\n>> structure and copy the objectname, refname and flag to it.\n>> Secondly, match_name_as_path() which when given an array of patterns\n>> and the refname checks if the refname matches any of the patterns\n>> given while the pattern is a pathname, also supports wildcard\n>> characters.\n>>\n>> This is a preperatory patch for restructuring 'for-each-ref' and\n>> eventually moving most of it to 'ref-filter' to provide the\n>> functionality to similar commands via public API's.\n>>\n>> Helped-by: Junio C Hamano \n>> Mentored-by: Christian Couder \n>> Mentored-by: Matthieu Moy \n>> Signed-off-by: Karthik Nayak \n>> ---\n>> builtin/for-each-ref.c | 64 ++++++++++++++++++++++++++++++++------------------\n>> 1 file changed, 41 insertions(+), 23 deletions(-)\n>>\n>> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\n>> index f7e51a7..67c8b62 100644\n>> --- a/builtin/for-each-ref.c\n>> +++ b/builtin/for-each-ref.c\n>> @@ -851,6 +851,44 @@ struct grab_ref_cbdata {\n>> };\n>>\n>> /*\n>> + * Return 1 if the refname matches with one of the patterns,\n>\n> s/with //;\n\nThanks! will change :)\n\n>\n>> + * otherwise 0. The patterns can be literal prefix (e.g. a\n>> + * refname \"refs/heads/master\" matches a pattern \"refs/heads/\")\n>> + * or a wildcard (e.g. the same ref matches \"refs/heads/m*\",too).\n>> + */\n>\n> I know this was my bad suggestion, but \"refs/heads/m\" can be thought\n> of as a \"literal prefix\" that may match \"refs/heads/master\"; we do\n> not want to make that match, so perhaps \"literal\" is a bad way to\n> say this. \"A pattern can be a path prefix or a worldcard\"?\n>\n\nYes! that sounds right, after all its doing a path match.\n\n-- \nRegards,\nKarthik\n"},{"id":"263679","messageId":"xmqqy4joddul.fsf@gitster.dls.corp.google.com","threadId":"39600","inReplyTo":"1434039003-10928-3-git-send-email-karthik.188@gmail.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-12T17:40:50Z","receivedAt":"2015-06-12T17:40:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak writes:\n\n> The comment in 'ref_sort' hasn't been changed 9f613dd.\n\nBad grammar? \"hasn't been changed since 9f613dd\", perhaps?\n\nBut more importantly, don't just give an abbreviated object name. I\nthink \"the comment hasn't changed since the for-each-ref command was\noriginally introduced\" is what you meant to say, and it is OK to\nappend \"since 9f613ddd (Add git-for-each-ref: helper for language\nbindings, 2006-09-15)\" to that sentence as a supporting material.\n\n> Change the comment to reflect changes made in the code since\n> 9f613dd.\n\nWhat change since 9f613dd do you have in mind, exactly, though?\n\nI do not think the fact that this field indexes into used_atom[]\narray has ever changed during the life of this implementation.\nI see \"static const char **used_atom;\" in builtin/for-each-ref.c\nstill in the 'master', and that is the array that holds the atoms\nthat are used by the end-user request.\n\nSo I do not think \"The comment was there from the beginning, it\ndescribed the initial implementation, the implementation was updated\nand the comment has become stale\" is a good justification for this\nchange, as I do not think that is what has happened here.\n\nYou may be changing used_atom to something else later in your\nseries, but then isn't that commit the appropriate place to update\nthis comment?\n\n> Mentored-by: Christian Couder \n> Mentored-by: Matthieu Moy \n> Signed-off-by: Karthik Nayak \n> ---\n> builtin/for-each-ref.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c\n> index 0dd2df2..bfad03f 100644\n> --- a/builtin/for-each-ref.c\n> +++ b/builtin/for-each-ref.c\n> @@ -27,7 +27,7 @@ struct atom_value {\n> \n> struct ref_sort {\n> \tstruct ref_sort *next;\n> -\tint atom; /* index into used_atom array */\n> +\tint atom; /* index into 'struct atom_value *' array */\n> \tunsigned reverse : 1;\n> };\n"},{"id":"263680","messageId":"557B1B60.9020002@gmail.com","threadId":"39600","inReplyTo":"xmqqy4joddul.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-12T17:48:16Z","receivedAt":"2015-06-12T17:48:16Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/12/2015 11:10 PM, Junio C Hamano wrote:\n> Karthik Nayak writes:\n>\n>> The comment in 'ref_sort' hasn't been changed 9f613dd.\n>\n> Bad grammar? \"hasn't been changed since 9f613dd\", perhaps?\n\nYes! thanks :)\n\n>\n> But more importantly, don't just give an abbreviated object name. I\n> think \"the comment hasn't changed since the for-each-ref command was\n> originally introduced\" is what you meant to say, and it is OK to\n> append \"since 9f613ddd (Add git-for-each-ref: helper for language\n> bindings, 2006-09-15)\" to that sentence as a supporting material.\n>\n\nOk will do.\n\n>> Change the comment to reflect changes made in the code since\n>> 9f613dd.\n>\n> What change since 9f613dd do you have in mind, exactly, though?\n\nWell initially the atoms were indexed into used_atom array, which\nlater was removed. Hence the comment becomes obsolete.\n\n>\n> I do not think the fact that this field indexes into used_atom[]\n> array has ever changed during the life of this implementation.\n> I see \"static const char **used_atom;\" in builtin/for-each-ref.c\n> still in the 'master', and that is the array that holds the atoms\n> that are used by the end-user request.\n>\n> So I do not think \"The comment was there from the beginning, it\n> described the initial implementation, the implementation was updated\n> and the comment has become stale\" is a good justification for this\n> change, as I do not think that is what has happened here.\n>\n> You may be changing used_atom to something else later in your\n> series, but then isn't that commit the appropriate place to update\n> this comment?\n>\n\nBut isn't that what happened here, the code was altered but the comment\nwas left the way it is.\n\nWhat do you suggest I do?\n\n-- \nRegards,\nKarthik\n"},{"id":"263683","messageId":"xmqqpp50dcqy.fsf@gitster.dls.corp.google.com","threadId":"39600","inReplyTo":"557B1B60.9020002@gmail.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-12T18:04:37Z","receivedAt":"2015-06-12T18:04:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak writes:\n\n>> What change since 9f613dd do you have in mind, exactly, though?\n>\n> Well initially the atoms were indexed into used_atom array, which\n> later was removed. Hence the comment becomes obsolete.\n\nLater in which commit? In builtin/for-each-ref.c in the version\nafter applying patches 1-3 of this series on top of master, I still\nsee used_atom[] array there, so...?\n"},{"id":"263687","messageId":"557B2516.7020609@gmail.com","threadId":"39600","inReplyTo":"xmqqpp50dcqy.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-12T18:29:42Z","receivedAt":"2015-06-12T18:29:42Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On 06/12/2015 11:34 PM, Junio C Hamano wrote:\n> Karthik Nayak writes:\n>\n>>> What change since 9f613dd do you have in mind, exactly, though?\n>>\n>> Well initially the atoms were indexed into used_atom array, which\n>> later was removed. Hence the comment becomes obsolete.\n>\n> Later in which commit? In builtin/for-each-ref.c in the version\n> after applying patches 1-3 of this series on top of master, I still\n> see used_atom[] array there, so...?\n>\n\nUh! My bad.\nIgnore this! I think I got confused, On having a look now that patch is\nnot needed. Sorry.\n\n-- \nRegards,\nKarthik\n"},{"id":"263691","messageId":"xmqqlhfod8e7.fsf@gitster.dls.corp.google.com","threadId":"39600","inReplyTo":"vpq1thixjs3.fsf@anie.imag.fr","subject":"Re: [PATCH v7 11/12] for-each-ref: introduce filter_refs()","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-12T19:38:40Z","receivedAt":"2015-06-12T19:38:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> Karthik Nayak writes:\n>\n>> +\tfilter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN, &filter);\n>\n> I think it is more common to have options at the end, so I'd write it as\n>\n> filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);\n>\n> (changing the declaration too, obviously)\n\nGood point.\n\n>\n> I really like the way cmd_for_each_ref looks like now.\n\nLikewise.\n"},{"id":"263692","messageId":"CAP8UFD3nsxX0XEVwxdMBRR8OQDu=ary6Bm2AD7wprAU0BC8tXA@mail.gmail.com","threadId":"39600","inReplyTo":"557B2516.7020609@gmail.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2015-06-12T19:49:26Z","receivedAt":"2015-06-12T19:49:26Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Fri, Jun 12, 2015 at 8:29 PM, Karthik Nayak wrote:\n> On 06/12/2015 11:34 PM, Junio C Hamano wrote:\n>>\n>> Karthik Nayak writes:\n>>\n>>>> What change since 9f613dd do you have in mind, exactly, though?\n>>>\n>>>\n>>> Well initially the atoms were indexed into used_atom array, which\n>>> later was removed. Hence the comment becomes obsolete.\n>>\n>>\n>> Later in which commit? In builtin/for-each-ref.c in the version\n>> after applying patches 1-3 of this series on top of master, I still\n>> see used_atom[] array there, so...?\n>>\n>\n> Uh! My bad.\n> Ignore this! I think I got confused, On having a look now that patch is\n> not needed. Sorry.\n\nI think it is needed later when \"struct ref_sort\" is moved into\nref-filter.h, because then the used_atom[] array is not moved.\n\nSo either:\n\n1) you update the comment when you move \"struct ref_sort\" into\nref-filter.h, but then the downside is that there is not only code\nmovement in the patch that moves \"struct ref_sort\" into ref-filter.h,\nor\n\n2) you explain that, as \"struct ref_sort\" will be moved later while\nthe used_atom[] array will not be moved, the direct connection between\nthe comment and used_atom[] will be broken, and you need to prepare\nfor that because you want to avoid solution 1) as you want only code\nmovement when moving \"struct ref_sort\" into ref-filter.h.\n\nHope this helps,\nChristian.\n"},{"id":"263694","messageId":"xmqqh9qcd653.fsf@gitster.dls.corp.google.com","threadId":"39600","inReplyTo":"CAP8UFD3nsxX0XEVwxdMBRR8OQDu=ary6Bm2AD7wprAU0BC8tXA@mail.gmail.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-06-12T20:27:20Z","receivedAt":"2015-06-12T20:27:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Christian Couder writes:\n\n> I think it is needed later when \"struct ref_sort\" is moved into\n> ref-filter.h, because then the used_atom[] array is not moved.\n\nNow I am confused. used_atom[] is the mechanism we use to give a\nsmall integer to each atom used in the %(placeholder) string, so\nthat we do not have to refer to them as \"placeholder\" string and we\ndo not have to call !strcmp() to compare for equality. How can a\nfield in ref_sort refer to it internally if used_atom[] is not\nvisible?\n\nIndeed, ref-filter.c after the series does have used_atom[] and\nget_ref_atom_value() does use atom to index into it. So these two\nlines do not make much sense to me. I am puzzled.\n\nIf by \"moved\" you are referring to the fact that the structure and\nits fields are exposed to the callers of the API while the\nimplementation detail of the mechanism to give short integer to each\nused atom is not exposed to them, then I do agree that the comment\nto the structure field as the external API definition should not\ntalk about used_atom[] array.\n\nPerhaps in 03/12, you can stop talking about the implementation\n(i.e. the value is used to index into used_atom[] to get to the\noriginal string) and instead start talking about what the value\nmeans to the callers (that are still internal to for-each-ref\nimplementation), to make things better.\n\nHaving said that, I am not sure if there is a sensible description\nfor that field if you avoid exposing the implementation detail.\n\nYou would probably want to start by asking what that value means.\nFor (evantual) external callers, the number is what they get from\nparse_ref_filter_atom(); calling that function is the only way they\ncan get an appropriate value to stuff in the field, and\nparse_opt_ref_sorting() is the most likely function external callers\nuse to make that happen.\n\n\"The number internally used to represent an attribute of a ref used\nwhen sorting the set of refs\" would be one way to say what it is\nwithout exposing the implementation detail to the readers.\n\nBut does that help anybody? I doubt it. It is mouthful for\nexternal users, and it is not concrete enough for implementors.\n\nSo either\n\n - treat ref-filter.h as information for API users, and not talk\n about what it means at all, or\n\n - treat ref-filter.h as information for both API users and API\n implementors, and describe it as an index into used_atom[],\n i.e. do not change anything.\n\nI'd say the latter is a more sensible way to go. I think it is also\nOK to change this comment to \"index into used_atom array (internal)\"\nwhen ref-filter.h is created as an external API definition.\n"},{"id":"263700","messageId":"CAOLa=ZQwtaA0xRySnUtDQ6DUTqgCPM-7NM99EZucWDLzY-wCfw@mail.gmail.com","threadId":"39600","inReplyTo":"xmqqh9qcd653.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort","fromName":"karthik nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-06-12T21:22:08Z","receivedAt":"2015-06-12T21:22:08Z","isPatch":true,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"On Sat, Jun 13, 2015 at 1:57 AM, Junio C Hamano wrote:\n> Christian Couder writes:\n>\n>> I think it is needed later when \"struct ref_sort\" is moved into\n>> ref-filter.h, because then the used_atom[] array is not moved.\n>\n> Now I am confused. used_atom[] is the mechanism we use to give a\n> small integer to each atom used in the %(placeholder) string, so\n> that we do not have to refer to them as \"placeholder\" string and we\n> do not have to call !strcmp() to compare for equality. How can a\n> field in ref_sort refer to it internally if used_atom[] is not\n> visible?\n>\n> Indeed, ref-filter.c after the series does have used_atom[] and\n> get_ref_atom_value() does use atom to index into it. So these two\n> lines do not make much sense to me. I am puzzled.\n>\n> If by \"moved\" you are referring to the fact that the structure and\n> its fields are exposed to the callers of the API while the\n> implementation detail of the mechanism to give short integer to each\n> used atom is not exposed to them, then I do agree that the comment\n> to the structure field as the external API definition should not\n> talk about used_atom[] array.\n>\n> Perhaps in 03/12, you can stop talking about the implementation\n> (i.e. the value is used to index into used_atom[] to get to the\n> original string) and instead start talking about what the value\n> means to the callers (that are still internal to for-each-ref\n> implementation), to make things better.\n>\n> Having said that, I am not sure if there is a sensible description\n> for that field if you avoid exposing the implementation detail.\n>\n> You would probably want to start by asking what that value means.\n> For (evantual) external callers, the number is what they get from\n> parse_ref_filter_atom(); calling that function is the only way they\n> can get an appropriate value to stuff in the field, and\n> parse_opt_ref_sorting() is the most likely function external callers\n> use to make that happen.\n>\n> \"The number internally used to represent an attribute of a ref used\n> when sorting the set of refs\" would be one way to say what it is\n> without exposing the implementation detail to the readers.\n>\n> But does that help anybody? I doubt it. It is mouthful for\n> external users, and it is not concrete enough for implementors.\n>\n> So either\n>\n> - treat ref-filter.h as information for API users, and not talk\n> about what it means at all, or\n>\n> - treat ref-filter.h as information for both API users and API\n> implementors, and describe it as an index into used_atom[],\n> i.e. do not change anything.\n>\n> I'd say the latter is a more sensible way to go. I think it is also\n> OK to change this comment to \"index into used_atom array (internal)\"\n> when ref-filter.h is created as an external API definition.\n\nLike you said, the comment is still relevent to the code.\nSo I guess of the two options suggested by you the option of keeping the\ncomment and just adding \"(internal)\" while the code is moved to ref-filter.h\nseems to be the best solution. This would eliminate the need for PATCH 03.\n\n--\nRegards,\nKarthik\n"}]}