2006-03-02 22:28:17 +01:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2006, Fredrik Kuivinen <freku045@student.liu.se>
|
|
|
|
*/
|
|
|
|
|
2006-02-21 00:40:54 +01:00
|
|
|
#include <assert.h>
|
2006-03-02 22:28:17 +01:00
|
|
|
#include <time.h>
|
|
|
|
#include <sys/time.h>
|
2006-03-05 12:03:51 +01:00
|
|
|
#include <math.h>
|
2006-02-21 00:40:54 +01:00
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tree.h"
|
|
|
|
#include "blob.h"
|
|
|
|
#include "diff.h"
|
2006-03-10 10:21:41 +01:00
|
|
|
#include "diffcore.h"
|
2006-03-02 22:28:17 +01:00
|
|
|
#include "revision.h"
|
2006-04-05 21:23:29 +02:00
|
|
|
#include "xdiff-interface.h"
|
2006-10-05 23:07:42 +02:00
|
|
|
#include "quote.h"
|
2006-02-21 00:40:54 +01:00
|
|
|
|
|
|
|
#define DEBUG 0
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static const char blame_usage[] =
|
2006-10-12 09:44:27 +02:00
|
|
|
"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
|
2006-10-05 23:00:55 +02:00
|
|
|
" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
|
|
|
|
" -l, --long Show long commit SHA1 (Default: off)\n"
|
|
|
|
" -t, --time Show raw timestamp (Default: off)\n"
|
2006-10-12 09:44:27 +02:00
|
|
|
" -f, --show-name Show original filename (Default: auto)\n"
|
|
|
|
" -n, --show-number Show original linenumber (Default: off)\n"
|
|
|
|
" -p, --porcelain Show in a format designed for machine consumption\n"
|
|
|
|
" -S revs-file Use revisions from revs-file instead of calling git-rev-list\n"
|
2006-10-05 23:00:55 +02:00
|
|
|
" -h, --help This message";
|
2006-03-05 12:03:51 +01:00
|
|
|
|
|
|
|
static struct commit **blame_lines;
|
|
|
|
static int num_blame_lines;
|
2006-10-05 23:00:55 +02:00
|
|
|
static char *blame_contents;
|
2006-03-05 12:03:51 +01:00
|
|
|
static int blame_len;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
struct util_info {
|
|
|
|
int *line_map;
|
|
|
|
unsigned char sha1[20]; /* blob sha, not commit! */
|
|
|
|
char *buf;
|
|
|
|
unsigned long size;
|
|
|
|
int num_lines;
|
2006-10-05 23:00:55 +02:00
|
|
|
const char *pathname;
|
2006-10-05 23:07:42 +02:00
|
|
|
unsigned meta_given:1;
|
2006-03-10 10:21:41 +01:00
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
void *topo_data;
|
2006-02-21 00:40:54 +01:00
|
|
|
};
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
struct chunk {
|
2006-07-10 08:57:51 +02:00
|
|
|
int off1, len1; /* --- */
|
|
|
|
int off2, len2; /* +++ */
|
2006-02-21 00:40:54 +01:00
|
|
|
};
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
struct patch {
|
|
|
|
struct chunk *chunks;
|
|
|
|
int num;
|
2006-02-21 00:40:54 +01:00
|
|
|
};
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
static void get_blob(struct commit *commit);
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
/* Only used for statistics */
|
2006-08-15 19:23:48 +02:00
|
|
|
static int num_get_patch;
|
|
|
|
static int num_commits;
|
|
|
|
static int patch_time;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
struct blame_diff_state {
|
|
|
|
struct xdiff_emit_state xm;
|
2006-03-02 22:28:17 +01:00
|
|
|
struct patch *ret;
|
2006-04-05 21:23:29 +02:00
|
|
|
};
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
static void process_u0_diff(void *state_, char *line, unsigned long len)
|
|
|
|
{
|
|
|
|
struct blame_diff_state *state = state_;
|
|
|
|
struct chunk *chunk;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
if (len < 4 || line[0] != '@' || line[1] != '@')
|
|
|
|
return;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
if (DEBUG)
|
|
|
|
printf("chunk line: %.*s", (int)len, line);
|
|
|
|
state->ret->num++;
|
|
|
|
state->ret->chunks = xrealloc(state->ret->chunks,
|
|
|
|
sizeof(struct chunk) * state->ret->num);
|
|
|
|
chunk = &state->ret->chunks[state->ret->num - 1];
|
|
|
|
|
|
|
|
assert(!strncmp(line, "@@ -", 4));
|
|
|
|
|
|
|
|
if (parse_hunk_header(line, len,
|
|
|
|
&chunk->off1, &chunk->len1,
|
|
|
|
&chunk->off2, &chunk->len2)) {
|
|
|
|
state->ret->num--;
|
|
|
|
return;
|
|
|
|
}
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
if (chunk->len1 == 0)
|
|
|
|
chunk->off1++;
|
|
|
|
if (chunk->len2 == 0)
|
|
|
|
chunk->off2++;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
if (chunk->off1 > 0)
|
|
|
|
chunk->off1--;
|
|
|
|
if (chunk->off2 > 0)
|
|
|
|
chunk->off2--;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
assert(chunk->off1 >= 0);
|
|
|
|
assert(chunk->off2 >= 0);
|
|
|
|
}
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
static struct patch *get_patch(struct commit *commit, struct commit *other)
|
|
|
|
{
|
|
|
|
struct blame_diff_state state;
|
|
|
|
xpparam_t xpp;
|
|
|
|
xdemitconf_t xecfg;
|
|
|
|
mmfile_t file_c, file_o;
|
|
|
|
xdemitcb_t ecb;
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *info_c = (struct util_info *)commit->util;
|
|
|
|
struct util_info *info_o = (struct util_info *)other->util;
|
2006-04-05 21:23:29 +02:00
|
|
|
struct timeval tv_start, tv_end;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
get_blob(commit);
|
|
|
|
file_c.ptr = info_c->buf;
|
|
|
|
file_c.size = info_c->size;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
get_blob(other);
|
|
|
|
file_o.ptr = info_o->buf;
|
|
|
|
file_o.size = info_o->size;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
gettimeofday(&tv_start, NULL);
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
xpp.flags = XDF_NEED_MINIMAL;
|
|
|
|
xecfg.ctxlen = 0;
|
|
|
|
xecfg.flags = 0;
|
|
|
|
ecb.outf = xdiff_outf;
|
|
|
|
ecb.priv = &state;
|
|
|
|
memset(&state, 0, sizeof(state));
|
|
|
|
state.xm.consume = process_u0_diff;
|
|
|
|
state.ret = xmalloc(sizeof(struct patch));
|
|
|
|
state.ret->chunks = NULL;
|
|
|
|
state.ret->num = 0;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-05 21:23:29 +02:00
|
|
|
xdl_diff(&file_c, &file_o, &xpp, &xecfg, &ecb);
|
2006-03-02 22:28:17 +01:00
|
|
|
|
|
|
|
gettimeofday(&tv_end, NULL);
|
|
|
|
patch_time += 1000000 * (tv_end.tv_sec - tv_start.tv_sec) +
|
|
|
|
tv_end.tv_usec - tv_start.tv_usec;
|
|
|
|
|
|
|
|
num_get_patch++;
|
2006-04-05 21:23:29 +02:00
|
|
|
return state.ret;
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
static void free_patch(struct patch *p)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-03-02 22:28:17 +01:00
|
|
|
free(p->chunks);
|
|
|
|
free(p);
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-05-29 21:16:46 +02:00
|
|
|
static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
|
2006-03-02 22:28:17 +01:00
|
|
|
int baselen, const char *pathname,
|
|
|
|
unsigned mode, int stage);
|
2006-02-21 00:40:54 +01:00
|
|
|
|
|
|
|
static unsigned char blob_sha1[20];
|
2006-10-05 23:00:55 +02:00
|
|
|
static const char *blame_file;
|
2006-03-02 22:28:17 +01:00
|
|
|
static int get_blob_sha1(struct tree *t, const char *pathname,
|
|
|
|
unsigned char *sha1)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-03-02 22:28:17 +01:00
|
|
|
const char *pathspec[2];
|
2006-03-17 22:49:31 +01:00
|
|
|
blame_file = pathname;
|
2006-03-02 22:28:17 +01:00
|
|
|
pathspec[0] = pathname;
|
|
|
|
pathspec[1] = NULL;
|
2006-08-23 22:57:23 +02:00
|
|
|
hashclr(blob_sha1);
|
2006-03-02 22:28:17 +01:00
|
|
|
read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal);
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (is_null_sha1(blob_sha1))
|
2006-03-02 22:28:17 +01:00
|
|
|
return -1;
|
|
|
|
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(sha1, blob_sha1);
|
2006-03-02 22:28:17 +01:00
|
|
|
return 0;
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-05-29 21:16:46 +02:00
|
|
|
static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
|
2006-03-02 22:28:17 +01:00
|
|
|
int baselen, const char *pathname,
|
|
|
|
unsigned mode, int stage)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-03-02 22:28:17 +01:00
|
|
|
if (S_ISDIR(mode))
|
|
|
|
return READ_TREE_RECURSIVE;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-17 22:49:31 +01:00
|
|
|
if (strncmp(blame_file, base, baselen) ||
|
|
|
|
strcmp(blame_file + baselen, pathname))
|
|
|
|
return -1;
|
|
|
|
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(blob_sha1, sha1);
|
2006-03-02 22:28:17 +01:00
|
|
|
return -1;
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
static void get_blob(struct commit *commit)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *info = commit->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
char type[20];
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
if (info->buf)
|
|
|
|
return;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
info->buf = read_sha1_file(info->sha1, type, &info->size);
|
|
|
|
|
2006-04-02 14:44:09 +02:00
|
|
|
assert(!strcmp(type, blob_type));
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
/* For debugging only */
|
|
|
|
static void print_patch(struct patch *p)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-03-02 22:28:17 +01:00
|
|
|
int i;
|
|
|
|
printf("Num chunks: %d\n", p->num);
|
|
|
|
for (i = 0; i < p->num; i++) {
|
|
|
|
printf("%d,%d %d,%d\n", p->chunks[i].off1, p->chunks[i].len1,
|
|
|
|
p->chunks[i].off2, p->chunks[i].len2);
|
|
|
|
}
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-03-06 09:32:50 +01:00
|
|
|
#if DEBUG
|
2006-03-02 22:28:17 +01:00
|
|
|
/* For debugging only */
|
|
|
|
static void print_map(struct commit *cmit, struct commit *other)
|
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *util = cmit->util;
|
|
|
|
struct util_info *util2 = other->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
|
|
|
int i;
|
|
|
|
int max =
|
|
|
|
util->num_lines >
|
|
|
|
util2->num_lines ? util->num_lines : util2->num_lines;
|
|
|
|
int num;
|
|
|
|
|
|
|
|
for (i = 0; i < max; i++) {
|
|
|
|
printf("i: %d ", i);
|
|
|
|
num = -1;
|
|
|
|
|
|
|
|
if (i < util->num_lines) {
|
|
|
|
num = util->line_map[i];
|
|
|
|
printf("%d\t", num);
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
else
|
2006-03-02 22:28:17 +01:00
|
|
|
printf("\t");
|
|
|
|
|
|
|
|
if (i < util2->num_lines) {
|
|
|
|
int num2 = util2->line_map[i];
|
|
|
|
printf("%d\t", num2);
|
|
|
|
if (num != -1 && num2 != num)
|
|
|
|
printf("---");
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
else
|
2006-03-02 22:28:17 +01:00
|
|
|
printf("\t");
|
|
|
|
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
}
|
2006-03-05 11:47:29 +01:00
|
|
|
#endif
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-07-10 08:57:51 +02:00
|
|
|
/* p is a patch from commit to other. */
|
2006-03-02 22:28:17 +01:00
|
|
|
static void fill_line_map(struct commit *commit, struct commit *other,
|
|
|
|
struct patch *p)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *util = commit->util;
|
|
|
|
struct util_info *util2 = other->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
int *map = util->line_map;
|
|
|
|
int *map2 = util2->line_map;
|
|
|
|
int cur_chunk = 0;
|
|
|
|
int i1, i2;
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (DEBUG) {
|
|
|
|
if (p->num)
|
|
|
|
print_patch(p);
|
2006-03-02 22:28:17 +01:00
|
|
|
printf("num lines 1: %d num lines 2: %d\n", util->num_lines,
|
|
|
|
util2->num_lines);
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
2006-03-02 22:28:17 +01:00
|
|
|
|
|
|
|
for (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) {
|
|
|
|
struct chunk *chunk = NULL;
|
|
|
|
if (cur_chunk < p->num)
|
|
|
|
chunk = &p->chunks[cur_chunk];
|
|
|
|
|
|
|
|
if (chunk && chunk->off1 == i1) {
|
|
|
|
if (DEBUG && i2 != chunk->off2)
|
|
|
|
printf("i2: %d off2: %d\n", i2, chunk->off2);
|
|
|
|
|
|
|
|
assert(i2 == chunk->off2);
|
|
|
|
|
|
|
|
i1--;
|
|
|
|
i2--;
|
|
|
|
if (chunk->len1 > 0)
|
|
|
|
i1 += chunk->len1;
|
|
|
|
|
|
|
|
if (chunk->len2 > 0)
|
|
|
|
i2 += chunk->len2;
|
|
|
|
|
|
|
|
cur_chunk++;
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
else {
|
2006-03-02 22:28:17 +01:00
|
|
|
if (i2 >= util2->num_lines)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (map[i1] != map2[i2] && map[i1] != -1) {
|
|
|
|
if (DEBUG)
|
|
|
|
printf("map: i1: %d %d %p i2: %d %d %p\n",
|
|
|
|
i1, map[i1],
|
2006-06-18 17:18:06 +02:00
|
|
|
(void *) (i1 != -1 ? blame_lines[map[i1]] : NULL),
|
2006-03-02 22:28:17 +01:00
|
|
|
i2, map2[i2],
|
2006-06-18 17:18:06 +02:00
|
|
|
(void *) (i2 != -1 ? blame_lines[map2[i2]] : NULL));
|
2006-03-02 22:28:17 +01:00
|
|
|
if (map2[i2] != -1 &&
|
|
|
|
blame_lines[map[i1]] &&
|
|
|
|
!blame_lines[map2[i2]])
|
|
|
|
map[i1] = map2[i2];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (map[i1] == -1 && map2[i2] != -1)
|
|
|
|
map[i1] = map2[i2];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (DEBUG > 1)
|
|
|
|
printf("l1: %d l2: %d i1: %d i2: %d\n",
|
|
|
|
map[i1], map2[i2], i1, i2);
|
|
|
|
}
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
static int map_line(struct commit *commit, int line)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *info = commit->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
assert(line >= 0 && line < info->num_lines);
|
|
|
|
return info->line_map[line];
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static struct util_info *get_util(struct commit *commit)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *util = commit->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
|
|
|
|
if (util)
|
|
|
|
return util;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-10-05 23:07:42 +02:00
|
|
|
util = xcalloc(1, sizeof(struct util_info));
|
2006-03-10 10:21:41 +01:00
|
|
|
util->num_lines = -1;
|
2006-06-18 03:26:18 +02:00
|
|
|
commit->util = util;
|
2006-03-10 10:21:41 +01:00
|
|
|
return util;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fill_util_info(struct commit *commit)
|
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *util = commit->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
|
|
|
|
assert(util);
|
|
|
|
assert(util->pathname);
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-08-14 22:18:11 +02:00
|
|
|
return !!get_blob_sha1(commit->tree, util->pathname, util->sha1);
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
static void alloc_line_map(struct commit *commit)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct util_info *util = commit->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
int i;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
if (util->line_map)
|
|
|
|
return;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
get_blob(commit);
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
util->num_lines = 0;
|
|
|
|
for (i = 0; i < util->size; i++) {
|
|
|
|
if (util->buf[i] == '\n')
|
|
|
|
util->num_lines++;
|
|
|
|
}
|
2006-10-05 23:00:55 +02:00
|
|
|
if (util->buf[util->size - 1] != '\n')
|
2006-03-02 22:28:17 +01:00
|
|
|
util->num_lines++;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
util->line_map = xmalloc(sizeof(int) * util->num_lines);
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
for (i = 0; i < util->num_lines; i++)
|
|
|
|
util->line_map[i] = -1;
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static void init_first_commit(struct commit *commit, const char *filename)
|
2006-02-21 00:40:54 +01:00
|
|
|
{
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *util = commit->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
int i;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-10 10:21:41 +01:00
|
|
|
util->pathname = filename;
|
|
|
|
if (fill_util_info(commit))
|
2006-03-02 22:28:17 +01:00
|
|
|
die("fill_util_info failed");
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
alloc_line_map(commit);
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-06-18 03:26:18 +02:00
|
|
|
util = commit->util;
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-05 12:03:51 +01:00
|
|
|
for (i = 0; i < util->num_lines; i++)
|
2006-03-02 22:28:17 +01:00
|
|
|
util->line_map[i] = i;
|
|
|
|
}
|
2006-02-21 00:40:54 +01:00
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
static void process_commits(struct rev_info *rev, const char *path,
|
2006-10-05 23:00:55 +02:00
|
|
|
struct commit **initial)
|
2006-03-02 22:28:17 +01:00
|
|
|
{
|
|
|
|
int i;
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *util;
|
2006-03-02 22:28:17 +01:00
|
|
|
int lines_left;
|
|
|
|
int *blame_p;
|
|
|
|
int *new_lines;
|
|
|
|
int new_lines_len;
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
struct commit *commit = get_revision(rev);
|
2006-03-02 22:28:17 +01:00
|
|
|
assert(commit);
|
|
|
|
init_first_commit(commit, path);
|
|
|
|
|
2006-06-18 03:26:18 +02:00
|
|
|
util = commit->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
num_blame_lines = util->num_lines;
|
|
|
|
blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
|
2006-03-05 12:03:51 +01:00
|
|
|
blame_contents = util->buf;
|
|
|
|
blame_len = util->size;
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
for (i = 0; i < num_blame_lines; i++)
|
|
|
|
blame_lines[i] = NULL;
|
|
|
|
|
|
|
|
lines_left = num_blame_lines;
|
|
|
|
blame_p = xmalloc(sizeof(int) * num_blame_lines);
|
|
|
|
new_lines = xmalloc(sizeof(int) * num_blame_lines);
|
|
|
|
do {
|
|
|
|
struct commit_list *parents;
|
|
|
|
int num_parents;
|
|
|
|
struct util_info *util;
|
|
|
|
|
|
|
|
if (DEBUG)
|
|
|
|
printf("\nProcessing commit: %d %s\n", num_commits,
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
|
|
|
|
if (lines_left == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
num_commits++;
|
|
|
|
memset(blame_p, 0, sizeof(int) * num_blame_lines);
|
|
|
|
new_lines_len = 0;
|
|
|
|
num_parents = 0;
|
|
|
|
for (parents = commit->parents;
|
|
|
|
parents != NULL; parents = parents->next)
|
|
|
|
num_parents++;
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (num_parents == 0)
|
2006-03-02 22:28:17 +01:00
|
|
|
*initial = commit;
|
|
|
|
|
2006-03-10 10:21:41 +01:00
|
|
|
if (fill_util_info(commit))
|
2006-03-02 22:28:17 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
alloc_line_map(commit);
|
2006-06-18 03:26:18 +02:00
|
|
|
util = commit->util;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
|
|
|
for (parents = commit->parents;
|
|
|
|
parents != NULL; parents = parents->next) {
|
|
|
|
struct commit *parent = parents->item;
|
|
|
|
struct patch *patch;
|
|
|
|
|
|
|
|
if (parse_commit(parent) < 0)
|
|
|
|
die("parse_commit error");
|
|
|
|
|
|
|
|
if (DEBUG)
|
|
|
|
printf("parent: %s\n",
|
|
|
|
sha1_to_hex(parent->object.sha1));
|
|
|
|
|
2006-03-10 10:21:41 +01:00
|
|
|
if (fill_util_info(parent)) {
|
2006-03-02 22:28:17 +01:00
|
|
|
num_parents--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
patch = get_patch(parent, commit);
|
|
|
|
alloc_line_map(parent);
|
|
|
|
fill_line_map(parent, commit, patch);
|
|
|
|
|
|
|
|
for (i = 0; i < patch->num; i++) {
|
|
|
|
int l;
|
|
|
|
for (l = 0; l < patch->chunks[i].len2; l++) {
|
|
|
|
int mapped_line =
|
|
|
|
map_line(commit, patch->chunks[i].off2 + l);
|
|
|
|
if (mapped_line != -1) {
|
|
|
|
blame_p[mapped_line]++;
|
|
|
|
if (blame_p[mapped_line] == num_parents)
|
|
|
|
new_lines[new_lines_len++] = mapped_line;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free_patch(patch);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (DEBUG)
|
|
|
|
printf("parents: %d\n", num_parents);
|
|
|
|
|
|
|
|
for (i = 0; i < new_lines_len; i++) {
|
|
|
|
int mapped_line = new_lines[i];
|
|
|
|
if (blame_lines[mapped_line] == NULL) {
|
|
|
|
blame_lines[mapped_line] = commit;
|
|
|
|
lines_left--;
|
|
|
|
if (DEBUG)
|
|
|
|
printf("blame: mapped: %d i: %d\n",
|
|
|
|
mapped_line, i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while ((commit = get_revision(rev)) != NULL);
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static int compare_tree_path(struct rev_info *revs,
|
|
|
|
struct commit *c1, struct commit *c2)
|
2006-03-10 10:21:41 +01:00
|
|
|
{
|
2006-04-11 03:14:54 +02:00
|
|
|
int ret;
|
2006-10-05 23:00:55 +02:00
|
|
|
const char *paths[2];
|
|
|
|
struct util_info *util = c2->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
paths[0] = util->pathname;
|
|
|
|
paths[1] = NULL;
|
|
|
|
|
2006-04-11 03:14:54 +02:00
|
|
|
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
|
2006-05-03 23:28:46 +02:00
|
|
|
&revs->pruning);
|
2006-04-11 03:14:54 +02:00
|
|
|
ret = rev_compare_tree(revs, c1->tree, c2->tree);
|
2006-05-03 23:28:46 +02:00
|
|
|
diff_tree_release_paths(&revs->pruning);
|
2006-04-11 03:14:54 +02:00
|
|
|
return ret;
|
2006-03-10 10:21:41 +01:00
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static int same_tree_as_empty_path(struct rev_info *revs, struct tree *t1,
|
|
|
|
const char *path)
|
2006-03-10 10:21:41 +01:00
|
|
|
{
|
2006-04-11 03:14:54 +02:00
|
|
|
int ret;
|
2006-10-05 23:00:55 +02:00
|
|
|
const char *paths[2];
|
2006-03-10 10:21:41 +01:00
|
|
|
paths[0] = path;
|
|
|
|
paths[1] = NULL;
|
|
|
|
|
2006-04-11 03:14:54 +02:00
|
|
|
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
|
2006-05-03 23:28:46 +02:00
|
|
|
&revs->pruning);
|
2006-04-11 03:14:54 +02:00
|
|
|
ret = rev_same_tree_as_empty(revs, t1);
|
2006-05-03 23:28:46 +02:00
|
|
|
diff_tree_release_paths(&revs->pruning);
|
2006-04-11 03:14:54 +02:00
|
|
|
return ret;
|
2006-03-10 10:21:41 +01:00
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static const char *find_rename(struct commit *commit, struct commit *parent)
|
2006-03-10 10:21:41 +01:00
|
|
|
{
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *cutil = commit->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
struct diff_options diff_opts;
|
|
|
|
const char *paths[1];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (DEBUG) {
|
|
|
|
printf("find_rename commit: %s ",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
puts(sha1_to_hex(parent->object.sha1));
|
|
|
|
}
|
|
|
|
|
|
|
|
diff_setup(&diff_opts);
|
|
|
|
diff_opts.recursive = 1;
|
|
|
|
diff_opts.detect_rename = DIFF_DETECT_RENAME;
|
|
|
|
paths[0] = NULL;
|
2006-04-11 03:14:54 +02:00
|
|
|
diff_tree_setup_paths(paths, &diff_opts);
|
2006-03-10 10:21:41 +01:00
|
|
|
if (diff_setup_done(&diff_opts) < 0)
|
|
|
|
die("diff_setup_done failed");
|
|
|
|
|
|
|
|
diff_tree_sha1(commit->tree->object.sha1, parent->tree->object.sha1,
|
|
|
|
"", &diff_opts);
|
|
|
|
diffcore_std(&diff_opts);
|
|
|
|
|
|
|
|
for (i = 0; i < diff_queued_diff.nr; i++) {
|
|
|
|
struct diff_filepair *p = diff_queued_diff.queue[i];
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (p->status == 'R' &&
|
|
|
|
!strcmp(p->one->path, cutil->pathname)) {
|
2006-03-10 10:21:41 +01:00
|
|
|
if (DEBUG)
|
2006-10-05 23:00:55 +02:00
|
|
|
printf("rename %s -> %s\n",
|
|
|
|
p->one->path, p->two->path);
|
2006-03-10 10:21:41 +01:00
|
|
|
return p->two->path;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void simplify_commit(struct rev_info *revs, struct commit *commit)
|
|
|
|
{
|
|
|
|
struct commit_list **pp, *parent;
|
|
|
|
|
|
|
|
if (!commit->tree)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!commit->parents) {
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *util = commit->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
if (!same_tree_as_empty_path(revs, commit->tree,
|
|
|
|
util->pathname))
|
|
|
|
commit->object.flags |= TREECHANGE;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pp = &commit->parents;
|
|
|
|
while ((parent = *pp) != NULL) {
|
|
|
|
struct commit *p = parent->item;
|
|
|
|
|
|
|
|
if (p->object.flags & UNINTERESTING) {
|
|
|
|
pp = &parent->next;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
parse_commit(p);
|
|
|
|
switch (compare_tree_path(revs, p, commit)) {
|
|
|
|
case REV_TREE_SAME:
|
|
|
|
parent->next = NULL;
|
|
|
|
commit->parents = parent;
|
|
|
|
get_util(p)->pathname = get_util(commit)->pathname;
|
|
|
|
return;
|
|
|
|
|
|
|
|
case REV_TREE_NEW:
|
|
|
|
{
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *util = commit->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
if (revs->remove_empty_trees &&
|
|
|
|
same_tree_as_empty_path(revs, p->tree,
|
|
|
|
util->pathname)) {
|
2006-10-05 23:00:55 +02:00
|
|
|
const char *new_name = find_rename(commit, p);
|
2006-03-10 10:21:41 +01:00
|
|
|
if (new_name) {
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *putil = get_util(p);
|
2006-03-10 10:21:41 +01:00
|
|
|
if (!putil->pathname)
|
2006-09-02 06:16:31 +02:00
|
|
|
putil->pathname = xstrdup(new_name);
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
else {
|
2006-03-10 10:21:41 +01:00
|
|
|
*pp = parent->next;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fallthrough */
|
|
|
|
case REV_TREE_DIFFERENT:
|
|
|
|
pp = &parent->next;
|
|
|
|
if (!get_util(p)->pathname)
|
|
|
|
get_util(p)->pathname =
|
|
|
|
get_util(commit)->pathname;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
die("bad tree compare for commit %s",
|
|
|
|
sha1_to_hex(commit->object.sha1));
|
|
|
|
}
|
|
|
|
commit->object.flags |= TREECHANGE;
|
|
|
|
}
|
|
|
|
|
2006-03-05 12:03:51 +01:00
|
|
|
struct commit_info
|
|
|
|
{
|
2006-10-05 23:00:55 +02:00
|
|
|
char *author;
|
|
|
|
char *author_mail;
|
2006-03-05 12:03:51 +01:00
|
|
|
unsigned long author_time;
|
2006-10-05 23:00:55 +02:00
|
|
|
char *author_tz;
|
2006-10-05 23:07:42 +02:00
|
|
|
|
|
|
|
/* filled only when asked for details */
|
|
|
|
char *committer;
|
|
|
|
char *committer_mail;
|
|
|
|
unsigned long committer_time;
|
|
|
|
char *committer_tz;
|
|
|
|
|
|
|
|
char *summary;
|
2006-03-05 12:03:51 +01:00
|
|
|
};
|
|
|
|
|
2006-10-05 23:07:42 +02:00
|
|
|
static void get_ac_line(const char *inbuf, const char *what,
|
|
|
|
int bufsz, char *person, char **mail,
|
|
|
|
unsigned long *time, char **tz)
|
2006-03-05 12:03:51 +01:00
|
|
|
{
|
|
|
|
int len;
|
2006-10-05 23:07:42 +02:00
|
|
|
char *tmp, *endp;
|
|
|
|
|
|
|
|
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 */
|
|
|
|
person = *mail = *tz = "(unknown)";
|
|
|
|
*time = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
memcpy(person, tmp, len);
|
2006-03-05 12:03:51 +01:00
|
|
|
|
2006-10-05 23:07:42 +02:00
|
|
|
tmp = person;
|
2006-03-05 12:03:51 +01:00
|
|
|
tmp += len;
|
|
|
|
*tmp = 0;
|
2006-10-05 23:00:55 +02:00
|
|
|
while (*tmp != ' ')
|
2006-03-05 12:03:51 +01:00
|
|
|
tmp--;
|
2006-10-05 23:07:42 +02:00
|
|
|
*tz = tmp+1;
|
2006-03-05 12:03:51 +01:00
|
|
|
|
|
|
|
*tmp = 0;
|
2006-10-05 23:00:55 +02:00
|
|
|
while (*tmp != ' ')
|
2006-03-05 12:03:51 +01:00
|
|
|
tmp--;
|
2006-10-05 23:07:42 +02:00
|
|
|
*time = strtoul(tmp, NULL, 10);
|
2006-03-05 12:03:51 +01:00
|
|
|
|
|
|
|
*tmp = 0;
|
2006-10-05 23:00:55 +02:00
|
|
|
while (*tmp != ' ')
|
2006-03-05 12:03:51 +01:00
|
|
|
tmp--;
|
2006-10-05 23:07:42 +02:00
|
|
|
*mail = tmp + 1;
|
2006-03-05 12:03:51 +01:00
|
|
|
*tmp = 0;
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:07:42 +02: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];
|
|
|
|
|
|
|
|
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)
|
|
|
|
goto error_out;
|
|
|
|
len = endp - tmp;
|
|
|
|
if (len >= sizeof(summary_buf))
|
|
|
|
goto error_out;
|
|
|
|
memcpy(summary_buf, tmp, len);
|
|
|
|
summary_buf[len] = 0;
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static const char *format_time(unsigned long time, const char *tz_str,
|
2006-06-13 08:08:31 +02:00
|
|
|
int show_raw_time)
|
2006-03-05 12:03:51 +01:00
|
|
|
{
|
|
|
|
static char time_buf[128];
|
|
|
|
time_t t = time;
|
2006-03-05 23:48:01 +01:00
|
|
|
int minutes, tz;
|
|
|
|
struct tm *tm;
|
|
|
|
|
2006-06-13 08:08:31 +02:00
|
|
|
if (show_raw_time) {
|
|
|
|
sprintf(time_buf, "%lu %s", time, tz_str);
|
|
|
|
return time_buf;
|
|
|
|
}
|
|
|
|
|
2006-03-05 23:48:01 +01:00
|
|
|
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);
|
2006-03-05 12:03:51 +01:00
|
|
|
return time_buf;
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static void topo_setter(struct commit *c, void *data)
|
2006-03-10 10:21:41 +01:00
|
|
|
{
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *util = c->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
util->topo_data = data;
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
static void *topo_getter(struct commit *c)
|
2006-03-10 10:21:41 +01:00
|
|
|
{
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *util = c->util;
|
2006-03-10 10:21:41 +01:00
|
|
|
return util->topo_data;
|
|
|
|
}
|
|
|
|
|
2006-04-07 08:58:51 +02:00
|
|
|
static int read_ancestry(const char *graft_file,
|
|
|
|
unsigned char **start_sha1)
|
|
|
|
{
|
|
|
|
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);
|
|
|
|
register_commit_graft(graft, 0);
|
|
|
|
if (!*start_sha1)
|
|
|
|
*start_sha1 = graft->sha1;
|
|
|
|
}
|
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:06:26 +02:00
|
|
|
static int lineno_width(int lines)
|
|
|
|
{
|
|
|
|
int i, width;
|
|
|
|
|
|
|
|
for (width = 1, i = 10; i <= lines + 1; width++)
|
|
|
|
i *= 10;
|
|
|
|
return width;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int find_orig_linenum(struct util_info *u, int lineno)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < u->num_lines; i++)
|
|
|
|
if (lineno == u->line_map[i])
|
|
|
|
return i + 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:06:42 +02:00
|
|
|
static void emit_meta(struct commit *c, int lno,
|
2006-10-05 23:07:42 +02:00
|
|
|
int sha1_len, int compatibility, int porcelain,
|
2006-10-05 23:06:42 +02:00
|
|
|
int show_name, int show_number, int show_raw_time,
|
|
|
|
int longest_file, int longest_author,
|
|
|
|
int max_digits, int max_orig_digits)
|
|
|
|
{
|
|
|
|
struct util_info *u;
|
|
|
|
int lineno;
|
|
|
|
struct commit_info ci;
|
|
|
|
|
|
|
|
u = c->util;
|
|
|
|
lineno = find_orig_linenum(u, lno);
|
|
|
|
|
2006-10-05 23:07:42 +02:00
|
|
|
if (porcelain) {
|
|
|
|
int group_size = -1;
|
|
|
|
struct commit *cc = (lno == 0) ? NULL : blame_lines[lno-1];
|
|
|
|
if (cc != c) {
|
|
|
|
/* This is the beginning of this group */
|
|
|
|
int i;
|
|
|
|
for (i = lno + 1; i < num_blame_lines; i++)
|
|
|
|
if (blame_lines[i] != c)
|
|
|
|
break;
|
|
|
|
group_size = i - lno;
|
|
|
|
}
|
|
|
|
if (0 < group_size)
|
|
|
|
printf("%s %d %d %d\n", sha1_to_hex(c->object.sha1),
|
|
|
|
lineno, lno + 1, group_size);
|
|
|
|
else
|
|
|
|
printf("%s %d %d\n", sha1_to_hex(c->object.sha1),
|
|
|
|
lineno, lno + 1);
|
|
|
|
if (!u->meta_given) {
|
|
|
|
get_commit_info(c, &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("filename ");
|
|
|
|
if (quote_c_style(u->pathname, NULL, NULL, 0))
|
|
|
|
quote_c_style(u->pathname, NULL, stdout, 0);
|
|
|
|
else
|
|
|
|
fputs(u->pathname, stdout);
|
|
|
|
printf("\nsummary %s\n", ci.summary);
|
|
|
|
|
|
|
|
u->meta_given = 1;
|
|
|
|
}
|
|
|
|
putchar('\t');
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
get_commit_info(c, &ci, 0);
|
2006-10-05 23:06:42 +02:00
|
|
|
fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
|
|
|
|
if (compatibility) {
|
|
|
|
printf("\t(%10s\t%10s\t%d)", ci.author,
|
|
|
|
format_time(ci.author_time, ci.author_tz,
|
|
|
|
show_raw_time),
|
|
|
|
lno + 1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (show_name)
|
|
|
|
printf(" %-*.*s", longest_file, longest_file,
|
|
|
|
u->pathname);
|
|
|
|
if (show_number)
|
|
|
|
printf(" %*d", max_orig_digits,
|
|
|
|
lineno);
|
|
|
|
printf(" (%-*.*s %10s %*d) ",
|
|
|
|
longest_author, longest_author, ci.author,
|
|
|
|
format_time(ci.author_time, ci.author_tz,
|
|
|
|
show_raw_time),
|
|
|
|
max_digits, lno + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-21 00:40:54 +01:00
|
|
|
int main(int argc, const char **argv)
|
|
|
|
{
|
2006-03-02 22:28:17 +01:00
|
|
|
int i;
|
|
|
|
struct commit *initial = NULL;
|
2006-04-07 08:58:51 +02:00
|
|
|
unsigned char sha1[20], *sha1_p = NULL;
|
2006-03-05 12:03:51 +01:00
|
|
|
|
|
|
|
const char *filename = NULL, *commit = NULL;
|
|
|
|
char filename_buf[256];
|
|
|
|
int sha1_len = 8;
|
2006-07-10 07:50:18 +02:00
|
|
|
int compatibility = 0;
|
2006-06-13 08:08:31 +02:00
|
|
|
int show_raw_time = 0;
|
2006-03-05 12:03:51 +01:00
|
|
|
int options = 1;
|
2006-10-05 23:00:55 +02:00
|
|
|
struct commit *start_commit;
|
2006-03-05 12:03:51 +01:00
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
const char *args[10];
|
2006-03-02 22:28:17 +01:00
|
|
|
struct rev_info rev;
|
|
|
|
|
2006-03-05 12:03:51 +01:00
|
|
|
struct commit_info ci;
|
|
|
|
const char *buf;
|
2006-10-05 23:06:26 +02:00
|
|
|
int max_digits, max_orig_digits;
|
|
|
|
int longest_file, longest_author, longest_file_lines;
|
2006-10-05 23:06:22 +02:00
|
|
|
int show_name = 0;
|
2006-10-05 23:06:26 +02:00
|
|
|
int show_number = 0;
|
2006-10-05 23:07:42 +02:00
|
|
|
int porcelain = 0;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
const char *prefix = setup_git_directory();
|
2006-03-24 08:41:18 +01:00
|
|
|
git_config(git_default_config);
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
if (options) {
|
|
|
|
if (!strcmp(argv[i], "-h") ||
|
2006-03-05 12:03:51 +01:00
|
|
|
!strcmp(argv[i], "--help"))
|
|
|
|
usage(blame_usage);
|
2006-10-05 23:00:55 +02:00
|
|
|
if (!strcmp(argv[i], "-l") ||
|
|
|
|
!strcmp(argv[i], "--long")) {
|
2006-03-05 23:46:36 +01:00
|
|
|
sha1_len = 40;
|
2006-03-05 12:03:51 +01:00
|
|
|
continue;
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
if (!strcmp(argv[i], "-c") ||
|
|
|
|
!strcmp(argv[i], "--compatibility")) {
|
2006-07-10 07:50:18 +02:00
|
|
|
compatibility = 1;
|
2006-03-05 12:03:51 +01:00
|
|
|
continue;
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
if (!strcmp(argv[i], "-t") ||
|
|
|
|
!strcmp(argv[i], "--time")) {
|
2006-06-13 08:08:31 +02:00
|
|
|
show_raw_time = 1;
|
|
|
|
continue;
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
if (!strcmp(argv[i], "-S")) {
|
2006-04-07 08:58:51 +02:00
|
|
|
if (i + 1 < argc &&
|
|
|
|
!read_ancestry(argv[i + 1], &sha1_p)) {
|
2006-07-10 07:50:18 +02:00
|
|
|
compatibility = 1;
|
2006-04-07 08:58:51 +02:00
|
|
|
i++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
usage(blame_usage);
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
2006-10-05 23:06:22 +02:00
|
|
|
if (!strcmp(argv[i], "-f") ||
|
|
|
|
!strcmp(argv[i], "--show-name")) {
|
|
|
|
show_name = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2006-10-05 23:06:26 +02:00
|
|
|
if (!strcmp(argv[i], "-n") ||
|
|
|
|
!strcmp(argv[i], "--show-number")) {
|
|
|
|
show_number = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2006-10-12 09:44:27 +02:00
|
|
|
if (!strcmp(argv[i], "-p") ||
|
|
|
|
!strcmp(argv[i], "--porcelain")) {
|
2006-10-05 23:07:42 +02:00
|
|
|
porcelain = 1;
|
|
|
|
sha1_len = 40;
|
|
|
|
show_raw_time = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2006-10-05 23:00:55 +02:00
|
|
|
if (!strcmp(argv[i], "--")) {
|
2006-03-05 12:03:51 +01:00
|
|
|
options = 0;
|
|
|
|
continue;
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
if (argv[i][0] == '-')
|
2006-03-05 12:03:51 +01:00
|
|
|
usage(blame_usage);
|
2006-10-05 23:00:55 +02:00
|
|
|
options = 0;
|
2006-03-05 12:03:51 +01:00
|
|
|
}
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (!options) {
|
|
|
|
if (!filename)
|
2006-03-05 12:03:51 +01:00
|
|
|
filename = argv[i];
|
2006-10-05 23:00:55 +02:00
|
|
|
else if (!commit)
|
2006-03-05 12:03:51 +01:00
|
|
|
commit = argv[i];
|
|
|
|
else
|
|
|
|
usage(blame_usage);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (!filename)
|
2006-03-05 12:03:51 +01:00
|
|
|
usage(blame_usage);
|
2006-04-07 08:58:51 +02:00
|
|
|
if (commit && sha1_p)
|
|
|
|
usage(blame_usage);
|
2006-10-05 23:00:55 +02:00
|
|
|
else if (!commit)
|
2006-03-05 12:03:51 +01:00
|
|
|
commit = "HEAD";
|
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (prefix)
|
2006-03-05 12:03:51 +01:00
|
|
|
sprintf(filename_buf, "%s%s", prefix, filename);
|
|
|
|
else
|
|
|
|
strcpy(filename_buf, filename);
|
|
|
|
filename = filename_buf;
|
2006-03-02 22:28:17 +01:00
|
|
|
|
2006-04-07 08:58:51 +02:00
|
|
|
if (!sha1_p) {
|
|
|
|
if (get_sha1(commit, sha1))
|
|
|
|
die("get_sha1 failed, commit '%s' not found", commit);
|
|
|
|
sha1_p = sha1;
|
|
|
|
}
|
|
|
|
start_commit = lookup_commit_reference(sha1_p);
|
2006-03-10 10:21:41 +01:00
|
|
|
get_util(start_commit)->pathname = filename;
|
|
|
|
if (fill_util_info(start_commit)) {
|
|
|
|
printf("%s not found in %s\n", filename, commit);
|
|
|
|
return 1;
|
2006-03-02 22:28:17 +01:00
|
|
|
}
|
|
|
|
|
2006-07-29 06:21:48 +02:00
|
|
|
init_revisions(&rev, setup_git_directory());
|
2006-03-10 10:21:41 +01:00
|
|
|
rev.remove_empty_trees = 1;
|
|
|
|
rev.topo_order = 1;
|
|
|
|
rev.prune_fn = simplify_commit;
|
|
|
|
rev.topo_setter = topo_setter;
|
|
|
|
rev.topo_getter = topo_getter;
|
2006-04-06 03:21:17 +02:00
|
|
|
rev.parents = 1;
|
2006-03-10 10:21:41 +01:00
|
|
|
rev.limited = 1;
|
|
|
|
|
|
|
|
commit_list_insert(start_commit, &rev.commits);
|
|
|
|
|
|
|
|
args[0] = filename;
|
|
|
|
args[1] = NULL;
|
2006-05-03 23:28:46 +02:00
|
|
|
diff_tree_setup_paths(args, &rev.pruning);
|
2006-03-02 22:28:17 +01:00
|
|
|
prepare_revision_walk(&rev);
|
|
|
|
process_commits(&rev, filename, &initial);
|
|
|
|
|
2006-10-05 23:06:42 +02:00
|
|
|
for (i = 0; i < num_blame_lines; i++)
|
|
|
|
if (!blame_lines[i])
|
|
|
|
blame_lines[i] = initial;
|
|
|
|
|
2006-03-05 12:03:51 +01:00
|
|
|
buf = blame_contents;
|
2006-10-05 23:06:26 +02:00
|
|
|
max_digits = lineno_width(num_blame_lines);
|
2006-03-05 23:46:36 +01:00
|
|
|
|
2006-03-17 22:49:28 +01:00
|
|
|
longest_file = 0;
|
|
|
|
longest_author = 0;
|
2006-10-05 23:06:26 +02:00
|
|
|
longest_file_lines = 0;
|
2006-03-17 22:49:28 +01:00
|
|
|
for (i = 0; i < num_blame_lines; i++) {
|
|
|
|
struct commit *c = blame_lines[i];
|
2006-10-05 23:00:55 +02:00
|
|
|
struct util_info *u;
|
2006-06-18 03:26:18 +02:00
|
|
|
u = c->util;
|
2006-03-17 22:49:28 +01:00
|
|
|
|
2006-10-05 23:06:22 +02:00
|
|
|
if (!show_name && strcmp(filename, u->pathname))
|
|
|
|
show_name = 1;
|
2006-03-17 22:49:28 +01:00
|
|
|
if (longest_file < strlen(u->pathname))
|
|
|
|
longest_file = strlen(u->pathname);
|
2006-10-05 23:06:26 +02:00
|
|
|
if (longest_file_lines < u->num_lines)
|
|
|
|
longest_file_lines = u->num_lines;
|
2006-10-05 23:07:42 +02:00
|
|
|
get_commit_info(c, &ci, 0);
|
2006-03-17 22:49:28 +01:00
|
|
|
if (longest_author < strlen(ci.author))
|
|
|
|
longest_author = strlen(ci.author);
|
|
|
|
}
|
|
|
|
|
2006-10-05 23:06:26 +02:00
|
|
|
max_orig_digits = lineno_width(longest_file_lines);
|
|
|
|
|
2006-03-02 22:28:17 +01:00
|
|
|
for (i = 0; i < num_blame_lines; i++) {
|
2006-10-05 23:06:42 +02:00
|
|
|
emit_meta(blame_lines[i], i,
|
2006-10-05 23:07:42 +02:00
|
|
|
sha1_len, compatibility, porcelain,
|
2006-10-05 23:06:42 +02:00
|
|
|
show_name, show_number, show_raw_time,
|
|
|
|
longest_file, longest_author,
|
|
|
|
max_digits, max_orig_digits);
|
2006-03-05 12:03:51 +01:00
|
|
|
|
2006-10-05 23:00:55 +02:00
|
|
|
if (i == num_blame_lines - 1) {
|
2006-03-05 12:03:51 +01:00
|
|
|
fwrite(buf, blame_len - (buf - blame_contents),
|
|
|
|
1, stdout);
|
2006-10-05 23:00:55 +02:00
|
|
|
if (blame_contents[blame_len-1] != '\n')
|
2006-03-05 12:03:51 +01:00
|
|
|
putc('\n', stdout);
|
2006-10-05 23:00:55 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
char *next_buf = strchr(buf, '\n') + 1;
|
2006-03-05 12:03:51 +01:00
|
|
|
fwrite(buf, next_buf - buf, 1, stdout);
|
|
|
|
buf = next_buf;
|
|
|
|
}
|
2006-03-02 22:28:17 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (DEBUG) {
|
|
|
|
printf("num get patch: %d\n", num_get_patch);
|
|
|
|
printf("num commits: %d\n", num_commits);
|
|
|
|
printf("patch time: %f\n", patch_time / 1000000.0);
|
|
|
|
printf("initial: %s\n", sha1_to_hex(initial->object.sha1));
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2006-02-21 00:40:54 +01:00
|
|
|
}
|