From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
Karthik Nayak <karthik.188@gmail.com>
Subject: [WIP/PATCH v4 8/8] ref-filter: add 'ref-filter.h'
Date: Sat, 30 May 2015 23:23:31 +0530 [thread overview]
Message-ID: <1433008411-8550-8-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <5569EF77.4010300@gmail.com>
Create 'ref-filter.h', also add ref-filter to the Makefile.
This completes movement of creation of 'ref-filter' from
'for-each-ref'.
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 | 41 +------------------------------
ref-filter.c | 1 +
ref-filter.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 69 insertions(+), 40 deletions(-)
create mode 100644 ref-filter.h
diff --git a/Makefile b/Makefile
index 323c401..ad455a3 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 65ed954..2f11c01 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -2,46 +2,7 @@
#include "cache.h"
#include "refs.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_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;
-};
+#include "ref-filter.h"
static char const * const for_each_ref_usage[] = {
N_("git for-each-ref [<options>] [<pattern>]"),
diff --git a/ref-filter.c b/ref-filter.c
index 2a8f504..1c73750 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2,6 +2,7 @@
#include "cache.h"
#include "parse-options.h"
#include "refs.h"
+#include "ref-filter.h"
#include "wildmatch.h"
#include "commit.h"
#include "remote.h"
diff --git a/ref-filter.h b/ref-filter.h
new file mode 100644
index 0000000..dacae59
--- /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_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;
+};
+
+/* Callback function for for_each_*ref(). This filters the refs based on the filters set */
+int ref_filter_handler(const char *refname, const unsigned char *sha1, int flag, void *cb_data);
+/* Clear all memory allocated to ref_filter_data */
+void ref_filter_clear_data(struct ref_filter_cbdata *ref_cbdata);
+/* 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_sort provided */
+void sort_ref_array(struct ref_sort *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 opt_parse_ref_sort(const struct option *opt, const char *arg, int unset);
+/* Default sort option based on refname */
+struct ref_sort *ref_default_sort(void);
+
+#endif /* REF_FILTER_H */
--
2.4.2
next prev parent reply other threads:[~2015-05-30 17:54 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5569EF77.4010300@gmail.com>
2015-05-30 17:53 ` [WIP/PATCH v4 1/8] for-each-ref: extract helper functions out of grab_single_ref() Karthik Nayak
2015-05-31 2:58 ` Eric Sunshine
2015-05-31 8:11 ` Karthik Nayak
2015-05-31 17:34 ` Junio C Hamano
2015-05-31 17:48 ` Karthik Nayak
2015-05-31 20:39 ` Matthieu Moy
2015-06-01 14:39 ` Junio C Hamano
2015-05-30 17:53 ` [WIP/PATCH v4 2/8] for-each-ref: simplify code Karthik Nayak
2015-05-30 17:53 ` [WIP/PATCH v4 3/8] for-each-ref: rename 'refinfo' to 'ref_array_item' Karthik Nayak
2015-05-31 17:37 ` Junio C Hamano
2015-05-31 17:48 ` Karthik Nayak
2015-05-30 17:53 ` [WIP/PATCH v4 4/8] for-each-ref: introduce new structures for better organisation Karthik Nayak
2015-05-31 3:14 ` Eric Sunshine
2015-05-31 8:16 ` Karthik Nayak
2015-05-30 17:53 ` [WIP/PATCH v4 5/8] for-each-ref: introduce 'ref_filter_clear_data()' Karthik Nayak
2015-05-31 7:38 ` Christian Couder
2015-05-31 8:20 ` Karthik Nayak
2015-05-30 17:53 ` [WIP/PATCH v4 6/8] for-each-ref: rename some functions and make them public Karthik Nayak
2015-05-31 3:21 ` Eric Sunshine
2015-05-31 8:16 ` Karthik Nayak
2015-05-31 8:04 ` Christian Couder
2015-05-31 8:11 ` Christian Couder
2015-05-31 9:17 ` Karthik Nayak
2015-05-31 14:03 ` Christian Couder
2015-05-31 15:30 ` Karthik Nayak
2015-06-01 6:38 ` Matthieu Moy
2015-06-01 19:28 ` Karthik Nayak
2015-05-31 17:54 ` Junio C Hamano
2015-05-31 17:48 ` Junio C Hamano
2015-05-31 19:34 ` Karthik Nayak
2015-06-01 14:53 ` Junio C Hamano
2015-06-01 19:35 ` Karthik Nayak
2015-05-30 17:53 ` [WIP/PATCH v4 7/8] ref-filter: move code from 'for-each-ref' Karthik Nayak
2015-05-30 17:53 ` Karthik Nayak [this message]
2015-05-31 3:43 ` [WIP/PATCH v4 8/8] ref-filter: add 'ref-filter.h' Eric Sunshine
2015-05-31 8:19 ` Karthik Nayak
2015-05-31 8:29 ` Eric Sunshine
2015-05-31 9:12 ` Karthik Nayak
2015-05-31 20:46 ` Matthieu Moy
2015-05-31 20:50 ` Karthik Nayak
2015-05-31 22:34 ` Christian Couder
2015-06-01 6:47 ` Matthieu Moy
2015-05-31 8:20 ` Christian Couder
2015-05-31 9:16 ` Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433008411-8550-8-git-send-email-karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).