* [PATCH v8 0/11] Create ref-filter from for-each-ref
@ 2015-06-13 19:34 karthik nayak
2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: karthik nayak @ 2015-06-13 19:34 UTC (permalink / raw)
To: Git; +Cc: Christian Couder, Matthieu Moy, Junio C Hamano
The previous version of the patch can be found at :
http://thread.gmane.org/gmane.comp.version-control.git/271423
Changes :
* Removed an unnecessary commit (v7 3/12)
* Change a comment in 01/11 (v8)
Total changes :
Makefile | 1 +
builtin/for-each-ref.c | 1108
+++-------------------------------------------------------------------------------------------------------------------
ref-filter.c | 1101
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ref-filter.h | 74 ++++++++
4 files changed, 1195 insertions(+), 1089 deletions(-)
--
Regards,
Karthik Nayak
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() 2015-06-13 19:34 [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 02/11] for-each-ref: clean up code Karthik Nayak ` (9 more replies) 2015-06-14 8:04 ` [PATCH v8 0/11] Create ref-filter from for-each-ref Matthieu Moy 2015-06-15 18:49 ` Junio C Hamano 2 siblings, 10 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Extract two helper functions out of grab_single_ref(). Firstly, new_refinfo() which is used to allocate memory for a new refinfo structure and copy the objectname, refname and flag to it. Secondly, match_name_as_path() which when given an array of patterns and the refname checks if the refname matches any of the patterns given while the pattern is a pathname, also supports wildcard characters. This is a preperatory patch for restructuring 'for-each-ref' and eventually moving most of it to 'ref-filter' to provide the functionality to similar commands via public API's. Helped-by: Junio C Hamano <gitster@pobox.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 64 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index f7e51a7..cc65620 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -851,6 +851,44 @@ struct grab_ref_cbdata { }; /* + * Return 1 if the refname matches one of the patterns, otherwise 0. + * A pattern can be path prefix (e.g. a refname "refs/heads/master" + * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref + * matches "refs/heads/m*",too). + */ +static int match_name_as_path(const char **pattern, const char *refname) +{ + int namelen = strlen(refname); + for (; *pattern; pattern++) { + const char *p = *pattern; + int plen = strlen(p); + + if ((plen <= namelen) && + !strncmp(refname, p, plen) && + (refname[plen] == '\0' || + refname[plen] == '/' || + p[plen-1] == '/')) + return 1; + if (!wildmatch(p, refname, WM_PATHNAME, NULL)) + return 1; + } + return 0; +} + +/* Allocate space for a new refinfo and copy the objectname and flag to it */ +static struct refinfo *new_refinfo(const char *refname, + const unsigned char *objectname, + int flag) +{ + struct refinfo *ref = xcalloc(1, sizeof(struct refinfo)); + ref->refname = xstrdup(refname); + hashcpy(ref->objectname, objectname); + ref->flag = flag; + + return ref; +} + +/* * A call-back given to for_each_ref(). Filter refs and keep them for * later object processing. */ @@ -866,35 +904,15 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, return 0; } - if (*cb->grab_pattern) { - const char **pattern; - int namelen = strlen(refname); - for (pattern = cb->grab_pattern; *pattern; pattern++) { - const char *p = *pattern; - int plen = strlen(p); - - if ((plen <= namelen) && - !strncmp(refname, p, plen) && - (refname[plen] == '\0' || - refname[plen] == '/' || - p[plen-1] == '/')) - break; - if (!wildmatch(p, refname, WM_PATHNAME, NULL)) - break; - } - if (!*pattern) - return 0; - } + if (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname)) + return 0; /* * We do not open the object yet; sort may only need refname * to do its job and the resulting list may yet to be pruned * by maxcount logic. */ - ref = xcalloc(1, sizeof(*ref)); - ref->refname = xstrdup(refname); - hashcpy(ref->objectname, oid->hash); - ref->flag = flag; + ref = new_refinfo(refname, oid->hash, flag); cnt = cb->grab_cnt; REALLOC_ARRAY(cb->grab_array, cnt + 1); -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 02/11] for-each-ref: clean up code 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 03/11] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak ` (8 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak In 'grab_single_ref()' remove the extra count variable 'cnt' and use the variable 'grab_cnt' of structure 'grab_ref_cbdata' directly instead. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index cc65620..f0d7d44 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -897,7 +897,6 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, { struct grab_ref_cbdata *cb = cb_data; struct refinfo *ref; - int cnt; if (flag & REF_BAD_NAME) { warning("ignoring ref with broken name %s", refname); @@ -914,10 +913,8 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, */ ref = new_refinfo(refname, oid->hash, flag); - cnt = cb->grab_cnt; - REALLOC_ARRAY(cb->grab_array, cnt + 1); - cb->grab_array[cnt++] = ref; - cb->grab_cnt = cnt; + REALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1); + cb->grab_array[cb->grab_cnt++] = ref; return 0; } -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 03/11] for-each-ref: rename 'refinfo' to 'ref_array_item' 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 02/11] for-each-ref: clean up code Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 04/11] for-each-ref: introduce new structures for better organisation Karthik Nayak ` (7 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Rename 'refinfo' to 'ref_array_item' as a preparatory step for introduction of new structures in the forthcoming patch. Re-order the fields in 'ref_array_item' so that refname can be eventually converted to a FLEX_ARRAY. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index f0d7d44..d1b7e81 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -31,12 +31,12 @@ struct ref_sort { unsigned reverse : 1; }; -struct refinfo { - char *refname; +struct ref_array_item { unsigned char objectname[20]; int flag; const char *symref; struct atom_value *value; + char *refname; }; static struct { @@ -86,7 +86,7 @@ static struct { * a "*" to denote deref_tag(). * * We parse given format string and sort specifiers, and make a list - * of properties that we need to extract out of objects. refinfo + * of properties that we need to extract out of objects. ref_array_item * structure will hold an array of values extracted that can be * indexed with the "atom number", which is an index into this * array. @@ -623,7 +623,7 @@ static inline char *copy_advance(char *dst, const char *src) /* * Parse the object referred by ref, and grab needed value. */ -static void populate_value(struct refinfo *ref) +static void populate_value(struct ref_array_item *ref) { void *buf; struct object *obj; @@ -835,7 +835,7 @@ static void populate_value(struct refinfo *ref) * Given a ref, return the value for the atom. This lazily gets value * out of the object by calling populate value. */ -static void get_value(struct refinfo *ref, int atom, struct atom_value **v) +static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v) { if (!ref->value) { populate_value(ref); @@ -845,7 +845,7 @@ static void get_value(struct refinfo *ref, int atom, struct atom_value **v) } struct grab_ref_cbdata { - struct refinfo **grab_array; + struct ref_array_item **grab_array; const char **grab_pattern; int grab_cnt; }; @@ -875,12 +875,12 @@ static int match_name_as_path(const char **pattern, const char *refname) return 0; } -/* Allocate space for a new refinfo and copy the objectname and flag to it */ -static struct refinfo *new_refinfo(const char *refname, - const unsigned char *objectname, - int flag) +/* Allocate space for a new ref_array_item and copy the objectname and flag to it */ +static struct ref_array_item *new_ref_array_item(const char *refname, + const unsigned char *objectname, + int flag) { - struct refinfo *ref = xcalloc(1, sizeof(struct refinfo)); + struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item)); ref->refname = xstrdup(refname); hashcpy(ref->objectname, objectname); ref->flag = flag; @@ -896,7 +896,7 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, int flag, void *cb_data) { struct grab_ref_cbdata *cb = cb_data; - struct refinfo *ref; + struct ref_array_item *ref; if (flag & REF_BAD_NAME) { warning("ignoring ref with broken name %s", refname); @@ -911,14 +911,14 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, * to do its job and the resulting list may yet to be pruned * by maxcount logic. */ - ref = new_refinfo(refname, oid->hash, flag); + ref = new_ref_array_item(refname, oid->hash, flag); REALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1); cb->grab_array[cb->grab_cnt++] = ref; return 0; } -static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b) +static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b) { struct atom_value *va, *vb; int cmp; @@ -945,8 +945,8 @@ static int cmp_ref_sort(struct ref_sort *s, struct refinfo *a, struct refinfo *b static struct ref_sort *ref_sort; static int compare_refs(const void *a_, const void *b_) { - struct refinfo *a = *((struct refinfo **)a_); - struct refinfo *b = *((struct refinfo **)b_); + struct ref_array_item *a = *((struct ref_array_item **)a_); + struct ref_array_item *b = *((struct ref_array_item **)b_); struct ref_sort *s; for (s = ref_sort; s; s = s->next) { @@ -957,10 +957,10 @@ static int compare_refs(const void *a_, const void *b_) return 0; } -static void sort_refs(struct ref_sort *sort, struct refinfo **refs, int num_refs) +static void sort_refs(struct ref_sort *sort, struct ref_array_item **refs, int num_refs) { ref_sort = sort; - qsort(refs, num_refs, sizeof(struct refinfo *), compare_refs); + qsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs); } static void print_value(struct atom_value *v, int quote_style) @@ -1027,7 +1027,7 @@ static void emit(const char *cp, const char *ep) } } -static void show_ref(struct refinfo *info, const char *format, int quote_style) +static void show_ref(struct ref_array_item *info, const char *format, int quote_style) { const char *cp, *sp, *ep; @@ -1100,7 +1100,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) const char *format = "%(objectname) %(objecttype)\t%(refname)"; struct ref_sort *sort = NULL, **sort_tail = &sort; int maxcount = 0, quote_style = 0; - struct refinfo **refs; + struct ref_array_item **refs; struct grab_ref_cbdata cbdata; struct option opts[] = { -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 04/11] for-each-ref: introduce new structures for better organisation 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 02/11] for-each-ref: clean up code Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 03/11] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 05/11] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak ` (6 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Introduce 'ref_filter_cbdata' which will hold 'ref_filter' (conditions to filter the refs on) and 'ref_array' (the array of ref_array_items). Modify the code to use these new structures. This is a preparatory patch to eventually move code from 'for-each-ref' to 'ref-filter' and make it publicly available. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 54 ++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index d1b7e81..822838a 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -39,6 +39,20 @@ struct ref_array_item { char *refname; }; +struct ref_array { + int nr, alloc; + struct ref_array_item **items; +}; + +struct ref_filter { + const char **name_patterns; +}; + +struct ref_filter_cbdata { + struct ref_array array; + struct ref_filter filter; +}; + static struct { const char *name; cmp_type cmp_type; @@ -844,12 +858,6 @@ static void get_value(struct ref_array_item *ref, int atom, struct atom_value ** *v = &ref->value[atom]; } -struct grab_ref_cbdata { - struct ref_array_item **grab_array; - const char **grab_pattern; - int grab_cnt; -}; - /* * Return 1 if the refname matches one of the patterns, otherwise 0. * A pattern can be path prefix (e.g. a refname "refs/heads/master" @@ -895,7 +903,8 @@ static struct ref_array_item *new_ref_array_item(const char *refname, static int grab_single_ref(const char *refname, const struct object_id *oid, int flag, void *cb_data) { - struct grab_ref_cbdata *cb = cb_data; + struct ref_filter_cbdata *ref_cbdata = cb_data; + struct ref_filter *filter = &ref_cbdata->filter; struct ref_array_item *ref; if (flag & REF_BAD_NAME) { @@ -903,7 +912,7 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, return 0; } - if (*cb->grab_pattern && !match_name_as_path(cb->grab_pattern, refname)) + if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname)) return 0; /* @@ -913,8 +922,8 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, */ ref = new_ref_array_item(refname, oid->hash, flag); - REALLOC_ARRAY(cb->grab_array, cb->grab_cnt + 1); - cb->grab_array[cb->grab_cnt++] = ref; + REALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1); + ref_cbdata->array.items[ref_cbdata->array.nr++] = ref; return 0; } @@ -957,10 +966,10 @@ static int compare_refs(const void *a_, const void *b_) return 0; } -static void sort_refs(struct ref_sort *sort, struct ref_array_item **refs, int num_refs) +static void sort_refs(struct ref_sort *sort, struct ref_array *array) { ref_sort = sort; - qsort(refs, num_refs, sizeof(struct ref_array_item *), compare_refs); + qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs); } static void print_value(struct atom_value *v, int quote_style) @@ -1096,12 +1105,11 @@ static char const * const for_each_ref_usage[] = { int cmd_for_each_ref(int argc, const char **argv, const char *prefix) { - int i, num_refs; + int i; const char *format = "%(objectname) %(objecttype)\t%(refname)"; struct ref_sort *sort = NULL, **sort_tail = &sort; int maxcount = 0, quote_style = 0; - struct ref_array_item **refs; - struct grab_ref_cbdata cbdata; + struct ref_filter_cbdata ref_cbdata; struct option opts[] = { OPT_BIT('s', "shell", "e_style, @@ -1139,17 +1147,15 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) /* for warn_ambiguous_refs */ git_config(git_default_config, NULL); - memset(&cbdata, 0, sizeof(cbdata)); - cbdata.grab_pattern = argv; - for_each_rawref(grab_single_ref, &cbdata); - refs = cbdata.grab_array; - num_refs = cbdata.grab_cnt; + memset(&ref_cbdata, 0, sizeof(ref_cbdata)); + ref_cbdata.filter.name_patterns = argv; + for_each_rawref(grab_single_ref, &ref_cbdata); - sort_refs(sort, refs, num_refs); + sort_refs(sort, &ref_cbdata.array); - if (!maxcount || num_refs < maxcount) - maxcount = num_refs; + if (!maxcount || ref_cbdata.array.nr < maxcount) + maxcount = ref_cbdata.array.nr; for (i = 0; i < maxcount; i++) - show_ref(refs[i], format, quote_style); + show_ref(ref_cbdata.array.items[i], format, quote_style); return 0; } -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 05/11] for-each-ref: introduce 'ref_array_clear()' 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (2 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 04/11] for-each-ref: introduce new structures for better organisation Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 06/11] for-each-ref: rename some functions and make them public Karthik Nayak ` (5 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Introduce and implement 'ref_array_clear()' which will free all allocated memory for 'ref_array'. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 822838a..bb83f7a 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -927,6 +927,26 @@ static int grab_single_ref(const char *refname, const struct object_id *oid, return 0; } +/* Free memory allocated for a ref_array_item */ +static void free_array_item(struct ref_array_item *item) +{ + free((char *)item->symref); + free(item->refname); + free(item); +} + +/* Free all memory allocated for ref_array */ +void ref_array_clear(struct ref_array *array) +{ + int i; + + for (i = 0; i < array->nr; i++) + free_array_item(array->items[i]); + free(array->items); + array->items = NULL; + array->nr = array->alloc = 0; +} + static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b) { struct atom_value *va, *vb; @@ -1157,5 +1177,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) maxcount = ref_cbdata.array.nr; for (i = 0; i < maxcount; i++) show_ref(ref_cbdata.array.items[i], format, quote_style); + ref_array_clear(&ref_cbdata.array); return 0; } -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 06/11] for-each-ref: rename some functions and make them public 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (3 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 05/11] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 07/11] for-each-ref: rename variables called sort to sorting Karthik Nayak ` (4 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Rename some of the functions and make them publicly available. This is a preparatory step for moving code from 'for-each-ref' to 'ref-filter' to make meaningful, targeted services available to other commands via public APIs. Functions renamed are: parse_atom() -> parse_ref_filter_atom() verify_format() -> verify_ref_format() get_value() -> get_ref_atom_value() grab_single_ref() -> ref_filter_handler() sort_refs() -> ref_array_sort() show_ref() -> show_ref_array_item() default_sort() -> ref_default_sorting() opt_parse_sort() -> parse_opt_ref_sorting() cmp_ref_sort() -> cmp_ref_sorting() Rename 'struct ref_sort' to 'struct ref_sorting' in this context. Based-on-patch-by: Jeff King <peff@peff.net> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index bb83f7a..5700b25 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -113,7 +113,7 @@ static int need_color_reset_at_eol; /* * Used to parse format string and sort specifiers */ -static int parse_atom(const char *atom, const char *ep) +int parse_ref_filter_atom(const char *atom, const char *ep) { const char *sp; int i, at; @@ -190,7 +190,7 @@ static const char *find_next(const char *cp) * Make sure the format string is well formed, and parse out * the used atoms. */ -static int verify_format(const char *format) +int verify_ref_format(const char *format) { const char *cp, *sp; @@ -202,7 +202,7 @@ static int verify_format(const char *format) if (!ep) return error("malformed format string %s", sp); /* sp points at "%(" and ep points at the closing ")" */ - at = parse_atom(sp + 2, ep); + at = parse_ref_filter_atom(sp + 2, ep); cp = ep + 1; if (skip_prefix(used_atom[at], "color:", &color)) @@ -409,7 +409,7 @@ static void grab_date(const char *buf, struct atom_value *v, const char *atomnam /* * We got here because atomname ends in "date" or "date<something>"; * it's not possible that <something> is not ":<format>" because - * parse_atom() wouldn't have allowed it, so we can assume that no + * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no * ":" means no format is specified, and use the default. */ formatp = strchr(atomname, ':'); @@ -849,7 +849,7 @@ static void populate_value(struct ref_array_item *ref) * Given a ref, return the value for the atom. This lazily gets value * out of the object by calling populate value. */ -static void get_value(struct ref_array_item *ref, int atom, struct atom_value **v) +static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v) { if (!ref->value) { populate_value(ref); @@ -900,8 +900,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname, * A call-back given to for_each_ref(). Filter refs and keep them for * later object processing. */ -static int grab_single_ref(const char *refname, const struct object_id *oid, - int flag, void *cb_data) +int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data) { struct ref_filter_cbdata *ref_cbdata = cb_data; struct ref_filter *filter = &ref_cbdata->filter; @@ -947,14 +946,14 @@ void ref_array_clear(struct ref_array *array) array->nr = array->alloc = 0; } -static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref_array_item *b) +static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b) { struct atom_value *va, *vb; int cmp; cmp_type cmp_type = used_atom_type[s->atom]; - get_value(a, s->atom, &va); - get_value(b, s->atom, &vb); + get_ref_atom_value(a, s->atom, &va); + get_ref_atom_value(b, s->atom, &vb); switch (cmp_type) { case FIELD_STR: cmp = strcmp(va->s, vb->s); @@ -971,24 +970,24 @@ static int cmp_ref_sort(struct ref_sort *s, struct ref_array_item *a, struct ref return (s->reverse) ? -cmp : cmp; } -static struct ref_sort *ref_sort; +static struct ref_sorting *ref_sorting; static int compare_refs(const void *a_, const void *b_) { struct ref_array_item *a = *((struct ref_array_item **)a_); struct ref_array_item *b = *((struct ref_array_item **)b_); - struct ref_sort *s; + struct ref_sorting *s; - for (s = ref_sort; s; s = s->next) { - int cmp = cmp_ref_sort(s, a, b); + for (s = ref_sorting; s; s = s->next) { + int cmp = cmp_ref_sorting(s, a, b); if (cmp) return cmp; } return 0; } -static void sort_refs(struct ref_sort *sort, struct ref_array *array) +void ref_array_sort(struct ref_sorting *sort, struct ref_array *array) { - ref_sort = sort; + ref_sorting = sort; qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs); } @@ -1056,7 +1055,7 @@ static void emit(const char *cp, const char *ep) } } -static void show_ref(struct ref_array_item *info, const char *format, int quote_style) +void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style) { const char *cp, *sp, *ep; @@ -1066,7 +1065,7 @@ static void show_ref(struct ref_array_item *info, const char *format, int quote_ ep = strchr(sp, ')'); if (cp < sp) emit(cp, sp); - get_value(info, parse_atom(sp + 2, ep), &atomv); + get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv); print_value(atomv, quote_style); } if (*cp) { @@ -1085,21 +1084,22 @@ static void show_ref(struct ref_array_item *info, const char *format, int quote_ putchar('\n'); } -static struct ref_sort *default_sort(void) +/* If no sorting option is given, use refname to sort as default */ +struct ref_sorting *ref_default_sorting(void) { static const char cstr_name[] = "refname"; - struct ref_sort *sort = xcalloc(1, sizeof(*sort)); + struct ref_sorting *sort = xcalloc(1, sizeof(*sort)); sort->next = NULL; - sort->atom = parse_atom(cstr_name, cstr_name + strlen(cstr_name)); + sort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); return sort; } -static int opt_parse_sort(const struct option *opt, const char *arg, int unset) +int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) { - struct ref_sort **sort_tail = opt->value; - struct ref_sort *s; + struct ref_sorting **sort_tail = opt->value; + struct ref_sorting *s; int len; if (!arg) /* should --no-sort void the list ? */ @@ -1114,7 +1114,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset) arg++; } len = strlen(arg); - s->atom = parse_atom(arg, arg+len); + s->atom = parse_ref_filter_atom(arg, arg+len); return 0; } @@ -1127,7 +1127,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) { int i; const char *format = "%(objectname) %(objecttype)\t%(refname)"; - struct ref_sort *sort = NULL, **sort_tail = &sort; + struct ref_sorting *sort = NULL, **sort_tail = &sort; int maxcount = 0, quote_style = 0; struct ref_filter_cbdata ref_cbdata; @@ -1145,7 +1145,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")), OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")), OPT_CALLBACK(0 , "sort", sort_tail, N_("key"), - N_("field name to sort on"), &opt_parse_sort), + N_("field name to sort on"), &parse_opt_ref_sorting), OPT_END(), }; @@ -1158,25 +1158,25 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) error("more than one quoting style?"); usage_with_options(for_each_ref_usage, opts); } - if (verify_format(format)) + if (verify_ref_format(format)) usage_with_options(for_each_ref_usage, opts); if (!sort) - sort = default_sort(); + sort = ref_default_sorting(); /* for warn_ambiguous_refs */ git_config(git_default_config, NULL); memset(&ref_cbdata, 0, sizeof(ref_cbdata)); ref_cbdata.filter.name_patterns = argv; - for_each_rawref(grab_single_ref, &ref_cbdata); + for_each_rawref(ref_filter_handler, &ref_cbdata); - sort_refs(sort, &ref_cbdata.array); + ref_array_sort(sort, &ref_cbdata.array); if (!maxcount || ref_cbdata.array.nr < maxcount) maxcount = ref_cbdata.array.nr; for (i = 0; i < maxcount; i++) - show_ref(ref_cbdata.array.items[i], format, quote_style); + show_ref_array_item(ref_cbdata.array.items[i], format, quote_style); ref_array_clear(&ref_cbdata.array); return 0; } -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 07/11] for-each-ref: rename variables called sort to sorting 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (4 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 06/11] for-each-ref: rename some functions and make them public Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 08/11] ref-filter: add 'ref-filter.h' Karthik Nayak ` (3 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Rename all the variables called sort to sorting to match the function/structure name changes made in the previous patch. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 5700b25..d11059b 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -985,9 +985,9 @@ static int compare_refs(const void *a_, const void *b_) return 0; } -void ref_array_sort(struct ref_sorting *sort, struct ref_array *array) +void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array) { - ref_sorting = sort; + ref_sorting = sorting; qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs); } @@ -1089,16 +1089,16 @@ struct ref_sorting *ref_default_sorting(void) { static const char cstr_name[] = "refname"; - struct ref_sorting *sort = xcalloc(1, sizeof(*sort)); + struct ref_sorting *sorting = xcalloc(1, sizeof(*sorting)); - sort->next = NULL; - sort->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); - return sort; + sorting->next = NULL; + sorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); + return sorting; } int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) { - struct ref_sorting **sort_tail = opt->value; + struct ref_sorting **sorting_tail = opt->value; struct ref_sorting *s; int len; @@ -1106,8 +1106,8 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) return -1; s = xcalloc(1, sizeof(*s)); - s->next = *sort_tail; - *sort_tail = s; + s->next = *sorting_tail; + *sorting_tail = s; if (*arg == '-') { s->reverse = 1; @@ -1127,7 +1127,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) { int i; const char *format = "%(objectname) %(objecttype)\t%(refname)"; - struct ref_sorting *sort = NULL, **sort_tail = &sort; + struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; int maxcount = 0, quote_style = 0; struct ref_filter_cbdata ref_cbdata; @@ -1144,7 +1144,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) OPT_GROUP(""), OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")), OPT_STRING( 0 , "format", &format, N_("format"), N_("format to use for the output")), - OPT_CALLBACK(0 , "sort", sort_tail, N_("key"), + OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"), N_("field name to sort on"), &parse_opt_ref_sorting), OPT_END(), }; @@ -1161,8 +1161,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) if (verify_ref_format(format)) usage_with_options(for_each_ref_usage, opts); - if (!sort) - sort = ref_default_sorting(); + if (!sorting) + sorting = ref_default_sorting(); /* for warn_ambiguous_refs */ git_config(git_default_config, NULL); @@ -1171,7 +1171,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) ref_cbdata.filter.name_patterns = argv; for_each_rawref(ref_filter_handler, &ref_cbdata); - ref_array_sort(sort, &ref_cbdata.array); + ref_array_sort(sorting, &ref_cbdata.array); if (!maxcount || ref_cbdata.array.nr < maxcount) maxcount = ref_cbdata.array.nr; -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 08/11] ref-filter: add 'ref-filter.h' 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (5 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 07/11] for-each-ref: rename variables called sort to sorting Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 09/11] ref-filter: move code from 'for-each-ref' Karthik Nayak ` (2 subsequent siblings) 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak This is step one of creating a common library for 'for-each-ref', 'branch -l' and 'tag -l'. This creates a header file with the functions and data structures that ref-filter will provide. We move the data structures created in for-each-ref to this header file. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 41 +------------------------------ ref-filter.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 ref-filter.h diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index d11059b..26485b9 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -10,49 +10,10 @@ #include "parse-options.h" #include "remote.h" #include "color.h" - -/* Quoting styles */ -#define QUOTE_NONE 0 -#define QUOTE_SHELL 1 -#define QUOTE_PERL 2 -#define QUOTE_PYTHON 4 -#define QUOTE_TCL 8 +#include "ref-filter.h" typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type; -struct atom_value { - const char *s; - unsigned long ul; /* used for sorting when not FIELD_STR */ -}; - -struct ref_sort { - struct ref_sort *next; - int atom; /* index into used_atom array */ - unsigned reverse : 1; -}; - -struct ref_array_item { - unsigned char objectname[20]; - int flag; - const char *symref; - struct atom_value *value; - char *refname; -}; - -struct ref_array { - int nr, alloc; - struct ref_array_item **items; -}; - -struct ref_filter { - const char **name_patterns; -}; - -struct ref_filter_cbdata { - struct ref_array array; - struct ref_filter filter; -}; - static struct { const char *name; cmp_type cmp_type; diff --git a/ref-filter.h b/ref-filter.h new file mode 100644 index 0000000..506ac8f --- /dev/null +++ b/ref-filter.h @@ -0,0 +1,66 @@ +#ifndef REF_FILTER_H +#define REF_FILTER_H + +#include "sha1-array.h" +#include "refs.h" +#include "commit.h" +#include "parse-options.h" + +/* Quoting styles */ +#define QUOTE_NONE 0 +#define QUOTE_SHELL 1 +#define QUOTE_PERL 2 +#define QUOTE_PYTHON 4 +#define QUOTE_TCL 8 + +struct atom_value { + const char *s; + unsigned long ul; /* used for sorting when not FIELD_STR */ +}; + +struct ref_sorting { + struct ref_sorting *next; + int atom; /* index into used_atom array (internal) */ + unsigned reverse : 1; +}; + +struct ref_array_item { + unsigned char objectname[20]; + int flag; + const char *symref; + struct atom_value *value; + char *refname; +}; + +struct ref_array { + int nr, alloc; + struct ref_array_item **items; +}; + +struct ref_filter { + const char **name_patterns; +}; + +struct ref_filter_cbdata { + struct ref_array array; + struct ref_filter filter; +}; + +/* Callback function for for_each_*ref(). This filters the refs based on the filters set */ +int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data); +/* Clear all memory allocated to ref_array */ +void ref_array_clear(struct ref_array *array); +/* Parse format string and sort specifiers */ +int parse_ref_filter_atom(const char *atom, const char *ep); +/* Used to verify if the given format is correct and to parse out the used atoms */ +int verify_ref_format(const char *format); +/* Sort the given ref_array as per the ref_sorting provided */ +void ref_array_sort(struct ref_sorting *sort, struct ref_array *array); +/* Print the ref using the given format and quote_style */ +void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style); +/* Callback function for parsing the sort option */ +int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset); +/* Default sort option based on refname */ +struct ref_sorting *ref_default_sorting(void); + +#endif /* REF_FILTER_H */ -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 09/11] ref-filter: move code from 'for-each-ref' 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (6 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 08/11] ref-filter: add 'ref-filter.h' Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 10/11] for-each-ref: introduce filter_refs() Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname Karthik Nayak 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Move most of the code from 'for-each-ref' to 'ref-filter' to make it publicly available to other commands, this is to unify the code of 'tag -l', 'branch -l' and 'for-each-ref' so that they can share their implementations with each other. Add 'ref-filter' to the Makefile, this completes the movement of code from 'for-each-ref' to 'ref-filter'. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- Makefile | 1 + builtin/for-each-ref.c | 1074 ----------------------------------------------- ref-filter.c | 1078 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1079 insertions(+), 1074 deletions(-) create mode 100644 ref-filter.c diff --git a/Makefile b/Makefile index 54ec511..d715b66 100644 --- a/Makefile +++ b/Makefile @@ -762,6 +762,7 @@ LIB_OBJS += reachable.o LIB_OBJS += read-cache.o LIB_OBJS += reflog-walk.o LIB_OBJS += refs.o +LIB_OBJS += ref-filter.o LIB_OBJS += remote.o LIB_OBJS += replace_object.o LIB_OBJS += rerere.o diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 26485b9..637fc4a 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -2,1083 +2,9 @@ #include "cache.h" #include "refs.h" #include "object.h" -#include "tag.h" -#include "commit.h" -#include "tree.h" -#include "blob.h" -#include "quote.h" #include "parse-options.h" -#include "remote.h" -#include "color.h" #include "ref-filter.h" -typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type; - -static struct { - const char *name; - cmp_type cmp_type; -} valid_atom[] = { - { "refname" }, - { "objecttype" }, - { "objectsize", FIELD_ULONG }, - { "objectname" }, - { "tree" }, - { "parent" }, - { "numparent", FIELD_ULONG }, - { "object" }, - { "type" }, - { "tag" }, - { "author" }, - { "authorname" }, - { "authoremail" }, - { "authordate", FIELD_TIME }, - { "committer" }, - { "committername" }, - { "committeremail" }, - { "committerdate", FIELD_TIME }, - { "tagger" }, - { "taggername" }, - { "taggeremail" }, - { "taggerdate", FIELD_TIME }, - { "creator" }, - { "creatordate", FIELD_TIME }, - { "subject" }, - { "body" }, - { "contents" }, - { "contents:subject" }, - { "contents:body" }, - { "contents:signature" }, - { "upstream" }, - { "push" }, - { "symref" }, - { "flag" }, - { "HEAD" }, - { "color" }, -}; - -/* - * An atom is a valid field atom listed above, possibly prefixed with - * a "*" to denote deref_tag(). - * - * We parse given format string and sort specifiers, and make a list - * of properties that we need to extract out of objects. ref_array_item - * structure will hold an array of values extracted that can be - * indexed with the "atom number", which is an index into this - * array. - */ -static const char **used_atom; -static cmp_type *used_atom_type; -static int used_atom_cnt, need_tagged, need_symref; -static int need_color_reset_at_eol; - -/* - * Used to parse format string and sort specifiers - */ -int parse_ref_filter_atom(const char *atom, const char *ep) -{ - const char *sp; - int i, at; - - sp = atom; - if (*sp == '*' && sp < ep) - sp++; /* deref */ - if (ep <= sp) - die("malformed field name: %.*s", (int)(ep-atom), atom); - - /* Do we have the atom already used elsewhere? */ - for (i = 0; i < used_atom_cnt; i++) { - int len = strlen(used_atom[i]); - if (len == ep - atom && !memcmp(used_atom[i], atom, len)) - return i; - } - - /* Is the atom a valid one? */ - for (i = 0; i < ARRAY_SIZE(valid_atom); i++) { - int len = strlen(valid_atom[i].name); - /* - * If the atom name has a colon, strip it and everything after - * it off - it specifies the format for this entry, and - * shouldn't be used for checking against the valid_atom - * table. - */ - const char *formatp = strchr(sp, ':'); - if (!formatp || ep < formatp) - formatp = ep; - if (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len)) - break; - } - - if (ARRAY_SIZE(valid_atom) <= i) - die("unknown field name: %.*s", (int)(ep-atom), atom); - - /* Add it in, including the deref prefix */ - at = used_atom_cnt; - used_atom_cnt++; - REALLOC_ARRAY(used_atom, used_atom_cnt); - REALLOC_ARRAY(used_atom_type, used_atom_cnt); - used_atom[at] = xmemdupz(atom, ep - atom); - used_atom_type[at] = valid_atom[i].cmp_type; - if (*atom == '*') - need_tagged = 1; - if (!strcmp(used_atom[at], "symref")) - need_symref = 1; - return at; -} - -/* - * In a format string, find the next occurrence of %(atom). - */ -static const char *find_next(const char *cp) -{ - while (*cp) { - if (*cp == '%') { - /* - * %( is the start of an atom; - * %% is a quoted per-cent. - */ - if (cp[1] == '(') - return cp; - else if (cp[1] == '%') - cp++; /* skip over two % */ - /* otherwise this is a singleton, literal % */ - } - cp++; - } - return NULL; -} - -/* - * Make sure the format string is well formed, and parse out - * the used atoms. - */ -int verify_ref_format(const char *format) -{ - const char *cp, *sp; - - need_color_reset_at_eol = 0; - for (cp = format; *cp && (sp = find_next(cp)); ) { - const char *color, *ep = strchr(sp, ')'); - int at; - - if (!ep) - return error("malformed format string %s", sp); - /* sp points at "%(" and ep points at the closing ")" */ - at = parse_ref_filter_atom(sp + 2, ep); - cp = ep + 1; - - if (skip_prefix(used_atom[at], "color:", &color)) - need_color_reset_at_eol = !!strcmp(color, "reset"); - } - return 0; -} - -/* - * Given an object name, read the object data and size, and return a - * "struct object". If the object data we are returning is also borrowed - * by the "struct object" representation, set *eaten as well---it is a - * signal from parse_object_buffer to us not to free the buffer. - */ -static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned long *sz, int *eaten) -{ - enum object_type type; - void *buf = read_sha1_file(sha1, &type, sz); - - if (buf) - *obj = parse_object_buffer(sha1, type, *sz, buf, eaten); - else - *obj = NULL; - return buf; -} - -static int grab_objectname(const char *name, const unsigned char *sha1, - struct atom_value *v) -{ - if (!strcmp(name, "objectname")) { - char *s = xmalloc(41); - strcpy(s, sha1_to_hex(sha1)); - v->s = s; - return 1; - } - if (!strcmp(name, "objectname:short")) { - v->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); - return 1; - } - return 0; -} - -/* See grab_values */ -static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) -{ - int i; - - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &val[i]; - if (!!deref != (*name == '*')) - continue; - if (deref) - name++; - if (!strcmp(name, "objecttype")) - v->s = typename(obj->type); - else if (!strcmp(name, "objectsize")) { - char *s = xmalloc(40); - sprintf(s, "%lu", sz); - v->ul = sz; - v->s = s; - } - else if (deref) - grab_objectname(name, obj->sha1, v); - } -} - -/* See grab_values */ -static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) -{ - int i; - struct tag *tag = (struct tag *) obj; - - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &val[i]; - if (!!deref != (*name == '*')) - continue; - if (deref) - name++; - if (!strcmp(name, "tag")) - v->s = tag->tag; - else if (!strcmp(name, "type") && tag->tagged) - v->s = typename(tag->tagged->type); - else if (!strcmp(name, "object") && tag->tagged) { - char *s = xmalloc(41); - strcpy(s, sha1_to_hex(tag->tagged->sha1)); - v->s = s; - } - } -} - -/* See grab_values */ -static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) -{ - int i; - struct commit *commit = (struct commit *) obj; - - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &val[i]; - if (!!deref != (*name == '*')) - continue; - if (deref) - name++; - if (!strcmp(name, "tree")) { - char *s = xmalloc(41); - strcpy(s, sha1_to_hex(commit->tree->object.sha1)); - v->s = s; - } - if (!strcmp(name, "numparent")) { - char *s = xmalloc(40); - v->ul = commit_list_count(commit->parents); - sprintf(s, "%lu", v->ul); - v->s = s; - } - else if (!strcmp(name, "parent")) { - int num = commit_list_count(commit->parents); - int i; - struct commit_list *parents; - char *s = xmalloc(41 * num + 1); - v->s = s; - for (i = 0, parents = commit->parents; - parents; - parents = parents->next, i = i + 41) { - struct commit *parent = parents->item; - strcpy(s+i, sha1_to_hex(parent->object.sha1)); - if (parents->next) - s[i+40] = ' '; - } - if (!i) - *s = '\0'; - } - } -} - -static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz) -{ - const char *eol; - while (*buf) { - if (!strncmp(buf, who, wholen) && - buf[wholen] == ' ') - return buf + wholen + 1; - eol = strchr(buf, '\n'); - if (!eol) - return ""; - eol++; - if (*eol == '\n') - return ""; /* end of header */ - buf = eol; - } - return ""; -} - -static const char *copy_line(const char *buf) -{ - const char *eol = strchrnul(buf, '\n'); - return xmemdupz(buf, eol - buf); -} - -static const char *copy_name(const char *buf) -{ - const char *cp; - for (cp = buf; *cp && *cp != '\n'; cp++) { - if (!strncmp(cp, " <", 2)) - return xmemdupz(buf, cp - buf); - } - return ""; -} - -static const char *copy_email(const char *buf) -{ - const char *email = strchr(buf, '<'); - const char *eoemail; - if (!email) - return ""; - eoemail = strchr(email, '>'); - if (!eoemail) - return ""; - return xmemdupz(email, eoemail + 1 - email); -} - -static char *copy_subject(const char *buf, unsigned long len) -{ - char *r = xmemdupz(buf, len); - int i; - - for (i = 0; i < len; i++) - if (r[i] == '\n') - r[i] = ' '; - - return r; -} - -static void grab_date(const char *buf, struct atom_value *v, const char *atomname) -{ - const char *eoemail = strstr(buf, "> "); - char *zone; - unsigned long timestamp; - long tz; - enum date_mode date_mode = DATE_NORMAL; - const char *formatp; - - /* - * We got here because atomname ends in "date" or "date<something>"; - * it's not possible that <something> is not ":<format>" because - * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no - * ":" means no format is specified, and use the default. - */ - formatp = strchr(atomname, ':'); - if (formatp != NULL) { - formatp++; - date_mode = parse_date_format(formatp); - } - - if (!eoemail) - goto bad; - timestamp = strtoul(eoemail + 2, &zone, 10); - if (timestamp == ULONG_MAX) - goto bad; - tz = strtol(zone, NULL, 10); - if ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE) - goto bad; - v->s = xstrdup(show_date(timestamp, tz, date_mode)); - v->ul = timestamp; - return; - bad: - v->s = ""; - v->ul = 0; -} - -/* See grab_values */ -static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) -{ - int i; - int wholen = strlen(who); - const char *wholine = NULL; - - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &val[i]; - if (!!deref != (*name == '*')) - continue; - if (deref) - name++; - if (strncmp(who, name, wholen)) - continue; - if (name[wholen] != 0 && - strcmp(name + wholen, "name") && - strcmp(name + wholen, "email") && - !starts_with(name + wholen, "date")) - continue; - if (!wholine) - wholine = find_wholine(who, wholen, buf, sz); - if (!wholine) - return; /* no point looking for it */ - if (name[wholen] == 0) - v->s = copy_line(wholine); - else if (!strcmp(name + wholen, "name")) - v->s = copy_name(wholine); - else if (!strcmp(name + wholen, "email")) - v->s = copy_email(wholine); - else if (starts_with(name + wholen, "date")) - grab_date(wholine, v, name); - } - - /* - * For a tag or a commit object, if "creator" or "creatordate" is - * requested, do something special. - */ - if (strcmp(who, "tagger") && strcmp(who, "committer")) - return; /* "author" for commit object is not wanted */ - if (!wholine) - wholine = find_wholine(who, wholen, buf, sz); - if (!wholine) - return; - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &val[i]; - if (!!deref != (*name == '*')) - continue; - if (deref) - name++; - - if (starts_with(name, "creatordate")) - grab_date(wholine, v, name); - else if (!strcmp(name, "creator")) - v->s = copy_line(wholine); - } -} - -static void find_subpos(const char *buf, unsigned long sz, - const char **sub, unsigned long *sublen, - const char **body, unsigned long *bodylen, - unsigned long *nonsiglen, - const char **sig, unsigned long *siglen) -{ - const char *eol; - /* skip past header until we hit empty line */ - while (*buf && *buf != '\n') { - eol = strchrnul(buf, '\n'); - if (*eol) - eol++; - buf = eol; - } - /* skip any empty lines */ - while (*buf == '\n') - buf++; - - /* parse signature first; we might not even have a subject line */ - *sig = buf + parse_signature(buf, strlen(buf)); - *siglen = strlen(*sig); - - /* subject is first non-empty line */ - *sub = buf; - /* subject goes to first empty line */ - while (buf < *sig && *buf && *buf != '\n') { - eol = strchrnul(buf, '\n'); - if (*eol) - eol++; - buf = eol; - } - *sublen = buf - *sub; - /* drop trailing newline, if present */ - if (*sublen && (*sub)[*sublen - 1] == '\n') - *sublen -= 1; - - /* skip any empty lines */ - while (*buf == '\n') - buf++; - *body = buf; - *bodylen = strlen(buf); - *nonsiglen = *sig - buf; -} - -/* See grab_values */ -static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) -{ - int i; - const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL; - unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0; - - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &val[i]; - if (!!deref != (*name == '*')) - continue; - if (deref) - name++; - if (strcmp(name, "subject") && - strcmp(name, "body") && - strcmp(name, "contents") && - strcmp(name, "contents:subject") && - strcmp(name, "contents:body") && - strcmp(name, "contents:signature")) - continue; - if (!subpos) - find_subpos(buf, sz, - &subpos, &sublen, - &bodypos, &bodylen, &nonsiglen, - &sigpos, &siglen); - - if (!strcmp(name, "subject")) - v->s = copy_subject(subpos, sublen); - else if (!strcmp(name, "contents:subject")) - v->s = copy_subject(subpos, sublen); - else if (!strcmp(name, "body")) - v->s = xmemdupz(bodypos, bodylen); - else if (!strcmp(name, "contents:body")) - v->s = xmemdupz(bodypos, nonsiglen); - else if (!strcmp(name, "contents:signature")) - v->s = xmemdupz(sigpos, siglen); - else if (!strcmp(name, "contents")) - v->s = xstrdup(subpos); - } -} - -/* - * We want to have empty print-string for field requests - * that do not apply (e.g. "authordate" for a tag object) - */ -static void fill_missing_values(struct atom_value *val) -{ - int i; - for (i = 0; i < used_atom_cnt; i++) { - struct atom_value *v = &val[i]; - if (v->s == NULL) - v->s = ""; - } -} - -/* - * val is a list of atom_value to hold returned values. Extract - * the values for atoms in used_atom array out of (obj, buf, sz). - * when deref is false, (obj, buf, sz) is the object that is - * pointed at by the ref itself; otherwise it is the object the - * ref (which is a tag) refers to. - */ -static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) -{ - grab_common_values(val, deref, obj, buf, sz); - switch (obj->type) { - case OBJ_TAG: - grab_tag_values(val, deref, obj, buf, sz); - grab_sub_body_contents(val, deref, obj, buf, sz); - grab_person("tagger", val, deref, obj, buf, sz); - break; - case OBJ_COMMIT: - grab_commit_values(val, deref, obj, buf, sz); - grab_sub_body_contents(val, deref, obj, buf, sz); - grab_person("author", val, deref, obj, buf, sz); - grab_person("committer", val, deref, obj, buf, sz); - break; - case OBJ_TREE: - /* grab_tree_values(val, deref, obj, buf, sz); */ - break; - case OBJ_BLOB: - /* grab_blob_values(val, deref, obj, buf, sz); */ - break; - default: - die("Eh? Object of type %d?", obj->type); - } -} - -static inline char *copy_advance(char *dst, const char *src) -{ - while (*src) - *dst++ = *src++; - return dst; -} - -/* - * Parse the object referred by ref, and grab needed value. - */ -static void populate_value(struct ref_array_item *ref) -{ - void *buf; - struct object *obj; - int eaten, i; - unsigned long size; - const unsigned char *tagged; - - ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value)); - - if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) { - unsigned char unused1[20]; - ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING, - unused1, NULL); - if (!ref->symref) - ref->symref = ""; - } - - /* Fill in specials first */ - for (i = 0; i < used_atom_cnt; i++) { - const char *name = used_atom[i]; - struct atom_value *v = &ref->value[i]; - int deref = 0; - const char *refname; - const char *formatp; - struct branch *branch = NULL; - - if (*name == '*') { - deref = 1; - name++; - } - - if (starts_with(name, "refname")) - refname = ref->refname; - else if (starts_with(name, "symref")) - refname = ref->symref ? ref->symref : ""; - else if (starts_with(name, "upstream")) { - const char *branch_name; - /* only local branches may have an upstream */ - if (!skip_prefix(ref->refname, "refs/heads/", - &branch_name)) - continue; - branch = branch_get(branch_name); - - refname = branch_get_upstream(branch, NULL); - if (!refname) - continue; - } else if (starts_with(name, "push")) { - const char *branch_name; - if (!skip_prefix(ref->refname, "refs/heads/", - &branch_name)) - continue; - branch = branch_get(branch_name); - - refname = branch_get_push(branch, NULL); - if (!refname) - continue; - } else if (starts_with(name, "color:")) { - char color[COLOR_MAXLEN] = ""; - - if (color_parse(name + 6, color) < 0) - die(_("unable to parse format")); - v->s = xstrdup(color); - continue; - } else if (!strcmp(name, "flag")) { - char buf[256], *cp = buf; - if (ref->flag & REF_ISSYMREF) - cp = copy_advance(cp, ",symref"); - if (ref->flag & REF_ISPACKED) - cp = copy_advance(cp, ",packed"); - if (cp == buf) - v->s = ""; - else { - *cp = '\0'; - v->s = xstrdup(buf + 1); - } - continue; - } else if (!deref && grab_objectname(name, ref->objectname, v)) { - continue; - } else if (!strcmp(name, "HEAD")) { - const char *head; - unsigned char sha1[20]; - - head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, - sha1, NULL); - if (!strcmp(ref->refname, head)) - v->s = "*"; - else - v->s = " "; - continue; - } else - continue; - - formatp = strchr(name, ':'); - if (formatp) { - int num_ours, num_theirs; - - formatp++; - if (!strcmp(formatp, "short")) - refname = shorten_unambiguous_ref(refname, - warn_ambiguous_refs); - else if (!strcmp(formatp, "track") && - (starts_with(name, "upstream") || - starts_with(name, "push"))) { - char buf[40]; - - if (stat_tracking_info(branch, &num_ours, - &num_theirs, NULL)) - continue; - - if (!num_ours && !num_theirs) - v->s = ""; - else if (!num_ours) { - sprintf(buf, "[behind %d]", num_theirs); - v->s = xstrdup(buf); - } else if (!num_theirs) { - sprintf(buf, "[ahead %d]", num_ours); - v->s = xstrdup(buf); - } else { - sprintf(buf, "[ahead %d, behind %d]", - num_ours, num_theirs); - v->s = xstrdup(buf); - } - continue; - } else if (!strcmp(formatp, "trackshort") && - (starts_with(name, "upstream") || - starts_with(name, "push"))) { - assert(branch); - - if (stat_tracking_info(branch, &num_ours, - &num_theirs, NULL)) - continue; - - if (!num_ours && !num_theirs) - v->s = "="; - else if (!num_ours) - v->s = "<"; - else if (!num_theirs) - v->s = ">"; - else - v->s = "<>"; - continue; - } else - die("unknown %.*s format %s", - (int)(formatp - name), name, formatp); - } - - if (!deref) - v->s = refname; - else { - int len = strlen(refname); - char *s = xmalloc(len + 4); - sprintf(s, "%s^{}", refname); - v->s = s; - } - } - - for (i = 0; i < used_atom_cnt; i++) { - struct atom_value *v = &ref->value[i]; - if (v->s == NULL) - goto need_obj; - } - return; - - need_obj: - buf = get_obj(ref->objectname, &obj, &size, &eaten); - if (!buf) - die("missing object %s for %s", - sha1_to_hex(ref->objectname), ref->refname); - if (!obj) - die("parse_object_buffer failed on %s for %s", - sha1_to_hex(ref->objectname), ref->refname); - - grab_values(ref->value, 0, obj, buf, size); - if (!eaten) - free(buf); - - /* - * If there is no atom that wants to know about tagged - * object, we are done. - */ - if (!need_tagged || (obj->type != OBJ_TAG)) - return; - - /* - * If it is a tag object, see if we use a value that derefs - * the object, and if we do grab the object it refers to. - */ - tagged = ((struct tag *)obj)->tagged->sha1; - - /* - * NEEDSWORK: This derefs tag only once, which - * is good to deal with chains of trust, but - * is not consistent with what deref_tag() does - * which peels the onion to the core. - */ - buf = get_obj(tagged, &obj, &size, &eaten); - if (!buf) - die("missing object %s for %s", - sha1_to_hex(tagged), ref->refname); - if (!obj) - die("parse_object_buffer failed on %s for %s", - sha1_to_hex(tagged), ref->refname); - grab_values(ref->value, 1, obj, buf, size); - if (!eaten) - free(buf); -} - -/* - * Given a ref, return the value for the atom. This lazily gets value - * out of the object by calling populate value. - */ -static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v) -{ - if (!ref->value) { - populate_value(ref); - fill_missing_values(ref->value); - } - *v = &ref->value[atom]; -} - -/* - * Return 1 if the refname matches one of the patterns, otherwise 0. - * A pattern can be path prefix (e.g. a refname "refs/heads/master" - * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref - * matches "refs/heads/m*",too). - */ -static int match_name_as_path(const char **pattern, const char *refname) -{ - int namelen = strlen(refname); - for (; *pattern; pattern++) { - const char *p = *pattern; - int plen = strlen(p); - - if ((plen <= namelen) && - !strncmp(refname, p, plen) && - (refname[plen] == '\0' || - refname[plen] == '/' || - p[plen-1] == '/')) - return 1; - if (!wildmatch(p, refname, WM_PATHNAME, NULL)) - return 1; - } - return 0; -} - -/* Allocate space for a new ref_array_item and copy the objectname and flag to it */ -static struct ref_array_item *new_ref_array_item(const char *refname, - const unsigned char *objectname, - int flag) -{ - struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item)); - ref->refname = xstrdup(refname); - hashcpy(ref->objectname, objectname); - ref->flag = flag; - - return ref; -} - -/* - * A call-back given to for_each_ref(). Filter refs and keep them for - * later object processing. - */ -int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data) -{ - struct ref_filter_cbdata *ref_cbdata = cb_data; - struct ref_filter *filter = &ref_cbdata->filter; - struct ref_array_item *ref; - - if (flag & REF_BAD_NAME) { - warning("ignoring ref with broken name %s", refname); - return 0; - } - - if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname)) - return 0; - - /* - * We do not open the object yet; sort may only need refname - * to do its job and the resulting list may yet to be pruned - * by maxcount logic. - */ - ref = new_ref_array_item(refname, oid->hash, flag); - - REALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1); - ref_cbdata->array.items[ref_cbdata->array.nr++] = ref; - return 0; -} - -/* Free memory allocated for a ref_array_item */ -static void free_array_item(struct ref_array_item *item) -{ - free((char *)item->symref); - free(item->refname); - free(item); -} - -/* Free all memory allocated for ref_array */ -void ref_array_clear(struct ref_array *array) -{ - int i; - - for (i = 0; i < array->nr; i++) - free_array_item(array->items[i]); - free(array->items); - array->items = NULL; - array->nr = array->alloc = 0; -} - -static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b) -{ - struct atom_value *va, *vb; - int cmp; - cmp_type cmp_type = used_atom_type[s->atom]; - - get_ref_atom_value(a, s->atom, &va); - get_ref_atom_value(b, s->atom, &vb); - switch (cmp_type) { - case FIELD_STR: - cmp = strcmp(va->s, vb->s); - break; - default: - if (va->ul < vb->ul) - cmp = -1; - else if (va->ul == vb->ul) - cmp = 0; - else - cmp = 1; - break; - } - return (s->reverse) ? -cmp : cmp; -} - -static struct ref_sorting *ref_sorting; -static int compare_refs(const void *a_, const void *b_) -{ - struct ref_array_item *a = *((struct ref_array_item **)a_); - struct ref_array_item *b = *((struct ref_array_item **)b_); - struct ref_sorting *s; - - for (s = ref_sorting; s; s = s->next) { - int cmp = cmp_ref_sorting(s, a, b); - if (cmp) - return cmp; - } - return 0; -} - -void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array) -{ - ref_sorting = sorting; - qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs); -} - -static void print_value(struct atom_value *v, int quote_style) -{ - struct strbuf sb = STRBUF_INIT; - switch (quote_style) { - case QUOTE_NONE: - fputs(v->s, stdout); - break; - case QUOTE_SHELL: - sq_quote_buf(&sb, v->s); - break; - case QUOTE_PERL: - perl_quote_buf(&sb, v->s); - break; - case QUOTE_PYTHON: - python_quote_buf(&sb, v->s); - break; - case QUOTE_TCL: - tcl_quote_buf(&sb, v->s); - break; - } - if (quote_style != QUOTE_NONE) { - fputs(sb.buf, stdout); - strbuf_release(&sb); - } -} - -static int hex1(char ch) -{ - if ('0' <= ch && ch <= '9') - return ch - '0'; - else if ('a' <= ch && ch <= 'f') - return ch - 'a' + 10; - else if ('A' <= ch && ch <= 'F') - return ch - 'A' + 10; - return -1; -} -static int hex2(const char *cp) -{ - if (cp[0] && cp[1]) - return (hex1(cp[0]) << 4) | hex1(cp[1]); - else - return -1; -} - -static void emit(const char *cp, const char *ep) -{ - while (*cp && (!ep || cp < ep)) { - if (*cp == '%') { - if (cp[1] == '%') - cp++; - else { - int ch = hex2(cp + 1); - if (0 <= ch) { - putchar(ch); - cp += 3; - continue; - } - } - } - putchar(*cp); - cp++; - } -} - -void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style) -{ - const char *cp, *sp, *ep; - - for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) { - struct atom_value *atomv; - - ep = strchr(sp, ')'); - if (cp < sp) - emit(cp, sp); - get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv); - print_value(atomv, quote_style); - } - if (*cp) { - sp = cp + strlen(cp); - emit(cp, sp); - } - if (need_color_reset_at_eol) { - struct atom_value resetv; - char color[COLOR_MAXLEN] = ""; - - if (color_parse("reset", color) < 0) - die("BUG: couldn't parse 'reset' as a color"); - resetv.s = color; - print_value(&resetv, quote_style); - } - putchar('\n'); -} - -/* If no sorting option is given, use refname to sort as default */ -struct ref_sorting *ref_default_sorting(void) -{ - static const char cstr_name[] = "refname"; - - struct ref_sorting *sorting = xcalloc(1, sizeof(*sorting)); - - sorting->next = NULL; - sorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); - return sorting; -} - -int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) -{ - struct ref_sorting **sorting_tail = opt->value; - struct ref_sorting *s; - int len; - - if (!arg) /* should --no-sort void the list ? */ - return -1; - - s = xcalloc(1, sizeof(*s)); - s->next = *sorting_tail; - *sorting_tail = s; - - if (*arg == '-') { - s->reverse = 1; - arg++; - } - len = strlen(arg); - s->atom = parse_ref_filter_atom(arg, arg+len); - return 0; -} - static char const * const for_each_ref_usage[] = { N_("git for-each-ref [<options>] [<pattern>]"), NULL diff --git a/ref-filter.c b/ref-filter.c new file mode 100644 index 0000000..f0dd0f2 --- /dev/null +++ b/ref-filter.c @@ -0,0 +1,1078 @@ +#include "builtin.h" +#include "cache.h" +#include "parse-options.h" +#include "refs.h" +#include "wildmatch.h" +#include "commit.h" +#include "remote.h" +#include "color.h" +#include "tag.h" +#include "quote.h" +#include "ref-filter.h" + +typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type; + +static struct { + const char *name; + cmp_type cmp_type; +} valid_atom[] = { + { "refname" }, + { "objecttype" }, + { "objectsize", FIELD_ULONG }, + { "objectname" }, + { "tree" }, + { "parent" }, + { "numparent", FIELD_ULONG }, + { "object" }, + { "type" }, + { "tag" }, + { "author" }, + { "authorname" }, + { "authoremail" }, + { "authordate", FIELD_TIME }, + { "committer" }, + { "committername" }, + { "committeremail" }, + { "committerdate", FIELD_TIME }, + { "tagger" }, + { "taggername" }, + { "taggeremail" }, + { "taggerdate", FIELD_TIME }, + { "creator" }, + { "creatordate", FIELD_TIME }, + { "subject" }, + { "body" }, + { "contents" }, + { "contents:subject" }, + { "contents:body" }, + { "contents:signature" }, + { "upstream" }, + { "push" }, + { "symref" }, + { "flag" }, + { "HEAD" }, + { "color" }, +}; + +/* + * An atom is a valid field atom listed above, possibly prefixed with + * a "*" to denote deref_tag(). + * + * We parse given format string and sort specifiers, and make a list + * of properties that we need to extract out of objects. ref_array_item + * structure will hold an array of values extracted that can be + * indexed with the "atom number", which is an index into this + * array. + */ +static const char **used_atom; +static cmp_type *used_atom_type; +static int used_atom_cnt, need_tagged, need_symref; +static int need_color_reset_at_eol; + +/* + * Used to parse format string and sort specifiers + */ +int parse_ref_filter_atom(const char *atom, const char *ep) +{ + const char *sp; + int i, at; + + sp = atom; + if (*sp == '*' && sp < ep) + sp++; /* deref */ + if (ep <= sp) + die("malformed field name: %.*s", (int)(ep-atom), atom); + + /* Do we have the atom already used elsewhere? */ + for (i = 0; i < used_atom_cnt; i++) { + int len = strlen(used_atom[i]); + if (len == ep - atom && !memcmp(used_atom[i], atom, len)) + return i; + } + + /* Is the atom a valid one? */ + for (i = 0; i < ARRAY_SIZE(valid_atom); i++) { + int len = strlen(valid_atom[i].name); + /* + * If the atom name has a colon, strip it and everything after + * it off - it specifies the format for this entry, and + * shouldn't be used for checking against the valid_atom + * table. + */ + const char *formatp = strchr(sp, ':'); + if (!formatp || ep < formatp) + formatp = ep; + if (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len)) + break; + } + + if (ARRAY_SIZE(valid_atom) <= i) + die("unknown field name: %.*s", (int)(ep-atom), atom); + + /* Add it in, including the deref prefix */ + at = used_atom_cnt; + used_atom_cnt++; + REALLOC_ARRAY(used_atom, used_atom_cnt); + REALLOC_ARRAY(used_atom_type, used_atom_cnt); + used_atom[at] = xmemdupz(atom, ep - atom); + used_atom_type[at] = valid_atom[i].cmp_type; + if (*atom == '*') + need_tagged = 1; + if (!strcmp(used_atom[at], "symref")) + need_symref = 1; + return at; +} + +/* + * In a format string, find the next occurrence of %(atom). + */ +static const char *find_next(const char *cp) +{ + while (*cp) { + if (*cp == '%') { + /* + * %( is the start of an atom; + * %% is a quoted per-cent. + */ + if (cp[1] == '(') + return cp; + else if (cp[1] == '%') + cp++; /* skip over two % */ + /* otherwise this is a singleton, literal % */ + } + cp++; + } + return NULL; +} + +/* + * Make sure the format string is well formed, and parse out + * the used atoms. + */ +int verify_ref_format(const char *format) +{ + const char *cp, *sp; + + need_color_reset_at_eol = 0; + for (cp = format; *cp && (sp = find_next(cp)); ) { + const char *color, *ep = strchr(sp, ')'); + int at; + + if (!ep) + return error("malformed format string %s", sp); + /* sp points at "%(" and ep points at the closing ")" */ + at = parse_ref_filter_atom(sp + 2, ep); + cp = ep + 1; + + if (skip_prefix(used_atom[at], "color:", &color)) + need_color_reset_at_eol = !!strcmp(color, "reset"); + } + return 0; +} + +/* + * Given an object name, read the object data and size, and return a + * "struct object". If the object data we are returning is also borrowed + * by the "struct object" representation, set *eaten as well---it is a + * signal from parse_object_buffer to us not to free the buffer. + */ +static void *get_obj(const unsigned char *sha1, struct object **obj, unsigned long *sz, int *eaten) +{ + enum object_type type; + void *buf = read_sha1_file(sha1, &type, sz); + + if (buf) + *obj = parse_object_buffer(sha1, type, *sz, buf, eaten); + else + *obj = NULL; + return buf; +} + +static int grab_objectname(const char *name, const unsigned char *sha1, + struct atom_value *v) +{ + if (!strcmp(name, "objectname")) { + char *s = xmalloc(41); + strcpy(s, sha1_to_hex(sha1)); + v->s = s; + return 1; + } + if (!strcmp(name, "objectname:short")) { + v->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); + return 1; + } + return 0; +} + +/* See grab_values */ +static void grab_common_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +{ + int i; + + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) + continue; + if (deref) + name++; + if (!strcmp(name, "objecttype")) + v->s = typename(obj->type); + else if (!strcmp(name, "objectsize")) { + char *s = xmalloc(40); + sprintf(s, "%lu", sz); + v->ul = sz; + v->s = s; + } + else if (deref) + grab_objectname(name, obj->sha1, v); + } +} + +/* See grab_values */ +static void grab_tag_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +{ + int i; + struct tag *tag = (struct tag *) obj; + + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) + continue; + if (deref) + name++; + if (!strcmp(name, "tag")) + v->s = tag->tag; + else if (!strcmp(name, "type") && tag->tagged) + v->s = typename(tag->tagged->type); + else if (!strcmp(name, "object") && tag->tagged) { + char *s = xmalloc(41); + strcpy(s, sha1_to_hex(tag->tagged->sha1)); + v->s = s; + } + } +} + +/* See grab_values */ +static void grab_commit_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +{ + int i; + struct commit *commit = (struct commit *) obj; + + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) + continue; + if (deref) + name++; + if (!strcmp(name, "tree")) { + char *s = xmalloc(41); + strcpy(s, sha1_to_hex(commit->tree->object.sha1)); + v->s = s; + } + if (!strcmp(name, "numparent")) { + char *s = xmalloc(40); + v->ul = commit_list_count(commit->parents); + sprintf(s, "%lu", v->ul); + v->s = s; + } + else if (!strcmp(name, "parent")) { + int num = commit_list_count(commit->parents); + int i; + struct commit_list *parents; + char *s = xmalloc(41 * num + 1); + v->s = s; + for (i = 0, parents = commit->parents; + parents; + parents = parents->next, i = i + 41) { + struct commit *parent = parents->item; + strcpy(s+i, sha1_to_hex(parent->object.sha1)); + if (parents->next) + s[i+40] = ' '; + } + if (!i) + *s = '\0'; + } + } +} + +static const char *find_wholine(const char *who, int wholen, const char *buf, unsigned long sz) +{ + const char *eol; + while (*buf) { + if (!strncmp(buf, who, wholen) && + buf[wholen] == ' ') + return buf + wholen + 1; + eol = strchr(buf, '\n'); + if (!eol) + return ""; + eol++; + if (*eol == '\n') + return ""; /* end of header */ + buf = eol; + } + return ""; +} + +static const char *copy_line(const char *buf) +{ + const char *eol = strchrnul(buf, '\n'); + return xmemdupz(buf, eol - buf); +} + +static const char *copy_name(const char *buf) +{ + const char *cp; + for (cp = buf; *cp && *cp != '\n'; cp++) { + if (!strncmp(cp, " <", 2)) + return xmemdupz(buf, cp - buf); + } + return ""; +} + +static const char *copy_email(const char *buf) +{ + const char *email = strchr(buf, '<'); + const char *eoemail; + if (!email) + return ""; + eoemail = strchr(email, '>'); + if (!eoemail) + return ""; + return xmemdupz(email, eoemail + 1 - email); +} + +static char *copy_subject(const char *buf, unsigned long len) +{ + char *r = xmemdupz(buf, len); + int i; + + for (i = 0; i < len; i++) + if (r[i] == '\n') + r[i] = ' '; + + return r; +} + +static void grab_date(const char *buf, struct atom_value *v, const char *atomname) +{ + const char *eoemail = strstr(buf, "> "); + char *zone; + unsigned long timestamp; + long tz; + enum date_mode date_mode = DATE_NORMAL; + const char *formatp; + + /* + * We got here because atomname ends in "date" or "date<something>"; + * it's not possible that <something> is not ":<format>" because + * parse_ref_filter_atom() wouldn't have allowed it, so we can assume that no + * ":" means no format is specified, and use the default. + */ + formatp = strchr(atomname, ':'); + if (formatp != NULL) { + formatp++; + date_mode = parse_date_format(formatp); + } + + if (!eoemail) + goto bad; + timestamp = strtoul(eoemail + 2, &zone, 10); + if (timestamp == ULONG_MAX) + goto bad; + tz = strtol(zone, NULL, 10); + if ((tz == LONG_MIN || tz == LONG_MAX) && errno == ERANGE) + goto bad; + v->s = xstrdup(show_date(timestamp, tz, date_mode)); + v->ul = timestamp; + return; + bad: + v->s = ""; + v->ul = 0; +} + +/* See grab_values */ +static void grab_person(const char *who, struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +{ + int i; + int wholen = strlen(who); + const char *wholine = NULL; + + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) + continue; + if (deref) + name++; + if (strncmp(who, name, wholen)) + continue; + if (name[wholen] != 0 && + strcmp(name + wholen, "name") && + strcmp(name + wholen, "email") && + !starts_with(name + wholen, "date")) + continue; + if (!wholine) + wholine = find_wholine(who, wholen, buf, sz); + if (!wholine) + return; /* no point looking for it */ + if (name[wholen] == 0) + v->s = copy_line(wholine); + else if (!strcmp(name + wholen, "name")) + v->s = copy_name(wholine); + else if (!strcmp(name + wholen, "email")) + v->s = copy_email(wholine); + else if (starts_with(name + wholen, "date")) + grab_date(wholine, v, name); + } + + /* + * For a tag or a commit object, if "creator" or "creatordate" is + * requested, do something special. + */ + if (strcmp(who, "tagger") && strcmp(who, "committer")) + return; /* "author" for commit object is not wanted */ + if (!wholine) + wholine = find_wholine(who, wholen, buf, sz); + if (!wholine) + return; + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) + continue; + if (deref) + name++; + + if (starts_with(name, "creatordate")) + grab_date(wholine, v, name); + else if (!strcmp(name, "creator")) + v->s = copy_line(wholine); + } +} + +static void find_subpos(const char *buf, unsigned long sz, + const char **sub, unsigned long *sublen, + const char **body, unsigned long *bodylen, + unsigned long *nonsiglen, + const char **sig, unsigned long *siglen) +{ + const char *eol; + /* skip past header until we hit empty line */ + while (*buf && *buf != '\n') { + eol = strchrnul(buf, '\n'); + if (*eol) + eol++; + buf = eol; + } + /* skip any empty lines */ + while (*buf == '\n') + buf++; + + /* parse signature first; we might not even have a subject line */ + *sig = buf + parse_signature(buf, strlen(buf)); + *siglen = strlen(*sig); + + /* subject is first non-empty line */ + *sub = buf; + /* subject goes to first empty line */ + while (buf < *sig && *buf && *buf != '\n') { + eol = strchrnul(buf, '\n'); + if (*eol) + eol++; + buf = eol; + } + *sublen = buf - *sub; + /* drop trailing newline, if present */ + if (*sublen && (*sub)[*sublen - 1] == '\n') + *sublen -= 1; + + /* skip any empty lines */ + while (*buf == '\n') + buf++; + *body = buf; + *bodylen = strlen(buf); + *nonsiglen = *sig - buf; +} + +/* See grab_values */ +static void grab_sub_body_contents(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +{ + int i; + const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL; + unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0; + + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &val[i]; + if (!!deref != (*name == '*')) + continue; + if (deref) + name++; + if (strcmp(name, "subject") && + strcmp(name, "body") && + strcmp(name, "contents") && + strcmp(name, "contents:subject") && + strcmp(name, "contents:body") && + strcmp(name, "contents:signature")) + continue; + if (!subpos) + find_subpos(buf, sz, + &subpos, &sublen, + &bodypos, &bodylen, &nonsiglen, + &sigpos, &siglen); + + if (!strcmp(name, "subject")) + v->s = copy_subject(subpos, sublen); + else if (!strcmp(name, "contents:subject")) + v->s = copy_subject(subpos, sublen); + else if (!strcmp(name, "body")) + v->s = xmemdupz(bodypos, bodylen); + else if (!strcmp(name, "contents:body")) + v->s = xmemdupz(bodypos, nonsiglen); + else if (!strcmp(name, "contents:signature")) + v->s = xmemdupz(sigpos, siglen); + else if (!strcmp(name, "contents")) + v->s = xstrdup(subpos); + } +} + +/* + * We want to have empty print-string for field requests + * that do not apply (e.g. "authordate" for a tag object) + */ +static void fill_missing_values(struct atom_value *val) +{ + int i; + for (i = 0; i < used_atom_cnt; i++) { + struct atom_value *v = &val[i]; + if (v->s == NULL) + v->s = ""; + } +} + +/* + * val is a list of atom_value to hold returned values. Extract + * the values for atoms in used_atom array out of (obj, buf, sz). + * when deref is false, (obj, buf, sz) is the object that is + * pointed at by the ref itself; otherwise it is the object the + * ref (which is a tag) refers to. + */ +static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf, unsigned long sz) +{ + grab_common_values(val, deref, obj, buf, sz); + switch (obj->type) { + case OBJ_TAG: + grab_tag_values(val, deref, obj, buf, sz); + grab_sub_body_contents(val, deref, obj, buf, sz); + grab_person("tagger", val, deref, obj, buf, sz); + break; + case OBJ_COMMIT: + grab_commit_values(val, deref, obj, buf, sz); + grab_sub_body_contents(val, deref, obj, buf, sz); + grab_person("author", val, deref, obj, buf, sz); + grab_person("committer", val, deref, obj, buf, sz); + break; + case OBJ_TREE: + /* grab_tree_values(val, deref, obj, buf, sz); */ + break; + case OBJ_BLOB: + /* grab_blob_values(val, deref, obj, buf, sz); */ + break; + default: + die("Eh? Object of type %d?", obj->type); + } +} + +static inline char *copy_advance(char *dst, const char *src) +{ + while (*src) + *dst++ = *src++; + return dst; +} + +/* + * Parse the object referred by ref, and grab needed value. + */ +static void populate_value(struct ref_array_item *ref) +{ + void *buf; + struct object *obj; + int eaten, i; + unsigned long size; + const unsigned char *tagged; + + ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value)); + + if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) { + unsigned char unused1[20]; + ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING, + unused1, NULL); + if (!ref->symref) + ref->symref = ""; + } + + /* Fill in specials first */ + for (i = 0; i < used_atom_cnt; i++) { + const char *name = used_atom[i]; + struct atom_value *v = &ref->value[i]; + int deref = 0; + const char *refname; + const char *formatp; + struct branch *branch = NULL; + + if (*name == '*') { + deref = 1; + name++; + } + + if (starts_with(name, "refname")) + refname = ref->refname; + else if (starts_with(name, "symref")) + refname = ref->symref ? ref->symref : ""; + else if (starts_with(name, "upstream")) { + const char *branch_name; + /* only local branches may have an upstream */ + if (!skip_prefix(ref->refname, "refs/heads/", + &branch_name)) + continue; + branch = branch_get(branch_name); + + refname = branch_get_upstream(branch, NULL); + if (!refname) + continue; + } else if (starts_with(name, "push")) { + const char *branch_name; + if (!skip_prefix(ref->refname, "refs/heads/", + &branch_name)) + continue; + branch = branch_get(branch_name); + + refname = branch_get_push(branch, NULL); + if (!refname) + continue; + } else if (starts_with(name, "color:")) { + char color[COLOR_MAXLEN] = ""; + + if (color_parse(name + 6, color) < 0) + die(_("unable to parse format")); + v->s = xstrdup(color); + continue; + } else if (!strcmp(name, "flag")) { + char buf[256], *cp = buf; + if (ref->flag & REF_ISSYMREF) + cp = copy_advance(cp, ",symref"); + if (ref->flag & REF_ISPACKED) + cp = copy_advance(cp, ",packed"); + if (cp == buf) + v->s = ""; + else { + *cp = '\0'; + v->s = xstrdup(buf + 1); + } + continue; + } else if (!deref && grab_objectname(name, ref->objectname, v)) { + continue; + } else if (!strcmp(name, "HEAD")) { + const char *head; + unsigned char sha1[20]; + + head = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, + sha1, NULL); + if (!strcmp(ref->refname, head)) + v->s = "*"; + else + v->s = " "; + continue; + } else + continue; + + formatp = strchr(name, ':'); + if (formatp) { + int num_ours, num_theirs; + + formatp++; + if (!strcmp(formatp, "short")) + refname = shorten_unambiguous_ref(refname, + warn_ambiguous_refs); + else if (!strcmp(formatp, "track") && + (starts_with(name, "upstream") || + starts_with(name, "push"))) { + char buf[40]; + + if (stat_tracking_info(branch, &num_ours, + &num_theirs, NULL)) + continue; + + if (!num_ours && !num_theirs) + v->s = ""; + else if (!num_ours) { + sprintf(buf, "[behind %d]", num_theirs); + v->s = xstrdup(buf); + } else if (!num_theirs) { + sprintf(buf, "[ahead %d]", num_ours); + v->s = xstrdup(buf); + } else { + sprintf(buf, "[ahead %d, behind %d]", + num_ours, num_theirs); + v->s = xstrdup(buf); + } + continue; + } else if (!strcmp(formatp, "trackshort") && + (starts_with(name, "upstream") || + starts_with(name, "push"))) { + assert(branch); + + if (stat_tracking_info(branch, &num_ours, + &num_theirs, NULL)) + continue; + + if (!num_ours && !num_theirs) + v->s = "="; + else if (!num_ours) + v->s = "<"; + else if (!num_theirs) + v->s = ">"; + else + v->s = "<>"; + continue; + } else + die("unknown %.*s format %s", + (int)(formatp - name), name, formatp); + } + + if (!deref) + v->s = refname; + else { + int len = strlen(refname); + char *s = xmalloc(len + 4); + sprintf(s, "%s^{}", refname); + v->s = s; + } + } + + for (i = 0; i < used_atom_cnt; i++) { + struct atom_value *v = &ref->value[i]; + if (v->s == NULL) + goto need_obj; + } + return; + + need_obj: + buf = get_obj(ref->objectname, &obj, &size, &eaten); + if (!buf) + die("missing object %s for %s", + sha1_to_hex(ref->objectname), ref->refname); + if (!obj) + die("parse_object_buffer failed on %s for %s", + sha1_to_hex(ref->objectname), ref->refname); + + grab_values(ref->value, 0, obj, buf, size); + if (!eaten) + free(buf); + + /* + * If there is no atom that wants to know about tagged + * object, we are done. + */ + if (!need_tagged || (obj->type != OBJ_TAG)) + return; + + /* + * If it is a tag object, see if we use a value that derefs + * the object, and if we do grab the object it refers to. + */ + tagged = ((struct tag *)obj)->tagged->sha1; + + /* + * NEEDSWORK: This derefs tag only once, which + * is good to deal with chains of trust, but + * is not consistent with what deref_tag() does + * which peels the onion to the core. + */ + buf = get_obj(tagged, &obj, &size, &eaten); + if (!buf) + die("missing object %s for %s", + sha1_to_hex(tagged), ref->refname); + if (!obj) + die("parse_object_buffer failed on %s for %s", + sha1_to_hex(tagged), ref->refname); + grab_values(ref->value, 1, obj, buf, size); + if (!eaten) + free(buf); +} + +/* + * Given a ref, return the value for the atom. This lazily gets value + * out of the object by calling populate value. + */ +static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom_value **v) +{ + if (!ref->value) { + populate_value(ref); + fill_missing_values(ref->value); + } + *v = &ref->value[atom]; +} + +/* + * Return 1 if the refname matches one of the patterns, otherwise 0. + * A pattern can be path prefix (e.g. a refname "refs/heads/master" + * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref + * matches "refs/heads/m*",too). + */ +static int match_name_as_path(const char **pattern, const char *refname) +{ + int namelen = strlen(refname); + for (; *pattern; pattern++) { + const char *p = *pattern; + int plen = strlen(p); + + if ((plen <= namelen) && + !strncmp(refname, p, plen) && + (refname[plen] == '\0' || + refname[plen] == '/' || + p[plen-1] == '/')) + return 1; + if (!wildmatch(p, refname, WM_PATHNAME, NULL)) + return 1; + } + return 0; +} + +/* Allocate space for a new ref_array_item and copy the objectname and flag to it */ +static struct ref_array_item *new_ref_array_item(const char *refname, + const unsigned char *objectname, + int flag) +{ + struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item)); + ref->refname = xstrdup(refname); + hashcpy(ref->objectname, objectname); + ref->flag = flag; + + return ref; +} + +/* + * A call-back given to for_each_ref(). Filter refs and keep them for + * later object processing. + */ +int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data) +{ + struct ref_filter_cbdata *ref_cbdata = cb_data; + struct ref_filter *filter = &ref_cbdata->filter; + struct ref_array_item *ref; + + if (flag & REF_BAD_NAME) { + warning("ignoring ref with broken name %s", refname); + return 0; + } + + if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname)) + return 0; + + /* + * We do not open the object yet; sort may only need refname + * to do its job and the resulting list may yet to be pruned + * by maxcount logic. + */ + ref = new_ref_array_item(refname, oid->hash, flag); + + REALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1); + ref_cbdata->array.items[ref_cbdata->array.nr++] = ref; + return 0; +} + +/* Free memory allocated for a ref_array_item */ +static void free_array_item(struct ref_array_item *item) +{ + free((char *)item->symref); + free(item->refname); + free(item); +} + +/* Free all memory allocated for ref_array */ +void ref_array_clear(struct ref_array *array) +{ + int i; + + for (i = 0; i < array->nr; i++) + free_array_item(array->items[i]); + free(array->items); + array->items = NULL; + array->nr = array->alloc = 0; +} + +static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b) +{ + struct atom_value *va, *vb; + int cmp; + cmp_type cmp_type = used_atom_type[s->atom]; + + get_ref_atom_value(a, s->atom, &va); + get_ref_atom_value(b, s->atom, &vb); + switch (cmp_type) { + case FIELD_STR: + cmp = strcmp(va->s, vb->s); + break; + default: + if (va->ul < vb->ul) + cmp = -1; + else if (va->ul == vb->ul) + cmp = 0; + else + cmp = 1; + break; + } + return (s->reverse) ? -cmp : cmp; +} + +static struct ref_sorting *ref_sorting; +static int compare_refs(const void *a_, const void *b_) +{ + struct ref_array_item *a = *((struct ref_array_item **)a_); + struct ref_array_item *b = *((struct ref_array_item **)b_); + struct ref_sorting *s; + + for (s = ref_sorting; s; s = s->next) { + int cmp = cmp_ref_sorting(s, a, b); + if (cmp) + return cmp; + } + return 0; +} + +void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array) +{ + ref_sorting = sorting; + qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs); +} + +static void print_value(struct atom_value *v, int quote_style) +{ + struct strbuf sb = STRBUF_INIT; + switch (quote_style) { + case QUOTE_NONE: + fputs(v->s, stdout); + break; + case QUOTE_SHELL: + sq_quote_buf(&sb, v->s); + break; + case QUOTE_PERL: + perl_quote_buf(&sb, v->s); + break; + case QUOTE_PYTHON: + python_quote_buf(&sb, v->s); + break; + case QUOTE_TCL: + tcl_quote_buf(&sb, v->s); + break; + } + if (quote_style != QUOTE_NONE) { + fputs(sb.buf, stdout); + strbuf_release(&sb); + } +} + +static int hex1(char ch) +{ + if ('0' <= ch && ch <= '9') + return ch - '0'; + else if ('a' <= ch && ch <= 'f') + return ch - 'a' + 10; + else if ('A' <= ch && ch <= 'F') + return ch - 'A' + 10; + return -1; +} +static int hex2(const char *cp) +{ + if (cp[0] && cp[1]) + return (hex1(cp[0]) << 4) | hex1(cp[1]); + else + return -1; +} + +static void emit(const char *cp, const char *ep) +{ + while (*cp && (!ep || cp < ep)) { + if (*cp == '%') { + if (cp[1] == '%') + cp++; + else { + int ch = hex2(cp + 1); + if (0 <= ch) { + putchar(ch); + cp += 3; + continue; + } + } + } + putchar(*cp); + cp++; + } +} + +void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style) +{ + const char *cp, *sp, *ep; + + for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) { + struct atom_value *atomv; + + ep = strchr(sp, ')'); + if (cp < sp) + emit(cp, sp); + get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv); + print_value(atomv, quote_style); + } + if (*cp) { + sp = cp + strlen(cp); + emit(cp, sp); + } + if (need_color_reset_at_eol) { + struct atom_value resetv; + char color[COLOR_MAXLEN] = ""; + + if (color_parse("reset", color) < 0) + die("BUG: couldn't parse 'reset' as a color"); + resetv.s = color; + print_value(&resetv, quote_style); + } + putchar('\n'); +} + +/* If no sorting option is given, use refname to sort as default */ +struct ref_sorting *ref_default_sorting(void) +{ + static const char cstr_name[] = "refname"; + + struct ref_sorting *sorting = xcalloc(1, sizeof(*sorting)); + + sorting->next = NULL; + sorting->atom = parse_ref_filter_atom(cstr_name, cstr_name + strlen(cstr_name)); + return sorting; +} + +int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset) +{ + struct ref_sorting **sorting_tail = opt->value; + struct ref_sorting *s; + int len; + + if (!arg) /* should --no-sort void the list ? */ + return -1; + + s = xcalloc(1, sizeof(*s)); + s->next = *sorting_tail; + *sorting_tail = s; + + if (*arg == '-') { + s->reverse = 1; + arg++; + } + len = strlen(arg); + s->atom = parse_ref_filter_atom(arg, arg+len); + return 0; +} -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 10/11] for-each-ref: introduce filter_refs() 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (7 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 09/11] ref-filter: move code from 'for-each-ref' Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname Karthik Nayak 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak Introduce filter_refs() which will act as an API for filtering a set of refs. Based on the type of refs the user has requested, we iterate through those refs and apply filters as per the given ref_filter structure and finally store the filtered refs in the ref_array structure. Currently this will wrap around ref_filter_handler(). Hence, ref_filter_handler is made file scope static. As users of this API will no longer send a ref_filter_cbdata structure directly, we make the elements of ref_filter_cbdata pointers. We can now use the information given by the users to obtain our own ref_filter_cbdata structure. Changes are made to support the change in ref_filter_cbdata structure. Make 'for-each-ref' use this API. Helped-by: Junio C Hamano <gitster@pobox.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- builtin/for-each-ref.c | 21 +++++++++++---------- ref-filter.c | 30 ++++++++++++++++++++++++++---- ref-filter.h | 16 ++++++++++++---- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 637fc4a..7919206 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -16,7 +16,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) const char *format = "%(objectname) %(objecttype)\t%(refname)"; struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; int maxcount = 0, quote_style = 0; - struct ref_filter_cbdata ref_cbdata; + struct ref_array array; + struct ref_filter filter; struct option opts[] = { OPT_BIT('s', "shell", "e_style, @@ -54,16 +55,16 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) /* for warn_ambiguous_refs */ git_config(git_default_config, NULL); - memset(&ref_cbdata, 0, sizeof(ref_cbdata)); - ref_cbdata.filter.name_patterns = argv; - for_each_rawref(ref_filter_handler, &ref_cbdata); + memset(&array, 0, sizeof(array)); + memset(&filter, 0, sizeof(filter)); + filter.name_patterns = argv; + filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN); + ref_array_sort(sorting, &array); - ref_array_sort(sorting, &ref_cbdata.array); - - if (!maxcount || ref_cbdata.array.nr < maxcount) - maxcount = ref_cbdata.array.nr; + if (!maxcount || array.nr < maxcount) + maxcount = array.nr; for (i = 0; i < maxcount; i++) - show_ref_array_item(ref_cbdata.array.items[i], format, quote_style); - ref_array_clear(&ref_cbdata.array); + show_ref_array_item(array.items[i], format, quote_style); + ref_array_clear(&array); return 0; } diff --git a/ref-filter.c b/ref-filter.c index f0dd0f2..a1151e0 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -859,10 +859,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname, * A call-back given to for_each_ref(). Filter refs and keep them for * later object processing. */ -int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data) +static int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data) { struct ref_filter_cbdata *ref_cbdata = cb_data; - struct ref_filter *filter = &ref_cbdata->filter; + struct ref_filter *filter = ref_cbdata->filter; struct ref_array_item *ref; if (flag & REF_BAD_NAME) { @@ -880,8 +880,8 @@ int ref_filter_handler(const char *refname, const struct object_id *oid, int fla */ ref = new_ref_array_item(refname, oid->hash, flag); - REALLOC_ARRAY(ref_cbdata->array.items, ref_cbdata->array.nr + 1); - ref_cbdata->array.items[ref_cbdata->array.nr++] = ref; + REALLOC_ARRAY(ref_cbdata->array->items, ref_cbdata->array->nr + 1); + ref_cbdata->array->items[ref_cbdata->array->nr++] = ref; return 0; } @@ -905,6 +905,28 @@ void ref_array_clear(struct ref_array *array) array->nr = array->alloc = 0; } +/* + * API for filtering a set of refs. Based on the type of refs the user + * has requested, we iterate through those refs and apply filters + * as per the given ref_filter structure and finally store the + * filtered refs in the ref_array structure. + */ +int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type) +{ + struct ref_filter_cbdata ref_cbdata; + + ref_cbdata.array = array; + ref_cbdata.filter = filter; + + if (type & (FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN)) + return for_each_rawref(ref_filter_handler, &ref_cbdata); + else if (type & FILTER_REFS_ALL) + return for_each_ref(ref_filter_handler, &ref_cbdata); + else + die("filter_refs: invalid type"); + return 0; +} + static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b) { struct atom_value *va, *vb; diff --git a/ref-filter.h b/ref-filter.h index 506ac8f..697b609 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -13,6 +13,9 @@ #define QUOTE_PYTHON 4 #define QUOTE_TCL 8 +#define FILTER_REFS_INCLUDE_BROKEN 0x1 +#define FILTER_REFS_ALL 0x2 + struct atom_value { const char *s; unsigned long ul; /* used for sorting when not FIELD_STR */ @@ -42,12 +45,17 @@ struct ref_filter { }; struct ref_filter_cbdata { - struct ref_array array; - struct ref_filter filter; + struct ref_array *array; + struct ref_filter *filter; }; -/* Callback function for for_each_*ref(). This filters the refs based on the filters set */ -int ref_filter_handler(const char *refname, const struct object_id *oid, int flag, void *cb_data); +/* + * API for filtering a set of refs. Based on the type of refs the user + * has requested, we iterate through those refs and apply filters + * as per the given ref_filter structure and finally store the + * filtered refs in the ref_array structure. + */ +int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type); /* Clear all memory allocated to ref_array */ void ref_array_clear(struct ref_array *array); /* Parse format string and sort specifiers */ -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v8 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak ` (8 preceding siblings ...) 2015-06-13 19:37 ` [PATCH v8 10/11] for-each-ref: introduce filter_refs() Karthik Nayak @ 2015-06-13 19:37 ` Karthik Nayak 9 siblings, 0 replies; 16+ messages in thread From: Karthik Nayak @ 2015-06-13 19:37 UTC (permalink / raw) To: git; +Cc: christian.couder, Matthieu.Moy, Karthik Nayak This would remove the need of using a pointer to store refname. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Karthik Nayak <karthik.188@gmail.com> --- ref-filter.c | 7 ++++--- ref-filter.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index a1151e0..43502a4 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -847,8 +847,10 @@ static struct ref_array_item *new_ref_array_item(const char *refname, const unsigned char *objectname, int flag) { - struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item)); - ref->refname = xstrdup(refname); + size_t len = strlen(refname); + struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item) + len + 1); + memcpy(ref->refname, refname, len); + ref->refname[len] = '\0'; hashcpy(ref->objectname, objectname); ref->flag = flag; @@ -889,7 +891,6 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid, static void free_array_item(struct ref_array_item *item) { free((char *)item->symref); - free(item->refname); free(item); } diff --git a/ref-filter.h b/ref-filter.h index 697b609..6997984 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -32,7 +32,7 @@ struct ref_array_item { int flag; const char *symref; struct atom_value *value; - char *refname; + char refname[FLEX_ARRAY]; }; struct ref_array { -- 2.4.3.435.g2403634.dirty ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v8 0/11] Create ref-filter from for-each-ref 2015-06-13 19:34 [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak @ 2015-06-14 8:04 ` Matthieu Moy 2015-06-14 8:24 ` karthik nayak 2015-06-15 18:49 ` Junio C Hamano 2 siblings, 1 reply; 16+ messages in thread From: Matthieu Moy @ 2015-06-14 8:04 UTC (permalink / raw) To: karthik nayak; +Cc: Git, Christian Couder, Junio C Hamano karthik nayak <karthik.188@gmail.com> writes: > The previous version of the patch can be found at : > http://thread.gmane.org/gmane.comp.version-control.git/271423 > > Changes : > * Removed an unnecessary commit (v7 3/12) > * Change a comment in 01/11 (v8) And change the order of parameters in ref_filter. More precisely the diff with v7 is the following, and it looks good to me: diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index e2f15e6..7919206 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -58,7 +58,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) memset(&array, 0, sizeof(array)); memset(&filter, 0, sizeof(filter)); filter.name_patterns = argv; - filter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN, &filter); + filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN); ref_array_sort(sorting, &array); if (!maxcount || array.nr < maxcount) diff --git a/ref-filter.c b/ref-filter.c index 310ecd6..43502a4 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -818,10 +818,10 @@ static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom } /* - * Return 1 if the refname matches with one of the patterns, - * otherwise 0. The patterns can be literal prefix (e.g. a - * refname "refs/heads/master" matches a pattern "refs/heads/") - * or a wildcard (e.g. the same ref matches "refs/heads/m*",too). + * Return 1 if the refname matches one of the patterns, otherwise 0. + * A pattern can be path prefix (e.g. a refname "refs/heads/master" + * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref + * matches "refs/heads/m*",too). */ static int match_name_as_path(const char **pattern, const char *refname) { @@ -912,7 +912,7 @@ void ref_array_clear(struct ref_array *array) * as per the given ref_filter structure and finally store the * filtered refs in the ref_array structure. */ -int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter) +int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type) { struct ref_filter_cbdata ref_cbdata; diff --git a/ref-filter.h b/ref-filter.h index 6ab2a75..6997984 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -23,7 +23,7 @@ struct atom_value { struct ref_sorting { struct ref_sorting *next; - int atom; /* index into 'struct atom_value *' array */ + int atom; /* index into used_atom array (internal) */ unsigned reverse : 1; }; @@ -55,7 +55,7 @@ struct ref_filter_cbdata { * as per the given ref_filter structure and finally store the * filtered refs in the ref_array structure. */ -int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter); +int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type); /* Clear all memory allocated to ref_array */ void ref_array_clear(struct ref_array *array); /* Parse format string and sort specifiers */ -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v8 0/11] Create ref-filter from for-each-ref 2015-06-14 8:04 ` [PATCH v8 0/11] Create ref-filter from for-each-ref Matthieu Moy @ 2015-06-14 8:24 ` karthik nayak 0 siblings, 0 replies; 16+ messages in thread From: karthik nayak @ 2015-06-14 8:24 UTC (permalink / raw) To: Matthieu Moy; +Cc: Git, Christian Couder, Junio C Hamano On Sun, Jun 14, 2015 at 1:34 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote: > karthik nayak <karthik.188@gmail.com> writes: > >> The previous version of the patch can be found at : >> http://thread.gmane.org/gmane.comp.version-control.git/271423 >> >> Changes : >> * Removed an unnecessary commit (v7 3/12) >> * Change a comment in 01/11 (v8) > > And change the order of parameters in ref_filter. More precisely the > diff with v7 is the following, and it looks good to me: > > diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c > index e2f15e6..7919206 100644 > --- a/builtin/for-each-ref.c > +++ b/builtin/for-each-ref.c > @@ -58,7 +58,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) > memset(&array, 0, sizeof(array)); > memset(&filter, 0, sizeof(filter)); > filter.name_patterns = argv; > - filter_refs(&array, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN, &filter); > + filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN); > ref_array_sort(sorting, &array); > > if (!maxcount || array.nr < maxcount) > diff --git a/ref-filter.c b/ref-filter.c > index 310ecd6..43502a4 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -818,10 +818,10 @@ static void get_ref_atom_value(struct ref_array_item *ref, int atom, struct atom > } > > /* > - * Return 1 if the refname matches with one of the patterns, > - * otherwise 0. The patterns can be literal prefix (e.g. a > - * refname "refs/heads/master" matches a pattern "refs/heads/") > - * or a wildcard (e.g. the same ref matches "refs/heads/m*",too). > + * Return 1 if the refname matches one of the patterns, otherwise 0. > + * A pattern can be path prefix (e.g. a refname "refs/heads/master" > + * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref > + * matches "refs/heads/m*",too). > */ > static int match_name_as_path(const char **pattern, const char *refname) > { > @@ -912,7 +912,7 @@ void ref_array_clear(struct ref_array *array) > * as per the given ref_filter structure and finally store the > * filtered refs in the ref_array structure. > */ > -int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter) > +int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type) > { > struct ref_filter_cbdata ref_cbdata; > > diff --git a/ref-filter.h b/ref-filter.h > index 6ab2a75..6997984 100644 > --- a/ref-filter.h > +++ b/ref-filter.h > @@ -23,7 +23,7 @@ struct atom_value { > > struct ref_sorting { > struct ref_sorting *next; > - int atom; /* index into 'struct atom_value *' array */ > + int atom; /* index into used_atom array (internal) */ > unsigned reverse : 1; > }; > > @@ -55,7 +55,7 @@ struct ref_filter_cbdata { > * as per the given ref_filter structure and finally store the > * filtered refs in the ref_array structure. > */ > -int filter_refs(struct ref_array *array, unsigned int type, struct ref_filter *filter); > +int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type); > /* Clear all memory allocated to ref_array */ > void ref_array_clear(struct ref_array *array); > /* Parse format string and sort specifiers */ > > -- > Matthieu Moy > http://www-verimag.imag.fr/~moy/ Thanks for summing it up. -- Regards, Karthik Nayak ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v8 0/11] Create ref-filter from for-each-ref 2015-06-13 19:34 [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak 2015-06-14 8:04 ` [PATCH v8 0/11] Create ref-filter from for-each-ref Matthieu Moy @ 2015-06-15 18:49 ` Junio C Hamano 2015-06-15 20:47 ` karthik nayak 2 siblings, 1 reply; 16+ messages in thread From: Junio C Hamano @ 2015-06-15 18:49 UTC (permalink / raw) To: karthik nayak; +Cc: Git, Christian Couder, Matthieu Moy karthik nayak <karthik.188@gmail.com> writes: > The previous version of the patch can be found at : > http://thread.gmane.org/gmane.comp.version-control.git/271423 > > Changes : > * Removed an unnecessary commit (v7 3/12) > * Change a comment in 01/11 (v8) > > Total changes : > > Makefile | 1 + > builtin/for-each-ref.c | 1108 > +++------------------------------------------------------------------------------------------------------------------- > ref-filter.c | 1101 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > ref-filter.h | 74 ++++++++ > 4 files changed, 1195 insertions(+), 1089 deletions(-) This round looks good enough to build on top by merging more interesting bits from tags and branches ;-) Let's conclude this series at this round and then incrementally fix if there is any remaining nits discovered later. Thanks all. ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v8 0/11] Create ref-filter from for-each-ref 2015-06-15 18:49 ` Junio C Hamano @ 2015-06-15 20:47 ` karthik nayak 0 siblings, 0 replies; 16+ messages in thread From: karthik nayak @ 2015-06-15 20:47 UTC (permalink / raw) To: Junio C Hamano; +Cc: Git, Christian Couder, Matthieu Moy On Tue, Jun 16, 2015 at 12:19 AM, Junio C Hamano <gitster@pobox.com> wrote: > karthik nayak <karthik.188@gmail.com> writes: > >> The previous version of the patch can be found at : >> http://thread.gmane.org/gmane.comp.version-control.git/271423 >> >> Changes : >> * Removed an unnecessary commit (v7 3/12) >> * Change a comment in 01/11 (v8) >> >> Total changes : >> >> Makefile | 1 + >> builtin/for-each-ref.c | 1108 >> +++------------------------------------------------------------------------------------------------------------------- >> ref-filter.c | 1101 >> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> ref-filter.h | 74 ++++++++ >> 4 files changed, 1195 insertions(+), 1089 deletions(-) > > This round looks good enough to build on top by merging more > interesting bits from tags and branches ;-) Let's conclude > this series at this round and then incrementally fix if there > is any remaining nits discovered later. > > Thanks all. Sounds good, thanks for all the suggestions everyone. -- Regards, Karthik Nayak ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2015-06-15 20:48 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-06-13 19:34 [PATCH v8 0/11] Create ref-filter from for-each-ref karthik nayak 2015-06-13 19:37 ` [PATCH v8 01/11] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 02/11] for-each-ref: clean up code Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 03/11] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 04/11] for-each-ref: introduce new structures for better organisation Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 05/11] for-each-ref: introduce 'ref_array_clear()' Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 06/11] for-each-ref: rename some functions and make them public Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 07/11] for-each-ref: rename variables called sort to sorting Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 08/11] ref-filter: add 'ref-filter.h' Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 09/11] ref-filter: move code from 'for-each-ref' Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 10/11] for-each-ref: introduce filter_refs() Karthik Nayak 2015-06-13 19:37 ` [PATCH v8 11/11] ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname Karthik Nayak 2015-06-14 8:04 ` [PATCH v8 0/11] Create ref-filter from for-each-ref Matthieu Moy 2015-06-14 8:24 ` karthik nayak 2015-06-15 18:49 ` Junio C Hamano 2015-06-15 20:47 ` karthik nayak
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.