Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / blame.h

diff --git a/blame.h b/blame.h
index d62f80fa74c44011f8cdaea7a4baec3d8cae03e6..b6bbee4147288271094b3a6dad5a04d1fe597c16 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -16,6 +16,8 @@
 #define BLAME_DEFAULT_MOVE_SCORE       20
 #define BLAME_DEFAULT_COPY_SCORE       40
 
+struct fingerprint;
+
 /*
  * One blob in a commit that is being suspected
  */
@@ -51,6 +53,8 @@ struct blame_origin {
         */
        struct blame_entry *suspects;
        mmfile_t file;
+       int num_lines;
+       struct fingerprint *fingerprints;
        struct object_id blob_oid;
        unsigned short mode;
        /* guilty gets set when shipping any suspects to the final
@@ -92,8 +96,12 @@ struct blame_entry {
         * scanning the lines over and over.
         */
        unsigned score;
+       int ignored;
+       int unblamable;
 };
 
+struct blame_bloom_data;
+
 /*
  * The current state of the blame assignment.
  */
@@ -117,6 +125,8 @@ struct blame_scoreboard {
        /* linked list of blames */
        struct blame_entry *ent;
 
+       struct oidset ignore_list;
+
        /* look-up a line in the final buffer */
        int num_lines;
        int *lineno;
@@ -148,6 +158,7 @@ struct blame_scoreboard {
        void(*found_guilty_entry)(struct blame_entry *, void *);
 
        void *found_guilty_entry_data;
+       struct blame_bloom_data *bloom_data;
 };
 
 /*
@@ -172,6 +183,9 @@ void init_scoreboard(struct blame_scoreboard *sb);
 void setup_scoreboard(struct blame_scoreboard *sb,
                      const char *path,
                      struct blame_origin **orig);
+void setup_blame_bloom_data(struct blame_scoreboard *sb,
+                           const char *path);
+void cleanup_scoreboard(struct blame_scoreboard *sb);
 
 struct blame_entry *blame_entry_prepend(struct blame_entry *head,
                                        long start, long end,