shortlog: support --pretty=format: option

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index dcf08e089abc053bfecebc9b73fe870236915acd..fa68c651424e406ce84c890a655a5e292a7e5af6 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -1,6 +1,8 @@
 #ifndef REVISION_H
 #define REVISION_H
 
+#include "parse-options.h"
+
 #define SEEN           (1u<<0)
 #define UNINTERESTING   (1u<<1)
 #define TREESAME       (1u<<2)
@@ -11,6 +13,7 @@
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
 #define SYMMETRIC_LEFT (1u<<8)
 #define TOPOSORT       (1u<<9) /* In the active toposort list.. */
+#define ALL_REV_FLAGS  ((1u<<10)-1)
 
 struct rev_info;
 struct log_info;
@@ -25,6 +28,7 @@ struct rev_info {
 
        /* Basic information */
        const char *prefix;
+       const char *def;
        void *prune_data;
        unsigned int early_output;
 
@@ -65,6 +69,7 @@ struct rev_info {
 
        /* Format info */
        unsigned int    shown_one:1,
+                       show_merge:1,
                        abbrev_commit:1,
                        use_terminator:1,
                        missing_newline:1;
@@ -112,11 +117,16 @@ struct rev_info {
 #define REV_TREE_DIFFERENT     2
 
 /* revision.c */
+void read_revisions_from_stdin(struct rev_info *revs);
+
 typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
 volatile show_early_output_fn_t show_early_output;
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
+extern void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
+                                const struct option *options,
+                                const char * const usagestr[]);
 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
 
 extern int prepare_revision_walk(struct rev_info *revs);