#ifndef REVISION_H
#define REVISION_H
-/*
- * The low 16 bits of the "flags" field shows whether
- * a commit is part of the path to the root for that
- * parent.
- *
- * Bit 16 is an internal flag that we've seen the
- * definition for this rev, and not just seen it as
- * a parent target.
- */
-#define marked(rev) ((rev)->flags & 0xffff)
-#define SEEN 0x10000
-#define USED 0x20000
-#define REACHABLE 0x40000
-
-struct parent {
- struct revision *parent;
- struct parent *next;
+#include "parse-options.h"
+#include "grep.h"
+#include "notes.h"
+
+#define SEEN (1u<<0)
+#define UNINTERESTING (1u<<1)
+#define TREESAME (1u<<2)
+#define SHOWN (1u<<3)
+#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
+#define BOUNDARY (1u<<5)
+#define CHILD_SHOWN (1u<<6)
+#define ADDED (1u<<7) /* Parents already parsed and added? */
+#define SYMMETRIC_LEFT (1u<<8)
+#define PATCHSAME (1u<<9)
+#define ALL_REV_FLAGS ((1u<<10)-1)
+
+#define DECORATE_SHORT_REFS 1
+#define DECORATE_FULL_REFS 2
+
+struct rev_info;
+struct log_info;
+struct string_list;
+
+struct rev_cmdline_info {
+ unsigned int nr;
+ unsigned int alloc;
+ struct rev_cmdline_entry {
+ struct object *item;
+ const char *name;
+ enum {
+ REV_CMD_REF,
+ REV_CMD_PARENTS_ONLY,
+ REV_CMD_LEFT,
+ REV_CMD_RIGHT,
+ REV_CMD_REV
+ } whence;
+ unsigned flags;
+ } *rev;
};
-struct revision {
- unsigned int flags;
- unsigned char sha1[20];
- unsigned long date;
- struct parent *parent;
- char tag[1];
+struct rev_info {
+ /* Starting list */
+ struct commit_list *commits;
+ struct object_array pending;
+
+ /* Parents of shown commits */
+ struct object_array boundary_commits;
+
+ /* The end-points specified by the end user */
+ struct rev_cmdline_info cmdline;
+
+ /* Basic information */
+ const char *prefix;
+ const char *def;
+ struct pathspec prune_data;
+ unsigned int early_output:1,
+ ignore_missing:1;
+
+ /* Traversal flags */
+ unsigned int dense:1,
+ prune:1,
+ no_walk:1,
+ show_all:1,
+ remove_empty_trees:1,
+ simplify_history:1,
+ lifo:1,
+ topo_order:1,
+ simplify_merges:1,
+ simplify_by_decoration:1,
+ tag_objects:1,
+ tree_objects:1,
+ blob_objects:1,
+ verify_objects:1,
+ edge_hint:1,
+ limited:1,
+ unpacked:1,
+ boundary:2,
+ count:1,
+ left_right:1,
+ left_only:1,
+ right_only:1,
+ rewrite_parents:1,
+ print_parents:1,
+ show_source:1,
+ show_decorations:1,
+ reverse:1,
+ reverse_output_stage:1,
+ cherry_pick:1,
+ cherry_mark:1,
+ bisect:1,
+ ancestry_path:1,
+ first_parent_only:1;
+
+ /* Diff flags */
+ unsigned int diff:1,
+ full_diff:1,
+ show_root_diff:1,
+ no_commit_id:1,
+ verbose_header:1,
+ ignore_merges:1,
+ combine_merges:1,
+ dense_combined_merges:1,
+ always_show_header:1;
+
+ /* Format info */
+ unsigned int shown_one:1,
+ show_merge:1,
+ show_notes:1,
+ show_notes_given:1,
+ show_signature:1,
+ pretty_given:1,
+ abbrev_commit:1,
+ abbrev_commit_given:1,
+ use_terminator:1,
+ missing_newline:1,
+ date_mode_explicit:1,
+ preserve_subject:1;
+ unsigned int disable_stdin:1;
+ unsigned int leak_pending:1;
+
+ enum date_mode date_mode;
+
+ unsigned int abbrev;
+ enum cmit_fmt commit_format;
+ struct log_info *loginfo;
+ int nr, total;
+ const char *mime_boundary;
+ const char *patch_suffix;
+ int numbered_files;
+ char *message_id;
+ struct string_list *ref_message_ids;
+ const char *add_signoff;
+ const char *extra_headers;
+ const char *log_reencode;
+ const char *subject_prefix;
+ int no_inline;
+ int show_log_size;
+
+ /* Filter by commit log message */
+ struct grep_opt grep_filter;
+
+ /* Display history graph */
+ struct git_graph *graph;
+
+ /* special limits */
+ int skip_count;
+ int max_count;
+ unsigned long max_age;
+ unsigned long min_age;
+ int min_parents;
+ int max_parents;
+
+ /* diff info for patches and for paths limiting */
+ struct diff_options diffopt;
+ struct diff_options pruning;
+
+ struct reflog_walk_info *reflog_info;
+ struct decoration children;
+ struct decoration merge_simplification;
+
+ /* notes-specific options: which refs to show */
+ struct display_notes_opt notes_opt;
+
+ /* commit counts */
+ int count_left;
+ int count_right;
+ int count_same;
};
-static struct revision **revs;
-static int nr_revs, rev_allocs;
-
-static int find_rev(unsigned char *sha1)
-{
- int first = 0, last = nr_revs;
-
- while (first < last) {
- int next = (first + last) / 2;
- struct revision *rev = revs[next];
- int cmp;
-
- cmp = memcmp(sha1, rev->sha1, 20);
- if (!cmp)
- return next;
- if (cmp < 0) {
- last = next;
- continue;
- }
- first = next+1;
- }
- return -first-1;
-}
-
-static struct revision *lookup_rev(unsigned char *sha1, const char *tag)
-{
- int pos = find_rev(sha1);
- struct revision *n;
-
- if (pos >= 0) {
- n = revs[pos];
- if (strcmp(n->tag, tag))
- error("expected tag %s on object %s: got %s", tag, sha1_to_hex(sha1), n->tag);
- return n;
- }
-
- pos = -pos-1;
-
- if (rev_allocs == nr_revs) {
- rev_allocs = alloc_nr(rev_allocs);
- revs = realloc(revs, rev_allocs * sizeof(struct revision *));
- }
- n = malloc(sizeof(struct revision) + strlen(tag));
-
- n->flags = 0;
- memcpy(n->sha1, sha1, 20);
- n->parent = NULL;
- strcpy(n->tag, tag);
-
- /* Insert it into the right place */
- memmove(revs + pos + 1, revs + pos, (nr_revs - pos) * sizeof(struct revision *));
- revs[pos] = n;
- nr_revs++;
-
- return n;
-}
-
-static struct revision *add_relationship(struct revision *rev, unsigned char *needs, const char *tag)
-{
- struct revision *parent_rev = lookup_rev(needs, tag);
- struct parent **pp = &rev->parent, *p;
-
- while ((p = *pp) != NULL) {
- if (p->parent == parent_rev)
- return parent_rev;
- pp = &p->next;
- }
-
- p = malloc(sizeof(*p));
- p->parent = parent_rev;
- p->next = NULL;
- *pp = p;
- return parent_rev;
-}
-
-static void mark_reachable(struct revision *rev, unsigned int mask)
-{
- struct parent *p = rev->parent;
-
- /* If we've been here already, don't bother */
- if (rev->flags & mask)
- return;
- rev->flags |= mask | USED;
- while (p) {
- mark_reachable(p->parent, mask);
- p = p->next;
- }
-}
-
-static unsigned long parse_commit_date(const char *buf)
-{
- unsigned long date;
-
- if (memcmp(buf, "author", 6))
- return 0;
- while (*buf++ != '\n')
- /* nada */;
- if (memcmp(buf, "committer", 9))
- return 0;
- while (*buf++ != '>')
- /* nada */;
- date = strtoul(buf, NULL, 10);
- if (date == ULONG_MAX)
- date = 0;
- return date;
-}
-
-static struct revision * parse_commit(unsigned char *sha1)
-{
- struct revision *rev = lookup_rev(sha1, "commit");
-
- if (!(rev->flags & SEEN)) {
- void *buffer, *bufptr;
- unsigned long size;
- char type[20];
- unsigned char parent[20];
-
- rev->flags |= SEEN;
- buffer = bufptr = read_sha1_file(sha1, type, &size);
- if (!buffer || strcmp(type, "commit"))
- die("%s is not a commit object", sha1_to_hex(sha1));
- bufptr += 46; /* "tree " + "hex sha1" + "\n" */
- while (!memcmp(bufptr, "parent ", 7) && !get_sha1_hex(bufptr+7, parent)) {
- add_relationship(rev, parent, "commit");
- parse_commit(parent);
- bufptr += 48; /* "parent " + "hex sha1" + "\n" */
- }
- rev->date = parse_commit_date(bufptr);
- free(buffer);
- }
- return rev;
-}
-
-#endif /* REVISION_H */
+#define REV_TREE_SAME 0
+#define REV_TREE_NEW 1 /* Only new files */
+#define REV_TREE_OLD 2 /* Only files removed */
+#define REV_TREE_DIFFERENT 3 /* Mixed changes */
+
+/* revision.c */
+typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *);
+extern volatile show_early_output_fn_t show_early_output;
+
+struct setup_revision_opt {
+ const char *def;
+ void (*tweak)(struct rev_info *, struct setup_revision_opt *);
+ const char *submodule;
+ int assume_dashdash;
+};
+
+extern void init_revisions(struct rev_info *revs, const char *prefix);
+extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *);
+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 void reset_revision_walk(void);
+extern int prepare_revision_walk(struct rev_info *revs);
+extern struct commit *get_revision(struct rev_info *revs);
+extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
+extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
+
+extern void mark_parents_uninteresting(struct commit *commit);
+extern void mark_tree_uninteresting(struct tree *tree);
+
+struct name_path {
+ struct name_path *up;
+ int elem_len;
+ const char *elem;
+};
+
+char *path_name(const struct name_path *path, const char *name);
+
+extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
+
+extern void add_object(struct object *obj,
+ struct object_array *p,
+ struct name_path *path,
+ const char *name);
+
+extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
+extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
+
+extern void add_head_to_pending(struct rev_info *);
+
+enum commit_action {
+ commit_ignore,
+ commit_show,
+ commit_error
+};
+
+extern enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit);
+extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
+
+#endif