2006-10-19 23:00:04 +00:00
|
|
|
/*
|
|
|
|
* Pickaxe
|
|
|
|
*
|
|
|
|
* Copyright (c) 2006, Junio C Hamano
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
#include "blob.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "tree-walk.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "diffcore.h"
|
|
|
|
#include "revision.h"
|
2007-01-28 09:34:06 +00:00
|
|
|
#include "quote.h"
|
2006-10-19 23:00:04 +00:00
|
|
|
#include "xdiff-interface.h"
|
2007-01-30 09:11:08 +00:00
|
|
|
#include "cache-tree.h"
|
2007-04-27 07:42:15 +00:00
|
|
|
#include "path-list.h"
|
|
|
|
#include "mailmap.h"
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2006-11-09 02:47:54 +00:00
|
|
|
static char blame_usage[] =
|
2007-06-10 01:14:56 +00:00
|
|
|
"git-blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--contents <filename>] [--incremental] [commit] [--] file\n"
|
2007-04-16 06:20:34 +00:00
|
|
|
" -c Use the same output mode as git-annotate (Default: off)\n"
|
2006-12-18 22:04:38 +00:00
|
|
|
" -b Show blank SHA-1 for boundary commits (Default: off)\n"
|
2007-04-16 06:20:34 +00:00
|
|
|
" -l Show long commit SHA1 (Default: off)\n"
|
2006-12-18 22:04:38 +00:00
|
|
|
" --root Do not treat root commits as boundaries (Default: off)\n"
|
2007-04-16 06:20:34 +00:00
|
|
|
" -t Show raw timestamp (Default: off)\n"
|
2006-10-19 23:00:04 +00:00
|
|
|
" -f, --show-name Show original filename (Default: auto)\n"
|
|
|
|
" -n, --show-number Show original linenumber (Default: off)\n"
|
2007-04-12 22:50:45 +00:00
|
|
|
" -s Suppress author name and timestamp (Default: off)\n"
|
2006-10-19 23:00:04 +00:00
|
|
|
" -p, --porcelain Show in a format designed for machine consumption\n"
|
2007-06-10 01:14:56 +00:00
|
|
|
" -w Ignore whitespace differences\n"
|
2006-10-19 23:00:04 +00:00
|
|
|
" -L n,m Process only line range n,m, counting from 1\n"
|
2006-10-20 01:50:17 +00:00
|
|
|
" -M, -C Find line movements within and across files\n"
|
2007-01-28 09:34:06 +00:00
|
|
|
" --incremental Show blame entries as we find them, incrementally\n"
|
2007-01-30 09:11:08 +00:00
|
|
|
" --contents file Use <file>'s contents as the final image\n"
|
2006-10-19 23:00:04 +00:00
|
|
|
" -S revs-file Use revisions from revs-file instead of calling git-rev-list\n";
|
|
|
|
|
|
|
|
static int longest_file;
|
|
|
|
static int longest_author;
|
|
|
|
static int max_orig_digits;
|
|
|
|
static int max_digits;
|
2006-10-20 21:51:12 +00:00
|
|
|
static int max_score_digits;
|
2006-12-18 22:04:38 +00:00
|
|
|
static int show_root;
|
|
|
|
static int blank_boundary;
|
2007-01-28 09:34:06 +00:00
|
|
|
static int incremental;
|
2007-02-06 09:52:04 +00:00
|
|
|
static int cmd_is_annotate;
|
2007-06-10 01:14:56 +00:00
|
|
|
static int xdl_opts = XDF_NEED_MINIMAL;
|
2007-04-27 07:42:15 +00:00
|
|
|
static struct path_list mailmap;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2006-10-29 11:07:40 +00:00
|
|
|
#ifndef DEBUG
|
|
|
|
#define DEBUG 0
|
|
|
|
#endif
|
|
|
|
|
2006-11-05 19:51:41 +00:00
|
|
|
/* stats */
|
|
|
|
static int num_read_blob;
|
|
|
|
static int num_get_patch;
|
|
|
|
static int num_commits;
|
|
|
|
|
2006-10-20 01:49:30 +00:00
|
|
|
#define PICKAXE_BLAME_MOVE 01
|
2006-10-20 01:50:17 +00:00
|
|
|
#define PICKAXE_BLAME_COPY 02
|
|
|
|
#define PICKAXE_BLAME_COPY_HARDER 04
|
2007-05-06 04:18:57 +00:00
|
|
|
#define PICKAXE_BLAME_COPY_HARDEST 010
|
2006-10-20 01:49:30 +00:00
|
|
|
|
2006-10-20 22:37:12 +00:00
|
|
|
/*
|
|
|
|
* blame for a blame_entry with score lower than these thresholds
|
|
|
|
* is not passed to the parent using move/copy logic.
|
|
|
|
*/
|
|
|
|
static unsigned blame_move_score;
|
|
|
|
static unsigned blame_copy_score;
|
|
|
|
#define BLAME_DEFAULT_MOVE_SCORE 20
|
|
|
|
#define BLAME_DEFAULT_COPY_SCORE 40
|
|
|
|
|
2006-10-19 23:00:04 +00:00
|
|
|
/* bits #0..7 in revision.h, #8..11 used for merge_bases() in commit.c */
|
|
|
|
#define METAINFO_SHOWN (1u<<12)
|
|
|
|
#define MORE_THAN_ONE_PATH (1u<<13)
|
|
|
|
|
|
|
|
/*
|
2006-10-29 11:07:40 +00:00
|
|
|
* One blob in a commit that is being suspected
|
2006-10-19 23:00:04 +00:00
|
|
|
*/
|
|
|
|
struct origin {
|
2006-10-29 11:07:40 +00:00
|
|
|
int refcnt;
|
2006-10-19 23:00:04 +00:00
|
|
|
struct commit *commit;
|
2006-11-05 19:51:41 +00:00
|
|
|
mmfile_t file;
|
2006-10-19 23:00:04 +00:00
|
|
|
unsigned char blob_sha1[20];
|
|
|
|
char path[FLEX_ARRAY];
|
|
|
|
};
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Given an origin, prepare mmfile_t structure to be used by the
|
|
|
|
* diff machinery
|
|
|
|
*/
|
2006-11-05 19:51:41 +00:00
|
|
|
static char *fill_origin_blob(struct origin *o, mmfile_t *file)
|
|
|
|
{
|
|
|
|
if (!o->file.ptr) {
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
2006-11-05 19:51:41 +00:00
|
|
|
num_read_blob++;
|
2007-02-26 19:55:59 +00:00
|
|
|
file->ptr = read_sha1_file(o->blob_sha1, &type,
|
2006-11-05 19:51:41 +00:00
|
|
|
(unsigned long *)(&(file->size)));
|
|
|
|
o->file = *file;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*file = o->file;
|
|
|
|
return file->ptr;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Origin is refcounted and usually we keep the blob contents to be
|
|
|
|
* reused.
|
|
|
|
*/
|
2006-10-29 11:07:40 +00:00
|
|
|
static inline struct origin *origin_incref(struct origin *o)
|
|
|
|
{
|
|
|
|
if (o)
|
|
|
|
o->refcnt++;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void origin_decref(struct origin *o)
|
|
|
|
{
|
|
|
|
if (o && --o->refcnt <= 0) {
|
2006-11-05 19:51:41 +00:00
|
|
|
if (o->file.ptr)
|
|
|
|
free(o->file.ptr);
|
2006-10-29 11:07:40 +00:00
|
|
|
memset(o, 0, sizeof(*o));
|
|
|
|
free(o);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Each group of lines is described by a blame_entry; it can be split
|
|
|
|
* as we pass blame to the parents. They form a linked list in the
|
|
|
|
* scoreboard structure, sorted by the target line number.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
struct blame_entry {
|
|
|
|
struct blame_entry *prev;
|
|
|
|
struct blame_entry *next;
|
|
|
|
|
|
|
|
/* the first line of this group in the final image;
|
|
|
|
* internally all line numbers are 0 based.
|
|
|
|
*/
|
|
|
|
int lno;
|
|
|
|
|
|
|
|
/* how many lines this group has */
|
|
|
|
int num_lines;
|
|
|
|
|
|
|
|
/* the commit that introduced this group into the final image */
|
|
|
|
struct origin *suspect;
|
|
|
|
|
|
|
|
/* true if the suspect is truly guilty; false while we have not
|
|
|
|
* checked if the group came from one of its parents.
|
|
|
|
*/
|
|
|
|
char guilty;
|
|
|
|
|
|
|
|
/* the line number of the first line of this group in the
|
|
|
|
* suspect's file; internally all line numbers are 0 based.
|
|
|
|
*/
|
|
|
|
int s_lno;
|
2006-10-20 21:51:12 +00:00
|
|
|
|
|
|
|
/* how significant this entry is -- cached to avoid
|
2007-01-30 01:36:22 +00:00
|
|
|
* scanning the lines over and over.
|
2006-10-20 21:51:12 +00:00
|
|
|
*/
|
|
|
|
unsigned score;
|
2006-10-19 23:00:04 +00:00
|
|
|
};
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The current state of the blame assignment.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
struct scoreboard {
|
|
|
|
/* the final commit (i.e. where we started digging from) */
|
|
|
|
struct commit *final;
|
|
|
|
|
|
|
|
const char *path;
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The contents in the final image.
|
|
|
|
* Used by many functions to obtain contents of the nth line,
|
|
|
|
* indexed with scoreboard.lineno[blame_entry.lno].
|
2006-10-19 23:00:04 +00:00
|
|
|
*/
|
|
|
|
const char *final_buf;
|
|
|
|
unsigned long final_buf_size;
|
|
|
|
|
|
|
|
/* linked list of blames */
|
|
|
|
struct blame_entry *ent;
|
|
|
|
|
2006-10-21 06:49:31 +00:00
|
|
|
/* look-up a line in the final buffer */
|
2006-10-19 23:00:04 +00:00
|
|
|
int num_lines;
|
|
|
|
int *lineno;
|
|
|
|
};
|
|
|
|
|
2007-03-21 06:37:51 +00:00
|
|
|
static inline int same_suspect(struct origin *a, struct origin *b)
|
2006-10-21 07:41:38 +00:00
|
|
|
{
|
2007-03-21 06:37:51 +00:00
|
|
|
if (a == b)
|
2007-03-20 05:17:10 +00:00
|
|
|
return 1;
|
2007-03-21 06:37:51 +00:00
|
|
|
if (a->commit != b->commit)
|
|
|
|
return 0;
|
|
|
|
return !strcmp(a->path, b->path);
|
2006-10-21 07:41:38 +00:00
|
|
|
}
|
|
|
|
|
2006-10-29 11:07:40 +00:00
|
|
|
static void sanity_check_refcnt(struct scoreboard *);
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* If two blame entries that are next to each other came from
|
|
|
|
* contiguous lines in the same origin (i.e. <commit, path> pair),
|
|
|
|
* merge them together.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void coalesce(struct scoreboard *sb)
|
|
|
|
{
|
|
|
|
struct blame_entry *ent, *next;
|
|
|
|
|
|
|
|
for (ent = sb->ent; ent && (next = ent->next); ent = next) {
|
2007-03-21 06:37:51 +00:00
|
|
|
if (same_suspect(ent->suspect, next->suspect) &&
|
2006-10-19 23:00:04 +00:00
|
|
|
ent->guilty == next->guilty &&
|
|
|
|
ent->s_lno + ent->num_lines == next->s_lno) {
|
|
|
|
ent->num_lines += next->num_lines;
|
|
|
|
ent->next = next->next;
|
|
|
|
if (ent->next)
|
|
|
|
ent->next->prev = ent;
|
2006-10-29 11:07:40 +00:00
|
|
|
origin_decref(next->suspect);
|
2006-10-19 23:00:04 +00:00
|
|
|
free(next);
|
2006-10-21 07:41:38 +00:00
|
|
|
ent->score = 0;
|
2006-10-19 23:00:04 +00:00
|
|
|
next = ent; /* again */
|
|
|
|
}
|
|
|
|
}
|
2006-10-29 11:07:40 +00:00
|
|
|
|
|
|
|
if (DEBUG) /* sanity */
|
|
|
|
sanity_check_refcnt(sb);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Given a commit and a path in it, create a new origin structure.
|
|
|
|
* The callers that add blame to the scoreboard should use
|
|
|
|
* get_origin() to obtain shared, refcounted copy instead of calling
|
|
|
|
* this function directly.
|
|
|
|
*/
|
2006-11-05 03:18:50 +00:00
|
|
|
static struct origin *make_origin(struct commit *commit, const char *path)
|
|
|
|
{
|
|
|
|
struct origin *o;
|
|
|
|
o = xcalloc(1, sizeof(*o) + strlen(path) + 1);
|
|
|
|
o->commit = commit;
|
|
|
|
o->refcnt = 1;
|
|
|
|
strcpy(o->path, path);
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Locate an existing origin or create a new one.
|
|
|
|
*/
|
2006-10-21 09:56:33 +00:00
|
|
|
static struct origin *get_origin(struct scoreboard *sb,
|
|
|
|
struct commit *commit,
|
|
|
|
const char *path)
|
2006-10-19 23:00:04 +00:00
|
|
|
{
|
2006-10-21 09:56:33 +00:00
|
|
|
struct blame_entry *e;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2006-10-21 09:56:33 +00:00
|
|
|
for (e = sb->ent; e; e = e->next) {
|
|
|
|
if (e->suspect->commit == commit &&
|
|
|
|
!strcmp(e->suspect->path, path))
|
2006-10-29 11:07:40 +00:00
|
|
|
return origin_incref(e->suspect);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
2006-11-05 03:18:50 +00:00
|
|
|
return make_origin(commit, path);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Fill the blob_sha1 field of an origin if it hasn't, so that later
|
|
|
|
* call to fill_origin_blob() can use it to locate the data. blob_sha1
|
|
|
|
* for an origin is also used to pass the blame for the entire file to
|
|
|
|
* the parent to detect the case where a child's blob is identical to
|
|
|
|
* that of its parent's.
|
|
|
|
*/
|
2006-10-21 09:56:33 +00:00
|
|
|
static int fill_blob_sha1(struct origin *origin)
|
|
|
|
{
|
|
|
|
unsigned mode;
|
|
|
|
|
|
|
|
if (!is_null_sha1(origin->blob_sha1))
|
|
|
|
return 0;
|
|
|
|
if (get_tree_entry(origin->commit->object.sha1,
|
|
|
|
origin->path,
|
|
|
|
origin->blob_sha1, &mode))
|
|
|
|
goto error_out;
|
2007-02-26 19:55:59 +00:00
|
|
|
if (sha1_object_info(origin->blob_sha1, NULL) != OBJ_BLOB)
|
2006-10-21 09:56:33 +00:00
|
|
|
goto error_out;
|
|
|
|
return 0;
|
|
|
|
error_out:
|
|
|
|
hashclr(origin->blob_sha1);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* We have an origin -- check if the same path exists in the
|
|
|
|
* parent and return an origin structure to represent it.
|
|
|
|
*/
|
2006-10-21 09:56:33 +00:00
|
|
|
static struct origin *find_origin(struct scoreboard *sb,
|
2006-10-19 23:00:04 +00:00
|
|
|
struct commit *parent,
|
|
|
|
struct origin *origin)
|
|
|
|
{
|
|
|
|
struct origin *porigin = NULL;
|
|
|
|
struct diff_options diff_opts;
|
2006-10-21 09:56:33 +00:00
|
|
|
const char *paths[2];
|
|
|
|
|
2006-10-31 09:00:01 +00:00
|
|
|
if (parent->util) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Each commit object can cache one origin in that
|
|
|
|
* commit. This is a freestanding copy of origin and
|
|
|
|
* not refcounted.
|
2006-11-05 03:18:50 +00:00
|
|
|
*/
|
2006-10-31 09:00:01 +00:00
|
|
|
struct origin *cached = parent->util;
|
2006-11-05 03:18:50 +00:00
|
|
|
if (!strcmp(cached->path, origin->path)) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The same path between origin and its parent
|
|
|
|
* without renaming -- the most common case.
|
|
|
|
*/
|
2006-11-05 03:18:50 +00:00
|
|
|
porigin = get_origin(sb, parent, cached->path);
|
2007-01-30 01:36:22 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the origin was newly created (i.e. get_origin
|
|
|
|
* would call make_origin if none is found in the
|
|
|
|
* scoreboard), it does not know the blob_sha1,
|
|
|
|
* so copy it. Otherwise porigin was in the
|
|
|
|
* scoreboard and already knows blob_sha1.
|
|
|
|
*/
|
2006-11-05 03:18:50 +00:00
|
|
|
if (porigin->refcnt == 1)
|
|
|
|
hashcpy(porigin->blob_sha1, cached->blob_sha1);
|
|
|
|
return porigin;
|
|
|
|
}
|
|
|
|
/* otherwise it was not very useful; free it */
|
|
|
|
free(parent->util);
|
|
|
|
parent->util = NULL;
|
2006-10-31 09:00:01 +00:00
|
|
|
}
|
|
|
|
|
2006-10-21 09:56:33 +00:00
|
|
|
/* See if the origin->path is different between parent
|
|
|
|
* and origin first. Most of the time they are the
|
|
|
|
* same and diff-tree is fairly efficient about this.
|
|
|
|
*/
|
|
|
|
diff_setup(&diff_opts);
|
|
|
|
diff_opts.recursive = 1;
|
|
|
|
diff_opts.detect_rename = 0;
|
|
|
|
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
|
|
|
|
paths[0] = origin->path;
|
|
|
|
paths[1] = NULL;
|
|
|
|
|
|
|
|
diff_tree_setup_paths(paths, &diff_opts);
|
|
|
|
if (diff_setup_done(&diff_opts) < 0)
|
|
|
|
die("diff-setup");
|
2007-01-30 09:11:08 +00:00
|
|
|
|
|
|
|
if (is_null_sha1(origin->commit->object.sha1))
|
|
|
|
do_diff_cache(parent->tree->object.sha1, &diff_opts);
|
|
|
|
else
|
|
|
|
diff_tree_sha1(parent->tree->object.sha1,
|
|
|
|
origin->commit->tree->object.sha1,
|
|
|
|
"", &diff_opts);
|
2006-10-21 09:56:33 +00:00
|
|
|
diffcore_std(&diff_opts);
|
|
|
|
|
|
|
|
/* It is either one entry that says "modified", or "created",
|
|
|
|
* or nothing.
|
|
|
|
*/
|
|
|
|
if (!diff_queued_diff.nr) {
|
|
|
|
/* The path is the same as parent */
|
|
|
|
porigin = get_origin(sb, parent, origin->path);
|
|
|
|
hashcpy(porigin->blob_sha1, origin->blob_sha1);
|
|
|
|
}
|
|
|
|
else if (diff_queued_diff.nr != 1)
|
2006-11-09 02:47:54 +00:00
|
|
|
die("internal error in blame::find_origin");
|
2006-10-21 09:56:33 +00:00
|
|
|
else {
|
|
|
|
struct diff_filepair *p = diff_queued_diff.queue[0];
|
|
|
|
switch (p->status) {
|
|
|
|
default:
|
2006-11-09 02:47:54 +00:00
|
|
|
die("internal error in blame::find_origin (%c)",
|
2006-10-21 09:56:33 +00:00
|
|
|
p->status);
|
|
|
|
case 'M':
|
|
|
|
porigin = get_origin(sb, parent, origin->path);
|
|
|
|
hashcpy(porigin->blob_sha1, p->one->sha1);
|
|
|
|
break;
|
|
|
|
case 'A':
|
|
|
|
case 'T':
|
|
|
|
/* Did not exist in parent, or type changed */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff_flush(&diff_opts);
|
2006-10-31 09:00:01 +00:00
|
|
|
if (porigin) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Create a freestanding copy that is not part of
|
|
|
|
* the refcounted origin found in the scoreboard, and
|
|
|
|
* cache it in the commit.
|
|
|
|
*/
|
2006-11-05 03:18:50 +00:00
|
|
|
struct origin *cached;
|
2007-01-30 01:36:22 +00:00
|
|
|
|
2006-11-05 03:18:50 +00:00
|
|
|
cached = make_origin(porigin->commit, porigin->path);
|
|
|
|
hashcpy(cached->blob_sha1, porigin->blob_sha1);
|
|
|
|
parent->util = cached;
|
2006-10-31 09:00:01 +00:00
|
|
|
}
|
2006-10-31 01:17:41 +00:00
|
|
|
return porigin;
|
|
|
|
}
|
2006-10-21 09:56:33 +00:00
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* We have an origin -- find the path that corresponds to it in its
|
|
|
|
* parent and return an origin structure to represent it.
|
|
|
|
*/
|
2006-10-31 01:17:41 +00:00
|
|
|
static struct origin *find_rename(struct scoreboard *sb,
|
|
|
|
struct commit *parent,
|
|
|
|
struct origin *origin)
|
|
|
|
{
|
|
|
|
struct origin *porigin = NULL;
|
|
|
|
struct diff_options diff_opts;
|
|
|
|
int i;
|
|
|
|
const char *paths[2];
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
diff_setup(&diff_opts);
|
|
|
|
diff_opts.recursive = 1;
|
|
|
|
diff_opts.detect_rename = DIFF_DETECT_RENAME;
|
|
|
|
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
|
2006-11-02 08:02:11 +00:00
|
|
|
diff_opts.single_follow = origin->path;
|
2006-10-19 23:00:04 +00:00
|
|
|
paths[0] = NULL;
|
|
|
|
diff_tree_setup_paths(paths, &diff_opts);
|
|
|
|
if (diff_setup_done(&diff_opts) < 0)
|
|
|
|
die("diff-setup");
|
2007-01-30 09:11:08 +00:00
|
|
|
|
|
|
|
if (is_null_sha1(origin->commit->object.sha1))
|
|
|
|
do_diff_cache(parent->tree->object.sha1, &diff_opts);
|
|
|
|
else
|
|
|
|
diff_tree_sha1(parent->tree->object.sha1,
|
|
|
|
origin->commit->tree->object.sha1,
|
|
|
|
"", &diff_opts);
|
2006-10-19 23:00:04 +00:00
|
|
|
diffcore_std(&diff_opts);
|
|
|
|
|
|
|
|
for (i = 0; i < diff_queued_diff.nr; i++) {
|
|
|
|
struct diff_filepair *p = diff_queued_diff.queue[i];
|
2006-10-21 06:49:31 +00:00
|
|
|
if ((p->status == 'R' || p->status == 'C') &&
|
2006-10-21 09:56:33 +00:00
|
|
|
!strcmp(p->two->path, origin->path)) {
|
|
|
|
porigin = get_origin(sb, parent, p->one->path);
|
|
|
|
hashcpy(porigin->blob_sha1, p->one->sha1);
|
2006-10-19 23:00:04 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff_flush(&diff_opts);
|
|
|
|
return porigin;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Parsing of patch chunks...
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
struct chunk {
|
|
|
|
/* line number in postimage; up to but not including this
|
|
|
|
* line is the same as preimage
|
|
|
|
*/
|
|
|
|
int same;
|
|
|
|
|
|
|
|
/* preimage line number after this chunk */
|
|
|
|
int p_next;
|
|
|
|
|
|
|
|
/* postimage line number after this chunk */
|
|
|
|
int t_next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct patch {
|
|
|
|
struct chunk *chunks;
|
|
|
|
int num;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct blame_diff_state {
|
|
|
|
struct xdiff_emit_state xm;
|
|
|
|
struct patch *ret;
|
|
|
|
unsigned hunk_post_context;
|
|
|
|
unsigned hunk_in_pre_context : 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void process_u_diff(void *state_, char *line, unsigned long len)
|
|
|
|
{
|
|
|
|
struct blame_diff_state *state = state_;
|
|
|
|
struct chunk *chunk;
|
|
|
|
int off1, off2, len1, len2, num;
|
|
|
|
|
|
|
|
num = state->ret->num;
|
|
|
|
if (len < 4 || line[0] != '@' || line[1] != '@') {
|
|
|
|
if (state->hunk_in_pre_context && line[0] == ' ')
|
|
|
|
state->ret->chunks[num - 1].same++;
|
|
|
|
else {
|
|
|
|
state->hunk_in_pre_context = 0;
|
|
|
|
if (line[0] == ' ')
|
|
|
|
state->hunk_post_context++;
|
|
|
|
else
|
|
|
|
state->hunk_post_context = 0;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (num && state->hunk_post_context) {
|
|
|
|
chunk = &state->ret->chunks[num - 1];
|
|
|
|
chunk->p_next -= state->hunk_post_context;
|
|
|
|
chunk->t_next -= state->hunk_post_context;
|
|
|
|
}
|
|
|
|
state->ret->num = ++num;
|
|
|
|
state->ret->chunks = xrealloc(state->ret->chunks,
|
|
|
|
sizeof(struct chunk) * num);
|
|
|
|
chunk = &state->ret->chunks[num - 1];
|
|
|
|
if (parse_hunk_header(line, len, &off1, &len1, &off2, &len2)) {
|
|
|
|
state->ret->num--;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Line numbers in patch output are one based. */
|
|
|
|
off1--;
|
|
|
|
off2--;
|
|
|
|
|
|
|
|
chunk->same = len2 ? off2 : (off2 + 1);
|
|
|
|
|
|
|
|
chunk->p_next = off1 + (len1 ? len1 : 1);
|
|
|
|
chunk->t_next = chunk->same + len2;
|
|
|
|
state->hunk_in_pre_context = 1;
|
|
|
|
state->hunk_post_context = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
|
|
|
|
int context)
|
|
|
|
{
|
|
|
|
struct blame_diff_state state;
|
|
|
|
xpparam_t xpp;
|
|
|
|
xdemitconf_t xecfg;
|
|
|
|
xdemitcb_t ecb;
|
|
|
|
|
2007-06-10 01:14:56 +00:00
|
|
|
xpp.flags = xdl_opts;
|
2007-07-04 18:05:46 +00:00
|
|
|
memset(&xecfg, 0, sizeof(xecfg));
|
2006-10-19 23:00:04 +00:00
|
|
|
xecfg.ctxlen = context;
|
|
|
|
ecb.outf = xdiff_outf;
|
|
|
|
ecb.priv = &state;
|
|
|
|
memset(&state, 0, sizeof(state));
|
|
|
|
state.xm.consume = process_u_diff;
|
|
|
|
state.ret = xmalloc(sizeof(struct patch));
|
|
|
|
state.ret->chunks = NULL;
|
|
|
|
state.ret->num = 0;
|
|
|
|
|
|
|
|
xdl_diff(file_p, file_o, &xpp, &xecfg, &ecb);
|
|
|
|
|
|
|
|
if (state.ret->num) {
|
|
|
|
struct chunk *chunk;
|
|
|
|
chunk = &state.ret->chunks[state.ret->num - 1];
|
|
|
|
chunk->p_next -= state.hunk_post_context;
|
|
|
|
chunk->t_next -= state.hunk_post_context;
|
|
|
|
}
|
|
|
|
return state.ret;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Run diff between two origins and grab the patch output, so that
|
|
|
|
* we can pass blame for lines origin is currently suspected for
|
|
|
|
* to its parent.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static struct patch *get_patch(struct origin *parent, struct origin *origin)
|
|
|
|
{
|
|
|
|
mmfile_t file_p, file_o;
|
|
|
|
struct patch *patch;
|
|
|
|
|
2006-11-05 19:51:41 +00:00
|
|
|
fill_origin_blob(parent, &file_p);
|
|
|
|
fill_origin_blob(origin, &file_o);
|
|
|
|
if (!file_p.ptr || !file_o.ptr)
|
2006-10-19 23:00:04 +00:00
|
|
|
return NULL;
|
|
|
|
patch = compare_buffer(&file_p, &file_o, 0);
|
2006-11-05 19:51:41 +00:00
|
|
|
num_get_patch++;
|
2006-10-19 23:00:04 +00:00
|
|
|
return patch;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_patch(struct patch *p)
|
|
|
|
{
|
|
|
|
free(p->chunks);
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
2007-02-04 04:49:16 +00:00
|
|
|
* Link in a new blame entry to the scoreboard. Entries that cover the
|
2007-01-30 01:36:22 +00:00
|
|
|
* same line range have been removed from the scoreboard previously.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
|
|
|
|
{
|
|
|
|
struct blame_entry *ent, *prev = NULL;
|
|
|
|
|
2006-10-29 11:07:40 +00:00
|
|
|
origin_incref(e->suspect);
|
|
|
|
|
2006-10-19 23:00:04 +00:00
|
|
|
for (ent = sb->ent; ent && ent->lno < e->lno; ent = ent->next)
|
|
|
|
prev = ent;
|
|
|
|
|
|
|
|
/* prev, if not NULL, is the last one that is below e */
|
|
|
|
e->prev = prev;
|
|
|
|
if (prev) {
|
|
|
|
e->next = prev->next;
|
|
|
|
prev->next = e;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
e->next = sb->ent;
|
|
|
|
sb->ent = e;
|
|
|
|
}
|
|
|
|
if (e->next)
|
|
|
|
e->next->prev = e;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* src typically is on-stack; we want to copy the information in it to
|
|
|
|
* an malloced blame_entry that is already on the linked list of the
|
|
|
|
* scoreboard. The origin of dst loses a refcnt while the origin of src
|
|
|
|
* gains one.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void dup_entry(struct blame_entry *dst, struct blame_entry *src)
|
|
|
|
{
|
|
|
|
struct blame_entry *p, *n;
|
2006-10-29 11:07:40 +00:00
|
|
|
|
2006-10-19 23:00:04 +00:00
|
|
|
p = dst->prev;
|
|
|
|
n = dst->next;
|
2006-10-29 11:07:40 +00:00
|
|
|
origin_incref(src->suspect);
|
|
|
|
origin_decref(dst->suspect);
|
2006-10-19 23:00:04 +00:00
|
|
|
memcpy(dst, src, sizeof(*src));
|
|
|
|
dst->prev = p;
|
|
|
|
dst->next = n;
|
2006-10-20 21:51:12 +00:00
|
|
|
dst->score = 0;
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char *nth_line(struct scoreboard *sb, int lno)
|
|
|
|
{
|
|
|
|
return sb->final_buf + sb->lineno[lno];
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* It is known that lines between tlno to same came from parent, and e
|
|
|
|
* has an overlap with that range. it also is known that parent's
|
|
|
|
* line plno corresponds to e's line tlno.
|
|
|
|
*
|
|
|
|
* <---- e ----->
|
|
|
|
* <------>
|
|
|
|
* <------------>
|
|
|
|
* <------------>
|
|
|
|
* <------------------>
|
|
|
|
*
|
|
|
|
* Split e into potentially three parts; before this chunk, the chunk
|
|
|
|
* to be blamed for the parent, and after that portion.
|
|
|
|
*/
|
2006-10-29 11:07:40 +00:00
|
|
|
static void split_overlap(struct blame_entry *split,
|
2006-10-19 23:00:04 +00:00
|
|
|
struct blame_entry *e,
|
|
|
|
int tlno, int plno, int same,
|
|
|
|
struct origin *parent)
|
|
|
|
{
|
|
|
|
int chunk_end_lno;
|
|
|
|
memset(split, 0, sizeof(struct blame_entry [3]));
|
|
|
|
|
|
|
|
if (e->s_lno < tlno) {
|
|
|
|
/* there is a pre-chunk part not blamed on parent */
|
2006-10-29 11:07:40 +00:00
|
|
|
split[0].suspect = origin_incref(e->suspect);
|
2006-10-19 23:00:04 +00:00
|
|
|
split[0].lno = e->lno;
|
|
|
|
split[0].s_lno = e->s_lno;
|
|
|
|
split[0].num_lines = tlno - e->s_lno;
|
|
|
|
split[1].lno = e->lno + tlno - e->s_lno;
|
|
|
|
split[1].s_lno = plno;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
split[1].lno = e->lno;
|
|
|
|
split[1].s_lno = plno + (e->s_lno - tlno);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (same < e->s_lno + e->num_lines) {
|
|
|
|
/* there is a post-chunk part not blamed on parent */
|
2006-10-29 11:07:40 +00:00
|
|
|
split[2].suspect = origin_incref(e->suspect);
|
2006-10-19 23:00:04 +00:00
|
|
|
split[2].lno = e->lno + (same - e->s_lno);
|
|
|
|
split[2].s_lno = e->s_lno + (same - e->s_lno);
|
|
|
|
split[2].num_lines = e->s_lno + e->num_lines - same;
|
|
|
|
chunk_end_lno = split[2].lno;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
chunk_end_lno = e->lno + e->num_lines;
|
|
|
|
split[1].num_lines = chunk_end_lno - split[1].lno;
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* if it turns out there is nothing to blame the parent for,
|
|
|
|
* forget about the splitting. !split[1].suspect signals this.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
if (split[1].num_lines < 1)
|
|
|
|
return;
|
2006-10-29 11:07:40 +00:00
|
|
|
split[1].suspect = origin_incref(parent);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* split_overlap() divided an existing blame e into up to three parts
|
|
|
|
* in split. Adjust the linked list of blames in the scoreboard to
|
|
|
|
* reflect the split.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void split_blame(struct scoreboard *sb,
|
2006-10-29 11:07:40 +00:00
|
|
|
struct blame_entry *split,
|
2006-10-19 23:00:04 +00:00
|
|
|
struct blame_entry *e)
|
|
|
|
{
|
|
|
|
struct blame_entry *new_entry;
|
|
|
|
|
|
|
|
if (split[0].suspect && split[2].suspect) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/* The first part (reuse storage for the existing entry e) */
|
2006-10-19 23:00:04 +00:00
|
|
|
dup_entry(e, &split[0]);
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/* The last part -- me */
|
2006-10-19 23:00:04 +00:00
|
|
|
new_entry = xmalloc(sizeof(*new_entry));
|
|
|
|
memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
|
|
|
|
add_blame_entry(sb, new_entry);
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/* ... and the middle part -- parent */
|
2006-10-19 23:00:04 +00:00
|
|
|
new_entry = xmalloc(sizeof(*new_entry));
|
|
|
|
memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
|
|
|
|
add_blame_entry(sb, new_entry);
|
|
|
|
}
|
|
|
|
else if (!split[0].suspect && !split[2].suspect)
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The parent covers the entire area; reuse storage for
|
|
|
|
* e and replace it with the parent.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
dup_entry(e, &split[1]);
|
|
|
|
else if (split[0].suspect) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/* me and then parent */
|
2006-10-19 23:00:04 +00:00
|
|
|
dup_entry(e, &split[0]);
|
|
|
|
|
|
|
|
new_entry = xmalloc(sizeof(*new_entry));
|
|
|
|
memcpy(new_entry, &(split[1]), sizeof(struct blame_entry));
|
|
|
|
add_blame_entry(sb, new_entry);
|
|
|
|
}
|
|
|
|
else {
|
2007-01-30 01:36:22 +00:00
|
|
|
/* parent and then me */
|
2006-10-19 23:00:04 +00:00
|
|
|
dup_entry(e, &split[1]);
|
|
|
|
|
|
|
|
new_entry = xmalloc(sizeof(*new_entry));
|
|
|
|
memcpy(new_entry, &(split[2]), sizeof(struct blame_entry));
|
|
|
|
add_blame_entry(sb, new_entry);
|
|
|
|
}
|
|
|
|
|
2006-10-29 11:07:40 +00:00
|
|
|
if (DEBUG) { /* sanity */
|
2006-10-19 23:00:04 +00:00
|
|
|
struct blame_entry *ent;
|
2006-10-21 06:49:31 +00:00
|
|
|
int lno = sb->ent->lno, corrupt = 0;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
|
|
|
if (lno != ent->lno)
|
|
|
|
corrupt = 1;
|
|
|
|
if (ent->s_lno < 0)
|
|
|
|
corrupt = 1;
|
|
|
|
lno += ent->num_lines;
|
|
|
|
}
|
|
|
|
if (corrupt) {
|
2006-10-21 06:49:31 +00:00
|
|
|
lno = sb->ent->lno;
|
2006-10-19 23:00:04 +00:00
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
|
|
|
printf("L %8d l %8d n %8d\n",
|
|
|
|
lno, ent->lno, ent->num_lines);
|
|
|
|
lno = ent->lno + ent->num_lines;
|
|
|
|
}
|
|
|
|
die("oops");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* After splitting the blame, the origins used by the
|
|
|
|
* on-stack blame_entry should lose one refcnt each.
|
|
|
|
*/
|
2006-10-29 11:07:40 +00:00
|
|
|
static void decref_split(struct blame_entry *split)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
origin_decref(split[i].suspect);
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Helper for blame_chunk(). blame_entry e is known to overlap with
|
|
|
|
* the patch hunk; split it and pass blame to the parent.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void blame_overlap(struct scoreboard *sb, struct blame_entry *e,
|
|
|
|
int tlno, int plno, int same,
|
|
|
|
struct origin *parent)
|
|
|
|
{
|
|
|
|
struct blame_entry split[3];
|
|
|
|
|
|
|
|
split_overlap(split, e, tlno, plno, same, parent);
|
2006-10-29 11:07:40 +00:00
|
|
|
if (split[1].suspect)
|
|
|
|
split_blame(sb, split, e);
|
|
|
|
decref_split(split);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Find the line number of the last line the target is suspected for.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static int find_last_in_target(struct scoreboard *sb, struct origin *target)
|
|
|
|
{
|
|
|
|
struct blame_entry *e;
|
|
|
|
int last_in_target = -1;
|
|
|
|
|
|
|
|
for (e = sb->ent; e; e = e->next) {
|
2007-03-21 06:37:51 +00:00
|
|
|
if (e->guilty || !same_suspect(e->suspect, target))
|
2006-10-19 23:00:04 +00:00
|
|
|
continue;
|
|
|
|
if (last_in_target < e->s_lno + e->num_lines)
|
|
|
|
last_in_target = e->s_lno + e->num_lines;
|
|
|
|
}
|
|
|
|
return last_in_target;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Process one hunk from the patch between the current suspect for
|
|
|
|
* blame_entry e and its parent. Find and split the overlap, and
|
|
|
|
* pass blame to the overlapping part to the parent.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void blame_chunk(struct scoreboard *sb,
|
|
|
|
int tlno, int plno, int same,
|
|
|
|
struct origin *target, struct origin *parent)
|
|
|
|
{
|
2006-10-21 06:49:31 +00:00
|
|
|
struct blame_entry *e;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2006-10-21 06:49:31 +00:00
|
|
|
for (e = sb->ent; e; e = e->next) {
|
2007-03-21 06:37:51 +00:00
|
|
|
if (e->guilty || !same_suspect(e->suspect, target))
|
2006-10-19 23:00:04 +00:00
|
|
|
continue;
|
|
|
|
if (same <= e->s_lno)
|
|
|
|
continue;
|
|
|
|
if (tlno < e->s_lno + e->num_lines)
|
|
|
|
blame_overlap(sb, e, tlno, plno, same, parent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* We are looking at the origin 'target' and aiming to pass blame
|
|
|
|
* for the lines it is suspected to its parent. Run diff to find
|
|
|
|
* which lines came from parent and pass blame for them.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static int pass_blame_to_parent(struct scoreboard *sb,
|
|
|
|
struct origin *target,
|
|
|
|
struct origin *parent)
|
|
|
|
{
|
|
|
|
int i, last_in_target, plno, tlno;
|
|
|
|
struct patch *patch;
|
|
|
|
|
|
|
|
last_in_target = find_last_in_target(sb, target);
|
|
|
|
if (last_in_target < 0)
|
|
|
|
return 1; /* nothing remains for this target */
|
|
|
|
|
|
|
|
patch = get_patch(parent, target);
|
|
|
|
plno = tlno = 0;
|
|
|
|
for (i = 0; i < patch->num; i++) {
|
|
|
|
struct chunk *chunk = &patch->chunks[i];
|
|
|
|
|
|
|
|
blame_chunk(sb, tlno, plno, chunk->same, target, parent);
|
|
|
|
plno = chunk->p_next;
|
|
|
|
tlno = chunk->t_next;
|
|
|
|
}
|
2007-01-30 01:36:22 +00:00
|
|
|
/* The rest (i.e. anything after tlno) are the same as the parent */
|
2006-10-19 23:00:04 +00:00
|
|
|
blame_chunk(sb, tlno, plno, last_in_target, target, parent);
|
|
|
|
|
|
|
|
free_patch(patch);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The lines in blame_entry after splitting blames many times can become
|
|
|
|
* very small and trivial, and at some point it becomes pointless to
|
|
|
|
* blame the parents. E.g. "\t\t}\n\t}\n\n" appears everywhere in any
|
|
|
|
* ordinary C program, and it is not worth to say it was copied from
|
|
|
|
* totally unrelated file in the parent.
|
|
|
|
*
|
|
|
|
* Compute how trivial the lines in the blame_entry are.
|
|
|
|
*/
|
2006-10-20 21:51:12 +00:00
|
|
|
static unsigned ent_score(struct scoreboard *sb, struct blame_entry *e)
|
|
|
|
{
|
|
|
|
unsigned score;
|
|
|
|
const char *cp, *ep;
|
|
|
|
|
|
|
|
if (e->score)
|
|
|
|
return e->score;
|
|
|
|
|
2006-10-21 06:49:31 +00:00
|
|
|
score = 1;
|
2006-10-20 21:51:12 +00:00
|
|
|
cp = nth_line(sb, e->lno);
|
|
|
|
ep = nth_line(sb, e->lno + e->num_lines);
|
|
|
|
while (cp < ep) {
|
|
|
|
unsigned ch = *((unsigned char *)cp);
|
|
|
|
if (isalnum(ch))
|
|
|
|
score++;
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
e->score = score;
|
|
|
|
return score;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* best_so_far[] and this[] are both a split of an existing blame_entry
|
|
|
|
* that passes blame to the parent. Maintain best_so_far the best split
|
|
|
|
* so far, by comparing this and best_so_far and copying this into
|
|
|
|
* bst_so_far as needed.
|
|
|
|
*/
|
2006-10-20 21:51:12 +00:00
|
|
|
static void copy_split_if_better(struct scoreboard *sb,
|
2006-10-29 11:07:40 +00:00
|
|
|
struct blame_entry *best_so_far,
|
|
|
|
struct blame_entry *this)
|
2006-10-20 01:49:30 +00:00
|
|
|
{
|
2006-10-29 11:07:40 +00:00
|
|
|
int i;
|
|
|
|
|
2006-10-20 01:49:30 +00:00
|
|
|
if (!this[1].suspect)
|
|
|
|
return;
|
2006-10-20 21:51:12 +00:00
|
|
|
if (best_so_far[1].suspect) {
|
|
|
|
if (ent_score(sb, &this[1]) < ent_score(sb, &best_so_far[1]))
|
|
|
|
return;
|
|
|
|
}
|
2006-10-29 11:07:40 +00:00
|
|
|
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
origin_incref(this[i].suspect);
|
|
|
|
decref_split(best_so_far);
|
2006-10-20 01:49:30 +00:00
|
|
|
memcpy(best_so_far, this, sizeof(struct blame_entry [3]));
|
|
|
|
}
|
|
|
|
|
2007-05-05 16:13:26 +00:00
|
|
|
/*
|
|
|
|
* We are looking at a part of the final image represented by
|
|
|
|
* ent (tlno and same are offset by ent->s_lno).
|
|
|
|
* tlno is where we are looking at in the final image.
|
|
|
|
* up to (but not including) same match preimage.
|
|
|
|
* plno is where we are looking at in the preimage.
|
|
|
|
*
|
|
|
|
* <-------------- final image ---------------------->
|
|
|
|
* <------ent------>
|
|
|
|
* ^tlno ^same
|
|
|
|
* <---------preimage----->
|
|
|
|
* ^plno
|
|
|
|
*
|
|
|
|
* All line numbers are 0-based.
|
|
|
|
*/
|
|
|
|
static void handle_split(struct scoreboard *sb,
|
|
|
|
struct blame_entry *ent,
|
|
|
|
int tlno, int plno, int same,
|
|
|
|
struct origin *parent,
|
|
|
|
struct blame_entry *split)
|
|
|
|
{
|
|
|
|
if (ent->num_lines <= tlno)
|
|
|
|
return;
|
|
|
|
if (tlno < same) {
|
|
|
|
struct blame_entry this[3];
|
|
|
|
tlno += ent->s_lno;
|
|
|
|
same += ent->s_lno;
|
|
|
|
split_overlap(this, ent, tlno, plno, same, parent);
|
|
|
|
copy_split_if_better(sb, split, this);
|
|
|
|
decref_split(this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Find the lines from parent that are the same as ent so that
|
|
|
|
* we can pass blames to it. file_p has the blob contents for
|
|
|
|
* the parent.
|
|
|
|
*/
|
2006-10-20 01:49:30 +00:00
|
|
|
static void find_copy_in_blob(struct scoreboard *sb,
|
|
|
|
struct blame_entry *ent,
|
|
|
|
struct origin *parent,
|
2006-10-29 11:07:40 +00:00
|
|
|
struct blame_entry *split,
|
2006-10-20 01:49:30 +00:00
|
|
|
mmfile_t *file_p)
|
|
|
|
{
|
|
|
|
const char *cp;
|
|
|
|
int cnt;
|
|
|
|
mmfile_t file_o;
|
|
|
|
struct patch *patch;
|
|
|
|
int i, plno, tlno;
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Prepare mmfile that contains only the lines in ent.
|
|
|
|
*/
|
2006-10-20 01:49:30 +00:00
|
|
|
cp = nth_line(sb, ent->lno);
|
|
|
|
file_o.ptr = (char*) cp;
|
|
|
|
cnt = ent->num_lines;
|
|
|
|
|
|
|
|
while (cnt && cp < sb->final_buf + sb->final_buf_size) {
|
|
|
|
if (*cp++ == '\n')
|
|
|
|
cnt--;
|
|
|
|
}
|
|
|
|
file_o.size = cp - file_o.ptr;
|
|
|
|
|
|
|
|
patch = compare_buffer(file_p, &file_o, 1);
|
|
|
|
|
2007-05-05 16:13:26 +00:00
|
|
|
/*
|
|
|
|
* file_o is a part of final image we are annotating.
|
|
|
|
* file_p partially may match that image.
|
|
|
|
*/
|
2006-10-20 01:49:30 +00:00
|
|
|
memset(split, 0, sizeof(struct blame_entry [3]));
|
|
|
|
plno = tlno = 0;
|
|
|
|
for (i = 0; i < patch->num; i++) {
|
|
|
|
struct chunk *chunk = &patch->chunks[i];
|
|
|
|
|
2007-05-05 16:13:26 +00:00
|
|
|
handle_split(sb, ent, tlno, plno, chunk->same, parent, split);
|
2006-10-20 01:49:30 +00:00
|
|
|
plno = chunk->p_next;
|
|
|
|
tlno = chunk->t_next;
|
|
|
|
}
|
2007-05-05 16:13:26 +00:00
|
|
|
/* remainder, if any, all match the preimage */
|
|
|
|
handle_split(sb, ent, tlno, plno, ent->num_lines, parent, split);
|
2006-10-20 01:49:30 +00:00
|
|
|
free_patch(patch);
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* See if lines currently target is suspected for can be attributed to
|
|
|
|
* parent.
|
|
|
|
*/
|
2006-10-20 01:49:30 +00:00
|
|
|
static int find_move_in_parent(struct scoreboard *sb,
|
|
|
|
struct origin *target,
|
|
|
|
struct origin *parent)
|
|
|
|
{
|
2006-11-04 20:37:02 +00:00
|
|
|
int last_in_target, made_progress;
|
2006-10-21 07:41:38 +00:00
|
|
|
struct blame_entry *e, split[3];
|
2006-10-20 01:49:30 +00:00
|
|
|
mmfile_t file_p;
|
|
|
|
|
|
|
|
last_in_target = find_last_in_target(sb, target);
|
|
|
|
if (last_in_target < 0)
|
|
|
|
return 1; /* nothing remains for this target */
|
|
|
|
|
2006-11-05 19:51:41 +00:00
|
|
|
fill_origin_blob(parent, &file_p);
|
|
|
|
if (!file_p.ptr)
|
2006-10-20 01:49:30 +00:00
|
|
|
return 0;
|
|
|
|
|
2006-11-04 20:37:02 +00:00
|
|
|
made_progress = 1;
|
|
|
|
while (made_progress) {
|
|
|
|
made_progress = 0;
|
|
|
|
for (e = sb->ent; e; e = e->next) {
|
2007-03-21 06:37:51 +00:00
|
|
|
if (e->guilty || !same_suspect(e->suspect, target))
|
2006-11-04 20:37:02 +00:00
|
|
|
continue;
|
|
|
|
find_copy_in_blob(sb, e, parent, split, &file_p);
|
|
|
|
if (split[1].suspect &&
|
|
|
|
blame_move_score < ent_score(sb, &split[1])) {
|
|
|
|
split_blame(sb, split, e);
|
|
|
|
made_progress = 1;
|
|
|
|
}
|
|
|
|
decref_split(split);
|
|
|
|
}
|
2006-10-20 01:49:30 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-11-05 00:39:03 +00:00
|
|
|
struct blame_list {
|
|
|
|
struct blame_entry *ent;
|
|
|
|
struct blame_entry split[3];
|
|
|
|
};
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Count the number of entries the target is suspected for,
|
|
|
|
* and prepare a list of entry and the best split.
|
|
|
|
*/
|
2006-11-05 00:39:03 +00:00
|
|
|
static struct blame_list *setup_blame_list(struct scoreboard *sb,
|
|
|
|
struct origin *target,
|
|
|
|
int *num_ents_p)
|
|
|
|
{
|
|
|
|
struct blame_entry *e;
|
|
|
|
int num_ents, i;
|
|
|
|
struct blame_list *blame_list = NULL;
|
|
|
|
|
|
|
|
for (e = sb->ent, num_ents = 0; e; e = e->next)
|
2007-03-21 06:37:51 +00:00
|
|
|
if (!e->guilty && same_suspect(e->suspect, target))
|
2006-11-05 00:39:03 +00:00
|
|
|
num_ents++;
|
|
|
|
if (num_ents) {
|
|
|
|
blame_list = xcalloc(num_ents, sizeof(struct blame_list));
|
|
|
|
for (e = sb->ent, i = 0; e; e = e->next)
|
2007-03-21 06:37:51 +00:00
|
|
|
if (!e->guilty && same_suspect(e->suspect, target))
|
2006-11-05 00:39:03 +00:00
|
|
|
blame_list[i++].ent = e;
|
|
|
|
}
|
|
|
|
*num_ents_p = num_ents;
|
|
|
|
return blame_list;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* For lines target is suspected for, see if we can find code movement
|
|
|
|
* across file boundary from the parent commit. porigin is the path
|
|
|
|
* in the parent we already tried.
|
|
|
|
*/
|
2006-10-20 01:50:17 +00:00
|
|
|
static int find_copy_in_parent(struct scoreboard *sb,
|
|
|
|
struct origin *target,
|
|
|
|
struct commit *parent,
|
|
|
|
struct origin *porigin,
|
|
|
|
int opt)
|
|
|
|
{
|
|
|
|
struct diff_options diff_opts;
|
|
|
|
const char *paths[1];
|
2006-10-21 10:30:53 +00:00
|
|
|
int i, j;
|
2006-11-05 00:39:03 +00:00
|
|
|
int retval;
|
|
|
|
struct blame_list *blame_list;
|
2006-10-21 10:30:53 +00:00
|
|
|
int num_ents;
|
2006-10-20 01:50:17 +00:00
|
|
|
|
2006-11-05 00:39:03 +00:00
|
|
|
blame_list = setup_blame_list(sb, target, &num_ents);
|
|
|
|
if (!blame_list)
|
2006-10-20 01:50:17 +00:00
|
|
|
return 1; /* nothing remains for this target */
|
|
|
|
|
|
|
|
diff_setup(&diff_opts);
|
|
|
|
diff_opts.recursive = 1;
|
|
|
|
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
|
|
|
|
|
|
|
|
paths[0] = NULL;
|
|
|
|
diff_tree_setup_paths(paths, &diff_opts);
|
|
|
|
if (diff_setup_done(&diff_opts) < 0)
|
|
|
|
die("diff-setup");
|
2006-11-05 00:39:03 +00:00
|
|
|
|
|
|
|
/* Try "find copies harder" on new path if requested;
|
|
|
|
* we do not want to use diffcore_rename() actually to
|
|
|
|
* match things up; find_copies_harder is set only to
|
|
|
|
* force diff_tree_sha1() to feed all filepairs to diff_queue,
|
|
|
|
* and this code needs to be after diff_setup_done(), which
|
|
|
|
* usually makes find-copies-harder imply copy detection.
|
|
|
|
*/
|
2007-05-06 04:18:57 +00:00
|
|
|
if ((opt & PICKAXE_BLAME_COPY_HARDEST)
|
|
|
|
|| ((opt & PICKAXE_BLAME_COPY_HARDER)
|
|
|
|
&& (!porigin || strcmp(target->path, porigin->path))))
|
2006-11-05 00:39:03 +00:00
|
|
|
diff_opts.find_copies_harder = 1;
|
|
|
|
|
2007-01-30 09:11:08 +00:00
|
|
|
if (is_null_sha1(target->commit->object.sha1))
|
|
|
|
do_diff_cache(parent->tree->object.sha1, &diff_opts);
|
|
|
|
else
|
|
|
|
diff_tree_sha1(parent->tree->object.sha1,
|
|
|
|
target->commit->tree->object.sha1,
|
|
|
|
"", &diff_opts);
|
2006-10-20 01:50:17 +00:00
|
|
|
|
2006-11-05 00:39:03 +00:00
|
|
|
if (!diff_opts.find_copies_harder)
|
|
|
|
diffcore_std(&diff_opts);
|
2006-10-20 01:50:17 +00:00
|
|
|
|
2006-11-05 00:39:03 +00:00
|
|
|
retval = 0;
|
|
|
|
while (1) {
|
|
|
|
int made_progress = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < diff_queued_diff.nr; i++) {
|
|
|
|
struct diff_filepair *p = diff_queued_diff.queue[i];
|
|
|
|
struct origin *norigin;
|
|
|
|
mmfile_t file_p;
|
|
|
|
struct blame_entry this[3];
|
|
|
|
|
|
|
|
if (!DIFF_FILE_VALID(p->one))
|
|
|
|
continue; /* does not exist in parent */
|
|
|
|
if (porigin && !strcmp(p->one->path, porigin->path))
|
|
|
|
/* find_move already dealt with this path */
|
|
|
|
continue;
|
|
|
|
|
|
|
|
norigin = get_origin(sb, parent, p->one->path);
|
|
|
|
hashcpy(norigin->blob_sha1, p->one->sha1);
|
2006-11-05 19:51:41 +00:00
|
|
|
fill_origin_blob(norigin, &file_p);
|
2006-11-05 00:39:03 +00:00
|
|
|
if (!file_p.ptr)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (j = 0; j < num_ents; j++) {
|
|
|
|
find_copy_in_blob(sb, blame_list[j].ent,
|
|
|
|
norigin, this, &file_p);
|
|
|
|
copy_split_if_better(sb, blame_list[j].split,
|
|
|
|
this);
|
|
|
|
decref_split(this);
|
|
|
|
}
|
|
|
|
origin_decref(norigin);
|
|
|
|
}
|
2006-10-20 01:50:17 +00:00
|
|
|
|
2006-10-21 10:30:53 +00:00
|
|
|
for (j = 0; j < num_ents; j++) {
|
2006-11-05 00:39:03 +00:00
|
|
|
struct blame_entry *split = blame_list[j].split;
|
|
|
|
if (split[1].suspect &&
|
|
|
|
blame_copy_score < ent_score(sb, &split[1])) {
|
|
|
|
split_blame(sb, split, blame_list[j].ent);
|
|
|
|
made_progress = 1;
|
|
|
|
}
|
|
|
|
decref_split(split);
|
2006-10-20 01:50:17 +00:00
|
|
|
}
|
2006-11-05 00:39:03 +00:00
|
|
|
free(blame_list);
|
2006-10-21 10:30:53 +00:00
|
|
|
|
2006-11-05 00:39:03 +00:00
|
|
|
if (!made_progress)
|
|
|
|
break;
|
|
|
|
blame_list = setup_blame_list(sb, target, &num_ents);
|
|
|
|
if (!blame_list) {
|
|
|
|
retval = 1;
|
|
|
|
break;
|
|
|
|
}
|
2006-10-20 01:50:17 +00:00
|
|
|
}
|
2006-11-05 00:39:03 +00:00
|
|
|
diff_flush(&diff_opts);
|
2006-10-20 01:50:17 +00:00
|
|
|
|
2006-11-05 00:39:03 +00:00
|
|
|
return retval;
|
2006-10-20 01:50:17 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The blobs of origin and porigin exactly match, so everything
|
2006-11-05 19:51:41 +00:00
|
|
|
* origin is suspected for can be blamed on the parent.
|
|
|
|
*/
|
|
|
|
static void pass_whole_blame(struct scoreboard *sb,
|
|
|
|
struct origin *origin, struct origin *porigin)
|
|
|
|
{
|
|
|
|
struct blame_entry *e;
|
|
|
|
|
|
|
|
if (!porigin->file.ptr && origin->file.ptr) {
|
|
|
|
/* Steal its file */
|
|
|
|
porigin->file = origin->file;
|
|
|
|
origin->file.ptr = NULL;
|
|
|
|
}
|
|
|
|
for (e = sb->ent; e; e = e->next) {
|
2007-03-21 06:37:51 +00:00
|
|
|
if (!same_suspect(e->suspect, origin))
|
2006-11-05 19:51:41 +00:00
|
|
|
continue;
|
|
|
|
origin_incref(porigin);
|
|
|
|
origin_decref(e->suspect);
|
|
|
|
e->suspect = porigin;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-19 23:00:04 +00:00
|
|
|
#define MAXPARENT 16
|
|
|
|
|
2006-10-20 01:49:30 +00:00
|
|
|
static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)
|
2006-10-19 23:00:04 +00:00
|
|
|
{
|
2006-10-31 01:17:41 +00:00
|
|
|
int i, pass;
|
2006-10-19 23:00:04 +00:00
|
|
|
struct commit *commit = origin->commit;
|
|
|
|
struct commit_list *parent;
|
|
|
|
struct origin *parent_origin[MAXPARENT], *porigin;
|
|
|
|
|
|
|
|
memset(parent_origin, 0, sizeof(parent_origin));
|
|
|
|
|
2006-10-31 01:17:41 +00:00
|
|
|
/* The first pass looks for unrenamed path to optimize for
|
|
|
|
* common cases, then we look for renames in the second pass.
|
|
|
|
*/
|
|
|
|
for (pass = 0; pass < 2; pass++) {
|
|
|
|
struct origin *(*find)(struct scoreboard *,
|
|
|
|
struct commit *, struct origin *);
|
|
|
|
find = pass ? find_rename : find_origin;
|
|
|
|
|
|
|
|
for (i = 0, parent = commit->parents;
|
|
|
|
i < MAXPARENT && parent;
|
|
|
|
parent = parent->next, i++) {
|
|
|
|
struct commit *p = parent->item;
|
2006-11-04 20:20:09 +00:00
|
|
|
int j, same;
|
2006-10-31 01:17:41 +00:00
|
|
|
|
|
|
|
if (parent_origin[i])
|
|
|
|
continue;
|
|
|
|
if (parse_commit(p))
|
|
|
|
continue;
|
2006-10-31 09:00:01 +00:00
|
|
|
porigin = find(sb, p, origin);
|
2006-10-31 01:17:41 +00:00
|
|
|
if (!porigin)
|
|
|
|
continue;
|
|
|
|
if (!hashcmp(porigin->blob_sha1, origin->blob_sha1)) {
|
2006-11-05 19:51:41 +00:00
|
|
|
pass_whole_blame(sb, origin, porigin);
|
2006-10-31 01:17:41 +00:00
|
|
|
origin_decref(porigin);
|
|
|
|
goto finish;
|
|
|
|
}
|
2006-11-04 20:20:09 +00:00
|
|
|
for (j = same = 0; j < i; j++)
|
2006-11-05 00:39:03 +00:00
|
|
|
if (parent_origin[j] &&
|
|
|
|
!hashcmp(parent_origin[j]->blob_sha1,
|
2006-11-04 20:20:09 +00:00
|
|
|
porigin->blob_sha1)) {
|
|
|
|
same = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!same)
|
|
|
|
parent_origin[i] = porigin;
|
|
|
|
else
|
|
|
|
origin_decref(porigin);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-11-05 19:51:41 +00:00
|
|
|
num_commits++;
|
2006-10-19 23:00:04 +00:00
|
|
|
for (i = 0, parent = commit->parents;
|
|
|
|
i < MAXPARENT && parent;
|
|
|
|
parent = parent->next, i++) {
|
|
|
|
struct origin *porigin = parent_origin[i];
|
|
|
|
if (!porigin)
|
|
|
|
continue;
|
|
|
|
if (pass_blame_to_parent(sb, origin, porigin))
|
2006-10-29 11:07:40 +00:00
|
|
|
goto finish;
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
2006-10-20 01:49:30 +00:00
|
|
|
|
|
|
|
/*
|
2007-01-30 01:36:22 +00:00
|
|
|
* Optionally find moves in parents' files.
|
2006-10-20 01:49:30 +00:00
|
|
|
*/
|
|
|
|
if (opt & PICKAXE_BLAME_MOVE)
|
|
|
|
for (i = 0, parent = commit->parents;
|
|
|
|
i < MAXPARENT && parent;
|
|
|
|
parent = parent->next, i++) {
|
|
|
|
struct origin *porigin = parent_origin[i];
|
|
|
|
if (!porigin)
|
|
|
|
continue;
|
|
|
|
if (find_move_in_parent(sb, origin, porigin))
|
2006-10-29 11:07:40 +00:00
|
|
|
goto finish;
|
2006-10-20 01:49:30 +00:00
|
|
|
}
|
|
|
|
|
2006-10-20 01:50:17 +00:00
|
|
|
/*
|
2007-01-30 01:36:22 +00:00
|
|
|
* Optionally find copies from parents' files.
|
2006-10-20 01:50:17 +00:00
|
|
|
*/
|
|
|
|
if (opt & PICKAXE_BLAME_COPY)
|
|
|
|
for (i = 0, parent = commit->parents;
|
|
|
|
i < MAXPARENT && parent;
|
|
|
|
parent = parent->next, i++) {
|
|
|
|
struct origin *porigin = parent_origin[i];
|
|
|
|
if (find_copy_in_parent(sb, origin, parent->item,
|
|
|
|
porigin, opt))
|
2006-10-29 11:07:40 +00:00
|
|
|
goto finish;
|
2006-10-20 01:50:17 +00:00
|
|
|
}
|
2006-10-29 11:07:40 +00:00
|
|
|
|
|
|
|
finish:
|
|
|
|
for (i = 0; i < MAXPARENT; i++)
|
|
|
|
origin_decref(parent_origin[i]);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Information on commits, used for output.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
struct commit_info
|
|
|
|
{
|
2007-03-07 01:44:17 +00:00
|
|
|
const char *author;
|
|
|
|
const char *author_mail;
|
2006-10-19 23:00:04 +00:00
|
|
|
unsigned long author_time;
|
2007-03-07 01:44:17 +00:00
|
|
|
const char *author_tz;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
/* filled only when asked for details */
|
2007-03-07 01:44:17 +00:00
|
|
|
const char *committer;
|
|
|
|
const char *committer_mail;
|
2006-10-19 23:00:04 +00:00
|
|
|
unsigned long committer_time;
|
2007-03-07 01:44:17 +00:00
|
|
|
const char *committer_tz;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2007-03-07 01:44:17 +00:00
|
|
|
const char *summary;
|
2006-10-19 23:00:04 +00:00
|
|
|
};
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Parse author/committer line in the commit object buffer
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void get_ac_line(const char *inbuf, const char *what,
|
2007-03-07 01:44:17 +00:00
|
|
|
int bufsz, char *person, const char **mail,
|
|
|
|
unsigned long *time, const char **tz)
|
2006-10-19 23:00:04 +00:00
|
|
|
{
|
2007-04-27 07:42:15 +00:00
|
|
|
int len, tzlen, maillen;
|
|
|
|
char *tmp, *endp, *timepos;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
tmp = strstr(inbuf, what);
|
|
|
|
if (!tmp)
|
|
|
|
goto error_out;
|
|
|
|
tmp += strlen(what);
|
|
|
|
endp = strchr(tmp, '\n');
|
|
|
|
if (!endp)
|
|
|
|
len = strlen(tmp);
|
|
|
|
else
|
|
|
|
len = endp - tmp;
|
|
|
|
if (bufsz <= len) {
|
|
|
|
error_out:
|
|
|
|
/* Ugh */
|
2007-03-07 01:44:17 +00:00
|
|
|
*mail = *tz = "(unknown)";
|
2006-10-19 23:00:04 +00:00
|
|
|
*time = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
memcpy(person, tmp, len);
|
|
|
|
|
|
|
|
tmp = person;
|
|
|
|
tmp += len;
|
|
|
|
*tmp = 0;
|
|
|
|
while (*tmp != ' ')
|
|
|
|
tmp--;
|
|
|
|
*tz = tmp+1;
|
2007-04-27 07:42:15 +00:00
|
|
|
tzlen = (person+len)-(tmp+1);
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
*tmp = 0;
|
|
|
|
while (*tmp != ' ')
|
|
|
|
tmp--;
|
|
|
|
*time = strtoul(tmp, NULL, 10);
|
2007-04-27 07:42:15 +00:00
|
|
|
timepos = tmp;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
*tmp = 0;
|
|
|
|
while (*tmp != ' ')
|
|
|
|
tmp--;
|
|
|
|
*mail = tmp + 1;
|
|
|
|
*tmp = 0;
|
2007-04-27 07:42:15 +00:00
|
|
|
maillen = timepos - tmp;
|
|
|
|
|
|
|
|
if (!mailmap.nr)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* mailmap expansion may make the name longer.
|
|
|
|
* make room by pushing stuff down.
|
|
|
|
*/
|
|
|
|
tmp = person + bufsz - (tzlen + 1);
|
|
|
|
memmove(tmp, *tz, tzlen);
|
|
|
|
tmp[tzlen] = 0;
|
|
|
|
*tz = tmp;
|
|
|
|
|
|
|
|
tmp = tmp - (maillen + 1);
|
|
|
|
memmove(tmp, *mail, maillen);
|
|
|
|
tmp[maillen] = 0;
|
|
|
|
*mail = tmp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now, convert e-mail using mailmap
|
|
|
|
*/
|
|
|
|
map_email(&mailmap, tmp + 1, person, tmp-person-1);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void get_commit_info(struct commit *commit,
|
|
|
|
struct commit_info *ret,
|
|
|
|
int detailed)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
char *tmp, *endp;
|
|
|
|
static char author_buf[1024];
|
|
|
|
static char committer_buf[1024];
|
|
|
|
static char summary_buf[1024];
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* We've operated without save_commit_buffer, so
|
2006-10-21 06:49:31 +00:00
|
|
|
* we now need to populate them for output.
|
|
|
|
*/
|
|
|
|
if (!commit->buffer) {
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
2006-10-21 06:49:31 +00:00
|
|
|
unsigned long size;
|
|
|
|
commit->buffer =
|
2007-02-26 19:55:59 +00:00
|
|
|
read_sha1_file(commit->object.sha1, &type, &size);
|
2006-10-21 06:49:31 +00:00
|
|
|
}
|
2006-10-19 23:00:04 +00:00
|
|
|
ret->author = author_buf;
|
|
|
|
get_ac_line(commit->buffer, "\nauthor ",
|
|
|
|
sizeof(author_buf), author_buf, &ret->author_mail,
|
|
|
|
&ret->author_time, &ret->author_tz);
|
|
|
|
|
|
|
|
if (!detailed)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ret->committer = committer_buf;
|
|
|
|
get_ac_line(commit->buffer, "\ncommitter ",
|
|
|
|
sizeof(committer_buf), committer_buf, &ret->committer_mail,
|
|
|
|
&ret->committer_time, &ret->committer_tz);
|
|
|
|
|
|
|
|
ret->summary = summary_buf;
|
|
|
|
tmp = strstr(commit->buffer, "\n\n");
|
|
|
|
if (!tmp) {
|
|
|
|
error_out:
|
|
|
|
sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
tmp += 2;
|
|
|
|
endp = strchr(tmp, '\n');
|
|
|
|
if (!endp)
|
2007-01-30 09:11:08 +00:00
|
|
|
endp = tmp + strlen(tmp);
|
2006-10-19 23:00:04 +00:00
|
|
|
len = endp - tmp;
|
2007-01-30 09:11:08 +00:00
|
|
|
if (len >= sizeof(summary_buf) || len == 0)
|
2006-10-19 23:00:04 +00:00
|
|
|
goto error_out;
|
|
|
|
memcpy(summary_buf, tmp, len);
|
|
|
|
summary_buf[len] = 0;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* To allow LF and other nonportable characters in pathnames,
|
|
|
|
* they are c-style quoted as needed.
|
|
|
|
*/
|
2007-01-28 09:42:31 +00:00
|
|
|
static void write_filename_info(const char *path)
|
|
|
|
{
|
|
|
|
printf("filename ");
|
|
|
|
write_name_quoted(NULL, 0, path, 1, stdout);
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The blame_entry is found to be guilty for the range. Mark it
|
|
|
|
* as such, and show it in incremental output.
|
|
|
|
*/
|
2007-01-28 09:34:06 +00:00
|
|
|
static void found_guilty_entry(struct blame_entry *ent)
|
|
|
|
{
|
|
|
|
if (ent->guilty)
|
|
|
|
return;
|
|
|
|
ent->guilty = 1;
|
|
|
|
if (incremental) {
|
|
|
|
struct origin *suspect = ent->suspect;
|
|
|
|
|
|
|
|
printf("%s %d %d %d\n",
|
|
|
|
sha1_to_hex(suspect->commit->object.sha1),
|
|
|
|
ent->s_lno + 1, ent->lno + 1, ent->num_lines);
|
|
|
|
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
|
|
|
|
struct commit_info ci;
|
|
|
|
suspect->commit->object.flags |= METAINFO_SHOWN;
|
|
|
|
get_commit_info(suspect->commit, &ci, 1);
|
|
|
|
printf("author %s\n", ci.author);
|
|
|
|
printf("author-mail %s\n", ci.author_mail);
|
|
|
|
printf("author-time %lu\n", ci.author_time);
|
|
|
|
printf("author-tz %s\n", ci.author_tz);
|
|
|
|
printf("committer %s\n", ci.committer);
|
|
|
|
printf("committer-mail %s\n", ci.committer_mail);
|
|
|
|
printf("committer-time %lu\n", ci.committer_time);
|
|
|
|
printf("committer-tz %s\n", ci.committer_tz);
|
|
|
|
printf("summary %s\n", ci.summary);
|
|
|
|
if (suspect->commit->object.flags & UNINTERESTING)
|
|
|
|
printf("boundary\n");
|
|
|
|
}
|
2007-01-28 09:42:31 +00:00
|
|
|
write_filename_info(suspect->path);
|
2007-06-29 17:40:46 +00:00
|
|
|
maybe_flush_or_die(stdout, "stdout");
|
2007-01-28 09:34:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* The main loop -- while the scoreboard has lines whose true origin
|
2007-02-04 04:49:16 +00:00
|
|
|
* is still unknown, pick one blame_entry, and allow its current
|
2007-01-30 01:36:22 +00:00
|
|
|
* suspect to pass blames to its parents.
|
|
|
|
*/
|
2007-01-28 09:34:06 +00:00
|
|
|
static void assign_blame(struct scoreboard *sb, struct rev_info *revs, int opt)
|
|
|
|
{
|
|
|
|
while (1) {
|
|
|
|
struct blame_entry *ent;
|
|
|
|
struct commit *commit;
|
|
|
|
struct origin *suspect = NULL;
|
|
|
|
|
|
|
|
/* find one suspect to break down */
|
|
|
|
for (ent = sb->ent; !suspect && ent; ent = ent->next)
|
|
|
|
if (!ent->guilty)
|
|
|
|
suspect = ent->suspect;
|
|
|
|
if (!suspect)
|
|
|
|
return; /* all done */
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* We will use this suspect later in the loop,
|
|
|
|
* so hold onto it in the meantime.
|
|
|
|
*/
|
2007-01-28 09:34:06 +00:00
|
|
|
origin_incref(suspect);
|
|
|
|
commit = suspect->commit;
|
|
|
|
if (!commit->object.parsed)
|
|
|
|
parse_commit(commit);
|
|
|
|
if (!(commit->object.flags & UNINTERESTING) &&
|
2007-01-30 01:36:22 +00:00
|
|
|
!(revs->max_age != -1 && commit->date < revs->max_age))
|
2007-01-28 09:34:06 +00:00
|
|
|
pass_blame(sb, suspect, opt);
|
|
|
|
else {
|
|
|
|
commit->object.flags |= UNINTERESTING;
|
|
|
|
if (commit->object.parsed)
|
|
|
|
mark_parents_uninteresting(commit);
|
|
|
|
}
|
|
|
|
/* treat root commit as boundary */
|
|
|
|
if (!commit->parents && !show_root)
|
|
|
|
commit->object.flags |= UNINTERESTING;
|
|
|
|
|
|
|
|
/* Take responsibility for the remaining entries */
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next)
|
2007-03-21 06:37:51 +00:00
|
|
|
if (same_suspect(ent->suspect, suspect))
|
2007-01-28 09:34:06 +00:00
|
|
|
found_guilty_entry(ent);
|
|
|
|
origin_decref(suspect);
|
|
|
|
|
|
|
|
if (DEBUG) /* sanity */
|
|
|
|
sanity_check_refcnt(sb);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *format_time(unsigned long time, const char *tz_str,
|
|
|
|
int show_raw_time)
|
|
|
|
{
|
|
|
|
static char time_buf[128];
|
|
|
|
time_t t = time;
|
|
|
|
int minutes, tz;
|
|
|
|
struct tm *tm;
|
|
|
|
|
|
|
|
if (show_raw_time) {
|
|
|
|
sprintf(time_buf, "%lu %s", time, tz_str);
|
|
|
|
return time_buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
tz = atoi(tz_str);
|
|
|
|
minutes = tz < 0 ? -tz : tz;
|
|
|
|
minutes = (minutes / 100)*60 + (minutes % 100);
|
|
|
|
minutes = tz < 0 ? -minutes : minutes;
|
|
|
|
t = time + minutes * 60;
|
|
|
|
tm = gmtime(&t);
|
|
|
|
|
|
|
|
strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", tm);
|
|
|
|
strcat(time_buf, tz_str);
|
|
|
|
return time_buf;
|
|
|
|
}
|
|
|
|
|
2006-10-19 23:00:04 +00:00
|
|
|
#define OUTPUT_ANNOTATE_COMPAT 001
|
|
|
|
#define OUTPUT_LONG_OBJECT_NAME 002
|
|
|
|
#define OUTPUT_RAW_TIMESTAMP 004
|
|
|
|
#define OUTPUT_PORCELAIN 010
|
|
|
|
#define OUTPUT_SHOW_NAME 020
|
|
|
|
#define OUTPUT_SHOW_NUMBER 040
|
2006-10-20 21:51:12 +00:00
|
|
|
#define OUTPUT_SHOW_SCORE 0100
|
2007-04-12 22:50:45 +00:00
|
|
|
#define OUTPUT_NO_AUTHOR 0200
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent)
|
|
|
|
{
|
|
|
|
int cnt;
|
|
|
|
const char *cp;
|
|
|
|
struct origin *suspect = ent->suspect;
|
|
|
|
char hex[41];
|
|
|
|
|
|
|
|
strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
|
|
|
|
printf("%s%c%d %d %d\n",
|
|
|
|
hex,
|
|
|
|
ent->guilty ? ' ' : '*', // purely for debugging
|
|
|
|
ent->s_lno + 1,
|
|
|
|
ent->lno + 1,
|
|
|
|
ent->num_lines);
|
|
|
|
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
|
|
|
|
struct commit_info ci;
|
|
|
|
suspect->commit->object.flags |= METAINFO_SHOWN;
|
|
|
|
get_commit_info(suspect->commit, &ci, 1);
|
|
|
|
printf("author %s\n", ci.author);
|
|
|
|
printf("author-mail %s\n", ci.author_mail);
|
|
|
|
printf("author-time %lu\n", ci.author_time);
|
|
|
|
printf("author-tz %s\n", ci.author_tz);
|
|
|
|
printf("committer %s\n", ci.committer);
|
|
|
|
printf("committer-mail %s\n", ci.committer_mail);
|
|
|
|
printf("committer-time %lu\n", ci.committer_time);
|
|
|
|
printf("committer-tz %s\n", ci.committer_tz);
|
2007-01-28 09:42:31 +00:00
|
|
|
write_filename_info(suspect->path);
|
2006-10-19 23:00:04 +00:00
|
|
|
printf("summary %s\n", ci.summary);
|
2006-12-02 04:45:45 +00:00
|
|
|
if (suspect->commit->object.flags & UNINTERESTING)
|
|
|
|
printf("boundary\n");
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
else if (suspect->commit->object.flags & MORE_THAN_ONE_PATH)
|
2007-01-28 09:42:31 +00:00
|
|
|
write_filename_info(suspect->path);
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
cp = nth_line(sb, ent->lno);
|
|
|
|
for (cnt = 0; cnt < ent->num_lines; cnt++) {
|
|
|
|
char ch;
|
|
|
|
if (cnt)
|
|
|
|
printf("%s %d %d\n", hex,
|
|
|
|
ent->s_lno + 1 + cnt,
|
|
|
|
ent->lno + 1 + cnt);
|
|
|
|
putchar('\t');
|
|
|
|
do {
|
|
|
|
ch = *cp++;
|
|
|
|
putchar(ch);
|
|
|
|
} while (ch != '\n' &&
|
|
|
|
cp < sb->final_buf + sb->final_buf_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
|
|
|
|
{
|
|
|
|
int cnt;
|
|
|
|
const char *cp;
|
|
|
|
struct origin *suspect = ent->suspect;
|
|
|
|
struct commit_info ci;
|
|
|
|
char hex[41];
|
|
|
|
int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
|
|
|
|
|
|
|
|
get_commit_info(suspect->commit, &ci, 1);
|
|
|
|
strcpy(hex, sha1_to_hex(suspect->commit->object.sha1));
|
|
|
|
|
|
|
|
cp = nth_line(sb, ent->lno);
|
|
|
|
for (cnt = 0; cnt < ent->num_lines; cnt++) {
|
|
|
|
char ch;
|
2006-12-02 04:45:45 +00:00
|
|
|
int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? 40 : 8;
|
|
|
|
|
|
|
|
if (suspect->commit->object.flags & UNINTERESTING) {
|
2007-02-06 09:52:04 +00:00
|
|
|
if (blank_boundary)
|
|
|
|
memset(hex, ' ', length);
|
|
|
|
else if (!cmd_is_annotate) {
|
2006-12-18 22:04:38 +00:00
|
|
|
length--;
|
|
|
|
putchar('^');
|
|
|
|
}
|
2006-12-02 04:45:45 +00:00
|
|
|
}
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2006-12-02 04:45:45 +00:00
|
|
|
printf("%.*s", length, hex);
|
2006-10-19 23:00:04 +00:00
|
|
|
if (opt & OUTPUT_ANNOTATE_COMPAT)
|
|
|
|
printf("\t(%10s\t%10s\t%d)", ci.author,
|
|
|
|
format_time(ci.author_time, ci.author_tz,
|
|
|
|
show_raw_time),
|
|
|
|
ent->lno + 1 + cnt);
|
|
|
|
else {
|
2006-10-20 21:51:12 +00:00
|
|
|
if (opt & OUTPUT_SHOW_SCORE)
|
2006-10-29 11:07:40 +00:00
|
|
|
printf(" %*d %02d",
|
|
|
|
max_score_digits, ent->score,
|
|
|
|
ent->suspect->refcnt);
|
2006-10-19 23:00:04 +00:00
|
|
|
if (opt & OUTPUT_SHOW_NAME)
|
|
|
|
printf(" %-*.*s", longest_file, longest_file,
|
|
|
|
suspect->path);
|
|
|
|
if (opt & OUTPUT_SHOW_NUMBER)
|
|
|
|
printf(" %*d", max_orig_digits,
|
|
|
|
ent->s_lno + 1 + cnt);
|
2007-04-12 22:50:45 +00:00
|
|
|
|
|
|
|
if (!(opt & OUTPUT_NO_AUTHOR))
|
|
|
|
printf(" (%-*.*s %10s",
|
|
|
|
longest_author, longest_author,
|
|
|
|
ci.author,
|
|
|
|
format_time(ci.author_time,
|
|
|
|
ci.author_tz,
|
|
|
|
show_raw_time));
|
|
|
|
printf(" %*d) ",
|
2006-10-19 23:00:04 +00:00
|
|
|
max_digits, ent->lno + 1 + cnt);
|
|
|
|
}
|
|
|
|
do {
|
|
|
|
ch = *cp++;
|
|
|
|
putchar(ch);
|
|
|
|
} while (ch != '\n' &&
|
|
|
|
cp < sb->final_buf + sb->final_buf_size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void output(struct scoreboard *sb, int option)
|
|
|
|
{
|
|
|
|
struct blame_entry *ent;
|
|
|
|
|
|
|
|
if (option & OUTPUT_PORCELAIN) {
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
|
|
|
struct blame_entry *oth;
|
|
|
|
struct origin *suspect = ent->suspect;
|
|
|
|
struct commit *commit = suspect->commit;
|
|
|
|
if (commit->object.flags & MORE_THAN_ONE_PATH)
|
|
|
|
continue;
|
|
|
|
for (oth = ent->next; oth; oth = oth->next) {
|
|
|
|
if ((oth->suspect->commit != commit) ||
|
|
|
|
!strcmp(oth->suspect->path, suspect->path))
|
|
|
|
continue;
|
|
|
|
commit->object.flags |= MORE_THAN_ONE_PATH;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
|
|
|
if (option & OUTPUT_PORCELAIN)
|
|
|
|
emit_porcelain(sb, ent);
|
2006-10-20 21:51:12 +00:00
|
|
|
else {
|
2006-10-19 23:00:04 +00:00
|
|
|
emit_other(sb, ent, option);
|
2006-10-20 21:51:12 +00:00
|
|
|
}
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* To allow quick access to the contents of nth line in the
|
|
|
|
* final image, prepare an index in the scoreboard.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static int prepare_lines(struct scoreboard *sb)
|
|
|
|
{
|
|
|
|
const char *buf = sb->final_buf;
|
|
|
|
unsigned long len = sb->final_buf_size;
|
|
|
|
int num = 0, incomplete = 0, bol = 1;
|
|
|
|
|
|
|
|
if (len && buf[len-1] != '\n')
|
|
|
|
incomplete++; /* incomplete line at the end */
|
|
|
|
while (len--) {
|
|
|
|
if (bol) {
|
|
|
|
sb->lineno = xrealloc(sb->lineno,
|
|
|
|
sizeof(int* ) * (num + 1));
|
|
|
|
sb->lineno[num] = buf - sb->final_buf;
|
|
|
|
bol = 0;
|
|
|
|
}
|
|
|
|
if (*buf++ == '\n') {
|
|
|
|
num++;
|
|
|
|
bol = 1;
|
|
|
|
}
|
|
|
|
}
|
2006-10-21 01:48:18 +00:00
|
|
|
sb->lineno = xrealloc(sb->lineno,
|
|
|
|
sizeof(int* ) * (num + incomplete + 1));
|
|
|
|
sb->lineno[num + incomplete] = buf - sb->final_buf;
|
2006-10-19 23:00:04 +00:00
|
|
|
sb->num_lines = num + incomplete;
|
|
|
|
return sb->num_lines;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Add phony grafts for use with -S; this is primarily to
|
|
|
|
* support git-cvsserver that wants to give a linear history
|
|
|
|
* to its clients.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static int read_ancestry(const char *graft_file)
|
|
|
|
{
|
|
|
|
FILE *fp = fopen(graft_file, "r");
|
|
|
|
char buf[1024];
|
|
|
|
if (!fp)
|
|
|
|
return -1;
|
|
|
|
while (fgets(buf, sizeof(buf), fp)) {
|
|
|
|
/* The format is just "Commit Parent1 Parent2 ...\n" */
|
|
|
|
int len = strlen(buf);
|
|
|
|
struct commit_graft *graft = read_graft_line(buf, len);
|
2006-11-10 21:39:01 +00:00
|
|
|
if (graft)
|
|
|
|
register_commit_graft(graft, 0);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* How many columns do we need to show line numbers in decimal?
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static int lineno_width(int lines)
|
|
|
|
{
|
2007-06-10 01:15:24 +00:00
|
|
|
int i, width;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2007-06-10 01:15:24 +00:00
|
|
|
for (width = 1, i = 10; i <= lines + 1; width++)
|
|
|
|
i *= 10;
|
|
|
|
return width;
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* How many columns do we need to show line numbers, authors,
|
|
|
|
* and filenames?
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static void find_alignment(struct scoreboard *sb, int *option)
|
|
|
|
{
|
|
|
|
int longest_src_lines = 0;
|
|
|
|
int longest_dst_lines = 0;
|
2006-10-20 21:51:12 +00:00
|
|
|
unsigned largest_score = 0;
|
2006-10-19 23:00:04 +00:00
|
|
|
struct blame_entry *e;
|
|
|
|
|
|
|
|
for (e = sb->ent; e; e = e->next) {
|
|
|
|
struct origin *suspect = e->suspect;
|
|
|
|
struct commit_info ci;
|
|
|
|
int num;
|
|
|
|
|
2006-11-29 06:29:18 +00:00
|
|
|
if (strcmp(suspect->path, sb->path))
|
|
|
|
*option |= OUTPUT_SHOW_NAME;
|
|
|
|
num = strlen(suspect->path);
|
|
|
|
if (longest_file < num)
|
|
|
|
longest_file = num;
|
2006-10-19 23:00:04 +00:00
|
|
|
if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
|
|
|
|
suspect->commit->object.flags |= METAINFO_SHOWN;
|
|
|
|
get_commit_info(suspect->commit, &ci, 1);
|
|
|
|
num = strlen(ci.author);
|
|
|
|
if (longest_author < num)
|
|
|
|
longest_author = num;
|
|
|
|
}
|
|
|
|
num = e->s_lno + e->num_lines;
|
|
|
|
if (longest_src_lines < num)
|
|
|
|
longest_src_lines = num;
|
|
|
|
num = e->lno + e->num_lines;
|
|
|
|
if (longest_dst_lines < num)
|
|
|
|
longest_dst_lines = num;
|
2006-10-20 21:51:12 +00:00
|
|
|
if (largest_score < ent_score(sb, e))
|
|
|
|
largest_score = ent_score(sb, e);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
max_orig_digits = lineno_width(longest_src_lines);
|
|
|
|
max_digits = lineno_width(longest_dst_lines);
|
2006-10-20 21:51:12 +00:00
|
|
|
max_score_digits = lineno_width(largest_score);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* For debugging -- origin is refcounted, and this asserts that
|
|
|
|
* we do not underflow.
|
|
|
|
*/
|
2006-10-29 11:07:40 +00:00
|
|
|
static void sanity_check_refcnt(struct scoreboard *sb)
|
|
|
|
{
|
|
|
|
int baa = 0;
|
|
|
|
struct blame_entry *ent;
|
|
|
|
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
2006-10-30 22:27:52 +00:00
|
|
|
/* Nobody should have zero or negative refcnt */
|
2006-11-05 03:18:50 +00:00
|
|
|
if (ent->suspect->refcnt <= 0) {
|
|
|
|
fprintf(stderr, "%s in %s has negative refcnt %d\n",
|
|
|
|
ent->suspect->path,
|
|
|
|
sha1_to_hex(ent->suspect->commit->object.sha1),
|
|
|
|
ent->suspect->refcnt);
|
2006-10-30 22:27:52 +00:00
|
|
|
baa = 1;
|
2006-11-05 03:18:50 +00:00
|
|
|
}
|
2006-10-30 22:27:52 +00:00
|
|
|
}
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
|
|
|
/* Mark the ones that haven't been checked */
|
2006-10-29 11:07:40 +00:00
|
|
|
if (0 < ent->suspect->refcnt)
|
|
|
|
ent->suspect->refcnt = -ent->suspect->refcnt;
|
|
|
|
}
|
|
|
|
for (ent = sb->ent; ent; ent = ent->next) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* ... then pick each and see if they have the the
|
|
|
|
* correct refcnt.
|
2006-10-29 11:07:40 +00:00
|
|
|
*/
|
|
|
|
int found;
|
|
|
|
struct blame_entry *e;
|
|
|
|
struct origin *suspect = ent->suspect;
|
|
|
|
|
|
|
|
if (0 < suspect->refcnt)
|
|
|
|
continue;
|
2006-10-30 22:27:52 +00:00
|
|
|
suspect->refcnt = -suspect->refcnt; /* Unmark */
|
2006-10-29 11:07:40 +00:00
|
|
|
for (found = 0, e = sb->ent; e; e = e->next) {
|
|
|
|
if (e->suspect != suspect)
|
|
|
|
continue;
|
|
|
|
found++;
|
|
|
|
}
|
2006-11-05 03:18:50 +00:00
|
|
|
if (suspect->refcnt != found) {
|
|
|
|
fprintf(stderr, "%s in %s has refcnt %d, not %d\n",
|
|
|
|
ent->suspect->path,
|
|
|
|
sha1_to_hex(ent->suspect->commit->object.sha1),
|
|
|
|
ent->suspect->refcnt, found);
|
|
|
|
baa = 2;
|
|
|
|
}
|
2006-10-29 11:07:40 +00:00
|
|
|
}
|
|
|
|
if (baa) {
|
|
|
|
int opt = 0160;
|
|
|
|
find_alignment(sb, &opt);
|
|
|
|
output(sb, opt);
|
2006-11-05 03:18:50 +00:00
|
|
|
die("Baa %d!", baa);
|
2006-10-29 11:07:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Used for the command line parsing; check if the path exists
|
|
|
|
* in the working tree.
|
|
|
|
*/
|
2006-10-19 23:00:04 +00:00
|
|
|
static int has_path_in_work_tree(const char *path)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
return !lstat(path, &st);
|
|
|
|
}
|
|
|
|
|
2006-10-20 22:37:12 +00:00
|
|
|
static unsigned parse_score(const char *arg)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
unsigned long score = strtoul(arg, &end, 10);
|
|
|
|
if (*end)
|
|
|
|
return 0;
|
|
|
|
return score;
|
|
|
|
}
|
|
|
|
|
2006-11-02 07:22:49 +00:00
|
|
|
static const char *add_prefix(const char *prefix, const char *path)
|
|
|
|
{
|
|
|
|
if (!prefix || !prefix[0])
|
|
|
|
return path;
|
|
|
|
return prefix_path(prefix, strlen(prefix), path);
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Parsing of (comma separated) one item in the -L option
|
|
|
|
*/
|
2006-11-07 01:08:32 +00:00
|
|
|
static const char *parse_loc(const char *spec,
|
|
|
|
struct scoreboard *sb, long lno,
|
|
|
|
long begin, long *ret)
|
|
|
|
{
|
|
|
|
char *term;
|
|
|
|
const char *line;
|
|
|
|
long num;
|
|
|
|
int reg_error;
|
|
|
|
regex_t regexp;
|
|
|
|
regmatch_t match[1];
|
|
|
|
|
2006-11-08 00:20:02 +00:00
|
|
|
/* Allow "-L <something>,+20" to mean starting at <something>
|
|
|
|
* for 20 lines, or "-L <something>,-5" for 5 lines ending at
|
|
|
|
* <something>.
|
|
|
|
*/
|
|
|
|
if (1 < begin && (spec[0] == '+' || spec[0] == '-')) {
|
|
|
|
num = strtol(spec + 1, &term, 10);
|
|
|
|
if (term != spec + 1) {
|
|
|
|
if (spec[0] == '-')
|
|
|
|
num = 0 - num;
|
|
|
|
if (0 < num)
|
|
|
|
*ret = begin + num - 2;
|
|
|
|
else if (!num)
|
|
|
|
*ret = begin;
|
|
|
|
else
|
|
|
|
*ret = begin + num;
|
|
|
|
return term;
|
|
|
|
}
|
|
|
|
return spec;
|
|
|
|
}
|
2006-11-07 01:08:32 +00:00
|
|
|
num = strtol(spec, &term, 10);
|
|
|
|
if (term != spec) {
|
|
|
|
*ret = num;
|
|
|
|
return term;
|
|
|
|
}
|
|
|
|
if (spec[0] != '/')
|
|
|
|
return spec;
|
|
|
|
|
|
|
|
/* it could be a regexp of form /.../ */
|
|
|
|
for (term = (char*) spec + 1; *term && *term != '/'; term++) {
|
|
|
|
if (*term == '\\')
|
|
|
|
term++;
|
|
|
|
}
|
|
|
|
if (*term != '/')
|
|
|
|
return spec;
|
|
|
|
|
|
|
|
/* try [spec+1 .. term-1] as regexp */
|
|
|
|
*term = 0;
|
|
|
|
begin--; /* input is in human terms */
|
|
|
|
line = nth_line(sb, begin);
|
|
|
|
|
|
|
|
if (!(reg_error = regcomp(®exp, spec + 1, REG_NEWLINE)) &&
|
|
|
|
!(reg_error = regexec(®exp, line, 1, match, 0))) {
|
|
|
|
const char *cp = line + match[0].rm_so;
|
|
|
|
const char *nline;
|
|
|
|
|
|
|
|
while (begin++ < lno) {
|
|
|
|
nline = nth_line(sb, begin);
|
|
|
|
if (line <= cp && cp < nline)
|
|
|
|
break;
|
|
|
|
line = nline;
|
|
|
|
}
|
|
|
|
*ret = begin;
|
|
|
|
regfree(®exp);
|
|
|
|
*term++ = '/';
|
|
|
|
return term;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
char errbuf[1024];
|
|
|
|
regerror(reg_error, ®exp, errbuf, 1024);
|
|
|
|
die("-L parameter '%s': %s", spec + 1, errbuf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Parsing of -L option
|
|
|
|
*/
|
2006-11-07 01:08:32 +00:00
|
|
|
static void prepare_blame_range(struct scoreboard *sb,
|
|
|
|
const char *bottomtop,
|
|
|
|
long lno,
|
|
|
|
long *bottom, long *top)
|
|
|
|
{
|
|
|
|
const char *term;
|
|
|
|
|
|
|
|
term = parse_loc(bottomtop, sb, lno, 1, bottom);
|
|
|
|
if (*term == ',') {
|
|
|
|
term = parse_loc(term + 1, sb, lno, *bottom + 1, top);
|
|
|
|
if (*term)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-11-07 01:08:32 +00:00
|
|
|
}
|
|
|
|
if (*term)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-11-07 01:08:32 +00:00
|
|
|
}
|
|
|
|
|
2006-12-18 22:04:38 +00:00
|
|
|
static int git_blame_config(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (!strcmp(var, "blame.showroot")) {
|
|
|
|
show_root = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp(var, "blame.blankboundary")) {
|
|
|
|
blank_boundary = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return git_default_config(var, value);
|
|
|
|
}
|
|
|
|
|
2007-01-30 09:11:08 +00:00
|
|
|
static struct commit *fake_working_tree_commit(const char *path, const char *contents_from)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
struct origin *origin;
|
|
|
|
unsigned char head_sha1[20];
|
|
|
|
char *buf;
|
|
|
|
const char *ident;
|
|
|
|
int fd;
|
|
|
|
time_t now;
|
|
|
|
unsigned long fin_size;
|
|
|
|
int size, len;
|
|
|
|
struct cache_entry *ce;
|
|
|
|
unsigned mode;
|
|
|
|
|
|
|
|
if (get_sha1("HEAD", head_sha1))
|
|
|
|
die("No such ref: HEAD");
|
|
|
|
|
|
|
|
time(&now);
|
|
|
|
commit = xcalloc(1, sizeof(*commit));
|
|
|
|
commit->parents = xcalloc(1, sizeof(*commit->parents));
|
|
|
|
commit->parents->item = lookup_commit_reference(head_sha1);
|
|
|
|
commit->object.parsed = 1;
|
|
|
|
commit->date = now;
|
|
|
|
commit->object.type = OBJ_COMMIT;
|
|
|
|
|
|
|
|
origin = make_origin(commit, path);
|
|
|
|
|
|
|
|
if (!contents_from || strcmp("-", contents_from)) {
|
|
|
|
struct stat st;
|
|
|
|
const char *read_from;
|
|
|
|
|
|
|
|
if (contents_from) {
|
|
|
|
if (stat(contents_from, &st) < 0)
|
|
|
|
die("Cannot stat %s", contents_from);
|
|
|
|
read_from = contents_from;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (lstat(path, &st) < 0)
|
|
|
|
die("Cannot lstat %s", path);
|
|
|
|
read_from = path;
|
|
|
|
}
|
2007-03-07 01:44:37 +00:00
|
|
|
fin_size = xsize_t(st.st_size);
|
2007-01-30 09:11:08 +00:00
|
|
|
buf = xmalloc(fin_size+1);
|
|
|
|
mode = canon_mode(st.st_mode);
|
|
|
|
switch (st.st_mode & S_IFMT) {
|
|
|
|
case S_IFREG:
|
|
|
|
fd = open(read_from, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
die("cannot open %s", read_from);
|
|
|
|
if (read_in_full(fd, buf, fin_size) != fin_size)
|
|
|
|
die("cannot read %s", read_from);
|
|
|
|
break;
|
|
|
|
case S_IFLNK:
|
|
|
|
if (readlink(read_from, buf, fin_size+1) != fin_size)
|
|
|
|
die("cannot readlink %s", read_from);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
die("unsupported file type %s", read_from);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Reading from stdin */
|
|
|
|
contents_from = "standard input";
|
|
|
|
buf = NULL;
|
|
|
|
fin_size = 0;
|
|
|
|
mode = 0;
|
|
|
|
while (1) {
|
|
|
|
ssize_t cnt = 8192;
|
|
|
|
buf = xrealloc(buf, fin_size + cnt);
|
|
|
|
cnt = xread(0, buf + fin_size, cnt);
|
|
|
|
if (cnt < 0)
|
|
|
|
die("read error %s from stdin",
|
|
|
|
strerror(errno));
|
|
|
|
if (!cnt)
|
|
|
|
break;
|
|
|
|
fin_size += cnt;
|
|
|
|
}
|
|
|
|
buf = xrealloc(buf, fin_size + 1);
|
|
|
|
}
|
|
|
|
buf[fin_size] = 0;
|
|
|
|
origin->file.ptr = buf;
|
|
|
|
origin->file.size = fin_size;
|
2007-02-26 19:55:59 +00:00
|
|
|
pretend_sha1_file(buf, fin_size, OBJ_BLOB, origin->blob_sha1);
|
2007-01-30 09:11:08 +00:00
|
|
|
commit->util = origin;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the current index, replace the path entry with
|
|
|
|
* origin->blob_sha1 without mucking with its mode or type
|
|
|
|
* bits; we are not going to write this index out -- we just
|
|
|
|
* want to run "diff-index --cached".
|
|
|
|
*/
|
|
|
|
discard_cache();
|
|
|
|
read_cache();
|
|
|
|
|
|
|
|
len = strlen(path);
|
|
|
|
if (!mode) {
|
|
|
|
int pos = cache_name_pos(path, len);
|
|
|
|
if (0 <= pos)
|
|
|
|
mode = ntohl(active_cache[pos]->ce_mode);
|
|
|
|
else
|
|
|
|
/* Let's not bother reading from HEAD tree */
|
|
|
|
mode = S_IFREG | 0644;
|
|
|
|
}
|
|
|
|
size = cache_entry_size(len);
|
|
|
|
ce = xcalloc(1, size);
|
|
|
|
hashcpy(ce->sha1, origin->blob_sha1);
|
|
|
|
memcpy(ce->name, path, len);
|
|
|
|
ce->ce_flags = create_ce_flags(len, 0);
|
|
|
|
ce->ce_mode = create_ce_mode(mode);
|
|
|
|
add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are not going to write this out, so this does not matter
|
|
|
|
* right now, but someday we might optimize diff-index --cached
|
|
|
|
* with cache-tree information.
|
|
|
|
*/
|
|
|
|
cache_tree_invalidate_path(active_cache_tree, path);
|
|
|
|
|
|
|
|
commit->buffer = xmalloc(400);
|
|
|
|
ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0);
|
2007-04-14 21:26:20 +00:00
|
|
|
snprintf(commit->buffer, 400,
|
2007-01-30 09:11:08 +00:00
|
|
|
"tree 0000000000000000000000000000000000000000\n"
|
|
|
|
"parent %s\n"
|
|
|
|
"author %s\n"
|
|
|
|
"committer %s\n\n"
|
|
|
|
"Version of %s from %s\n",
|
|
|
|
sha1_to_hex(head_sha1),
|
|
|
|
ident, ident, path, contents_from ? contents_from : path);
|
|
|
|
return commit;
|
|
|
|
}
|
|
|
|
|
2006-11-09 02:47:54 +00:00
|
|
|
int cmd_blame(int argc, const char **argv, const char *prefix)
|
2006-10-19 23:00:04 +00:00
|
|
|
{
|
|
|
|
struct rev_info revs;
|
|
|
|
const char *path;
|
|
|
|
struct scoreboard sb;
|
|
|
|
struct origin *o;
|
|
|
|
struct blame_entry *ent;
|
2006-10-20 01:49:30 +00:00
|
|
|
int i, seen_dashdash, unk, opt;
|
2006-10-19 23:00:04 +00:00
|
|
|
long bottom, top, lno;
|
|
|
|
int output_option = 0;
|
2006-11-05 19:52:43 +00:00
|
|
|
int show_stats = 0;
|
2006-10-19 23:00:04 +00:00
|
|
|
const char *revs_file = NULL;
|
|
|
|
const char *final_commit_name = NULL;
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
2006-11-07 01:08:32 +00:00
|
|
|
const char *bottomtop = NULL;
|
2007-01-30 09:11:08 +00:00
|
|
|
const char *contents_from = NULL;
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2007-02-06 09:52:04 +00:00
|
|
|
cmd_is_annotate = !strcmp(argv[0], "annotate");
|
|
|
|
|
2006-12-18 22:04:38 +00:00
|
|
|
git_config(git_blame_config);
|
2006-10-21 06:49:31 +00:00
|
|
|
save_commit_buffer = 0;
|
|
|
|
|
2006-10-20 01:49:30 +00:00
|
|
|
opt = 0;
|
2006-10-19 23:00:04 +00:00
|
|
|
seen_dashdash = 0;
|
|
|
|
for (unk = i = 1; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
if (*arg != '-')
|
|
|
|
break;
|
2006-12-18 22:04:38 +00:00
|
|
|
else if (!strcmp("-b", arg))
|
|
|
|
blank_boundary = 1;
|
|
|
|
else if (!strcmp("--root", arg))
|
|
|
|
show_root = 1;
|
2006-11-05 19:52:43 +00:00
|
|
|
else if (!strcmp(arg, "--show-stats"))
|
|
|
|
show_stats = 1;
|
2006-10-19 23:00:04 +00:00
|
|
|
else if (!strcmp("-c", arg))
|
|
|
|
output_option |= OUTPUT_ANNOTATE_COMPAT;
|
|
|
|
else if (!strcmp("-t", arg))
|
|
|
|
output_option |= OUTPUT_RAW_TIMESTAMP;
|
|
|
|
else if (!strcmp("-l", arg))
|
|
|
|
output_option |= OUTPUT_LONG_OBJECT_NAME;
|
2007-04-12 22:50:45 +00:00
|
|
|
else if (!strcmp("-s", arg))
|
|
|
|
output_option |= OUTPUT_NO_AUTHOR;
|
2007-06-10 01:14:56 +00:00
|
|
|
else if (!strcmp("-w", arg))
|
|
|
|
xdl_opts |= XDF_IGNORE_WHITESPACE;
|
2006-10-19 23:00:04 +00:00
|
|
|
else if (!strcmp("-S", arg) && ++i < argc)
|
|
|
|
revs_file = argv[i];
|
2007-02-20 09:54:00 +00:00
|
|
|
else if (!prefixcmp(arg, "-M")) {
|
2006-10-20 01:49:30 +00:00
|
|
|
opt |= PICKAXE_BLAME_MOVE;
|
2006-10-20 22:37:12 +00:00
|
|
|
blame_move_score = parse_score(arg+2);
|
|
|
|
}
|
2007-02-20 09:54:00 +00:00
|
|
|
else if (!prefixcmp(arg, "-C")) {
|
2007-05-06 04:18:57 +00:00
|
|
|
/*
|
|
|
|
* -C enables copy from removed files;
|
|
|
|
* -C -C enables copy from existing files, but only
|
|
|
|
* when blaming a new file;
|
|
|
|
* -C -C -C enables copy from existing files for
|
|
|
|
* everybody
|
|
|
|
*/
|
|
|
|
if (opt & PICKAXE_BLAME_COPY_HARDER)
|
|
|
|
opt |= PICKAXE_BLAME_COPY_HARDEST;
|
2006-10-20 01:50:17 +00:00
|
|
|
if (opt & PICKAXE_BLAME_COPY)
|
|
|
|
opt |= PICKAXE_BLAME_COPY_HARDER;
|
|
|
|
opt |= PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE;
|
2006-10-20 22:37:12 +00:00
|
|
|
blame_copy_score = parse_score(arg+2);
|
2006-10-20 01:50:17 +00:00
|
|
|
}
|
2007-02-20 09:54:00 +00:00
|
|
|
else if (!prefixcmp(arg, "-L")) {
|
2006-10-30 07:50:38 +00:00
|
|
|
if (!arg[2]) {
|
|
|
|
if (++i >= argc)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-10-30 07:50:38 +00:00
|
|
|
arg = argv[i];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
arg += 2;
|
2006-11-07 01:08:32 +00:00
|
|
|
if (bottomtop)
|
2006-10-19 23:00:04 +00:00
|
|
|
die("More than one '-L n,m' option given");
|
2006-11-07 01:08:32 +00:00
|
|
|
bottomtop = arg;
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
2007-01-30 09:11:08 +00:00
|
|
|
else if (!strcmp("--contents", arg)) {
|
|
|
|
if (++i >= argc)
|
|
|
|
usage(blame_usage);
|
|
|
|
contents_from = argv[i];
|
|
|
|
}
|
2007-01-28 09:34:06 +00:00
|
|
|
else if (!strcmp("--incremental", arg))
|
|
|
|
incremental = 1;
|
2006-10-20 21:51:12 +00:00
|
|
|
else if (!strcmp("--score-debug", arg))
|
|
|
|
output_option |= OUTPUT_SHOW_SCORE;
|
2006-10-19 23:00:04 +00:00
|
|
|
else if (!strcmp("-f", arg) ||
|
|
|
|
!strcmp("--show-name", arg))
|
|
|
|
output_option |= OUTPUT_SHOW_NAME;
|
|
|
|
else if (!strcmp("-n", arg) ||
|
|
|
|
!strcmp("--show-number", arg))
|
|
|
|
output_option |= OUTPUT_SHOW_NUMBER;
|
|
|
|
else if (!strcmp("-p", arg) ||
|
|
|
|
!strcmp("--porcelain", arg))
|
|
|
|
output_option |= OUTPUT_PORCELAIN;
|
|
|
|
else if (!strcmp("--", arg)) {
|
|
|
|
seen_dashdash = 1;
|
|
|
|
i++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
argv[unk++] = arg;
|
|
|
|
}
|
|
|
|
|
2007-01-28 14:25:55 +00:00
|
|
|
if (!incremental)
|
|
|
|
setup_pager();
|
|
|
|
|
2006-10-20 22:37:12 +00:00
|
|
|
if (!blame_move_score)
|
|
|
|
blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
|
|
|
|
if (!blame_copy_score)
|
|
|
|
blame_copy_score = BLAME_DEFAULT_COPY_SCORE;
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* We have collected options unknown to us in argv[1..unk]
|
2006-10-19 23:00:04 +00:00
|
|
|
* which are to be passed to revision machinery if we are
|
2007-02-04 04:49:16 +00:00
|
|
|
* going to do the "bottom" processing.
|
2006-10-19 23:00:04 +00:00
|
|
|
*
|
|
|
|
* The remaining are:
|
|
|
|
*
|
|
|
|
* (1) if seen_dashdash, its either
|
|
|
|
* "-options -- <path>" or
|
|
|
|
* "-options -- <path> <rev>".
|
|
|
|
* but the latter is allowed only if there is no
|
|
|
|
* options that we passed to revision machinery.
|
|
|
|
*
|
|
|
|
* (2) otherwise, we may have "--" somewhere later and
|
|
|
|
* might be looking at the first one of multiple 'rev'
|
|
|
|
* parameters (e.g. " master ^next ^maint -- path").
|
|
|
|
* See if there is a dashdash first, and give the
|
|
|
|
* arguments before that to revision machinery.
|
|
|
|
* After that there must be one 'path'.
|
|
|
|
*
|
|
|
|
* (3) otherwise, its one of the three:
|
|
|
|
* "-options <path> <rev>"
|
|
|
|
* "-options <rev> <path>"
|
|
|
|
* "-options <path>"
|
|
|
|
* but again the first one is allowed only if
|
|
|
|
* there is no options that we passed to revision
|
|
|
|
* machinery.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (seen_dashdash) {
|
|
|
|
/* (1) */
|
|
|
|
if (argc <= i)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-11-02 07:22:49 +00:00
|
|
|
path = add_prefix(prefix, argv[i]);
|
2006-10-19 23:00:04 +00:00
|
|
|
if (i + 1 == argc - 1) {
|
|
|
|
if (unk != 1)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-10-19 23:00:04 +00:00
|
|
|
argv[unk++] = argv[i + 1];
|
|
|
|
}
|
|
|
|
else if (i + 1 != argc)
|
|
|
|
/* garbage at end */
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
int j;
|
|
|
|
for (j = i; !seen_dashdash && j < argc; j++)
|
|
|
|
if (!strcmp(argv[j], "--"))
|
|
|
|
seen_dashdash = j;
|
|
|
|
if (seen_dashdash) {
|
2007-02-16 08:50:58 +00:00
|
|
|
/* (2) */
|
2006-10-19 23:00:04 +00:00
|
|
|
if (seen_dashdash + 1 != argc - 1)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage);
|
2006-11-02 07:22:49 +00:00
|
|
|
path = add_prefix(prefix, argv[seen_dashdash + 1]);
|
2006-10-19 23:00:04 +00:00
|
|
|
for (j = i; j < seen_dashdash; j++)
|
|
|
|
argv[unk++] = argv[j];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* (3) */
|
2007-02-16 08:50:58 +00:00
|
|
|
if (argc <= i)
|
|
|
|
usage(blame_usage);
|
2006-11-02 07:22:49 +00:00
|
|
|
path = add_prefix(prefix, argv[i]);
|
2006-10-19 23:00:04 +00:00
|
|
|
if (i + 1 == argc - 1) {
|
|
|
|
final_commit_name = argv[i + 1];
|
|
|
|
|
|
|
|
/* if (unk == 1) we could be getting
|
|
|
|
* old-style
|
|
|
|
*/
|
|
|
|
if (unk == 1 && !has_path_in_work_tree(path)) {
|
2006-11-02 07:22:49 +00:00
|
|
|
path = add_prefix(prefix, argv[i + 1]);
|
2006-10-19 23:00:04 +00:00
|
|
|
final_commit_name = argv[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (i != argc - 1)
|
2006-11-09 02:47:54 +00:00
|
|
|
usage(blame_usage); /* garbage at end */
|
2006-10-19 23:00:04 +00:00
|
|
|
|
|
|
|
if (!has_path_in_work_tree(path))
|
|
|
|
die("cannot stat path %s: %s",
|
|
|
|
path, strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (final_commit_name)
|
|
|
|
argv[unk++] = final_commit_name;
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* Now we got rev and path. We do not want the path pruning
|
2006-10-19 23:00:04 +00:00
|
|
|
* but we may want "bottom" processing.
|
|
|
|
*/
|
2006-11-15 21:52:25 +00:00
|
|
|
argv[unk++] = "--"; /* terminate the rev name */
|
2006-10-19 23:00:04 +00:00
|
|
|
argv[unk] = NULL;
|
|
|
|
|
|
|
|
init_revisions(&revs, NULL);
|
2007-01-30 09:11:08 +00:00
|
|
|
setup_revisions(unk, argv, &revs, NULL);
|
2006-10-19 23:00:04 +00:00
|
|
|
memset(&sb, 0, sizeof(sb));
|
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* There must be one and only one positive commit in the
|
2006-10-19 23:00:04 +00:00
|
|
|
* revs->pending array.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < revs.pending.nr; i++) {
|
|
|
|
struct object *obj = revs.pending.objects[i].item;
|
|
|
|
if (obj->flags & UNINTERESTING)
|
|
|
|
continue;
|
|
|
|
while (obj->type == OBJ_TAG)
|
|
|
|
obj = deref_tag(obj, NULL, 0);
|
|
|
|
if (obj->type != OBJ_COMMIT)
|
|
|
|
die("Non commit %s?",
|
|
|
|
revs.pending.objects[i].name);
|
|
|
|
if (sb.final)
|
|
|
|
die("More than one commit to dig from %s and %s?",
|
|
|
|
revs.pending.objects[i].name,
|
|
|
|
final_commit_name);
|
|
|
|
sb.final = (struct commit *) obj;
|
|
|
|
final_commit_name = revs.pending.objects[i].name;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!sb.final) {
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* "--not A B -- path" without anything positive;
|
2007-01-30 09:11:08 +00:00
|
|
|
* do not default to HEAD, but use the working tree
|
|
|
|
* or "--contents".
|
2007-01-30 01:36:22 +00:00
|
|
|
*/
|
2007-01-30 09:11:08 +00:00
|
|
|
sb.final = fake_working_tree_commit(path, contents_from);
|
|
|
|
add_pending_object(&revs, &(sb.final->object), ":");
|
2006-10-19 23:00:04 +00:00
|
|
|
}
|
2007-01-30 09:11:08 +00:00
|
|
|
else if (contents_from)
|
|
|
|
die("Cannot use --contents with final commit object name");
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2007-01-30 01:36:22 +00:00
|
|
|
/*
|
|
|
|
* If we have bottom, this will mark the ancestors of the
|
2006-10-19 23:00:04 +00:00
|
|
|
* bottom commits we would reach while traversing as
|
|
|
|
* uninteresting.
|
|
|
|
*/
|
|
|
|
prepare_revision_walk(&revs);
|
|
|
|
|
2007-01-30 09:11:08 +00:00
|
|
|
if (is_null_sha1(sb.final->object.sha1)) {
|
|
|
|
char *buf;
|
|
|
|
o = sb.final->util;
|
|
|
|
buf = xmalloc(o->file.size + 1);
|
|
|
|
memcpy(buf, o->file.ptr, o->file.size + 1);
|
|
|
|
sb.final_buf = buf;
|
|
|
|
sb.final_buf_size = o->file.size;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
o = get_origin(&sb, sb.final, path);
|
|
|
|
if (fill_blob_sha1(o))
|
|
|
|
die("no such path %s in %s", path, final_commit_name);
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2007-02-26 19:55:59 +00:00
|
|
|
sb.final_buf = read_sha1_file(o->blob_sha1, &type,
|
2007-01-30 09:11:08 +00:00
|
|
|
&sb.final_buf_size);
|
|
|
|
}
|
2006-11-05 19:51:41 +00:00
|
|
|
num_read_blob++;
|
2006-10-19 23:00:04 +00:00
|
|
|
lno = prepare_lines(&sb);
|
|
|
|
|
2006-11-07 01:08:32 +00:00
|
|
|
bottom = top = 0;
|
|
|
|
if (bottomtop)
|
|
|
|
prepare_blame_range(&sb, bottomtop, lno, &bottom, &top);
|
|
|
|
if (bottom && top && top < bottom) {
|
|
|
|
long tmp;
|
|
|
|
tmp = top; top = bottom; bottom = tmp;
|
|
|
|
}
|
2006-10-19 23:00:04 +00:00
|
|
|
if (bottom < 1)
|
|
|
|
bottom = 1;
|
|
|
|
if (top < 1)
|
|
|
|
top = lno;
|
|
|
|
bottom--;
|
|
|
|
if (lno < top)
|
|
|
|
die("file %s has only %lu lines", path, lno);
|
|
|
|
|
|
|
|
ent = xcalloc(1, sizeof(*ent));
|
|
|
|
ent->lno = bottom;
|
|
|
|
ent->num_lines = top - bottom;
|
|
|
|
ent->suspect = o;
|
|
|
|
ent->s_lno = bottom;
|
|
|
|
|
|
|
|
sb.ent = ent;
|
|
|
|
sb.path = path;
|
|
|
|
|
|
|
|
if (revs_file && read_ancestry(revs_file))
|
|
|
|
die("reading graft file %s failed: %s",
|
|
|
|
revs_file, strerror(errno));
|
|
|
|
|
2007-05-03 06:58:14 +00:00
|
|
|
read_mailmap(&mailmap, ".mailmap", NULL);
|
2007-04-27 07:42:15 +00:00
|
|
|
|
2006-10-20 01:49:30 +00:00
|
|
|
assign_blame(&sb, &revs, opt);
|
2006-10-19 23:00:04 +00:00
|
|
|
|
2007-01-28 09:34:06 +00:00
|
|
|
if (incremental)
|
|
|
|
return 0;
|
|
|
|
|
2006-10-19 23:00:04 +00:00
|
|
|
coalesce(&sb);
|
|
|
|
|
|
|
|
if (!(output_option & OUTPUT_PORCELAIN))
|
|
|
|
find_alignment(&sb, &output_option);
|
|
|
|
|
|
|
|
output(&sb, output_option);
|
|
|
|
free((void *)sb.final_buf);
|
|
|
|
for (ent = sb.ent; ent; ) {
|
|
|
|
struct blame_entry *e = ent->next;
|
|
|
|
free(ent);
|
|
|
|
ent = e;
|
|
|
|
}
|
2006-11-05 19:51:41 +00:00
|
|
|
|
2006-11-05 19:52:43 +00:00
|
|
|
if (show_stats) {
|
2006-11-05 19:51:41 +00:00
|
|
|
printf("num read blob: %d\n", num_read_blob);
|
|
|
|
printf("num get patch: %d\n", num_get_patch);
|
|
|
|
printf("num commits: %d\n", num_commits);
|
|
|
|
}
|
2006-10-19 23:00:04 +00:00
|
|
|
return 0;
|
|
|
|
}
|