Commit c1ca2b67e1747ff4d2ba5a10ee300497d1d28dbe
2013-10-10T14:30:05
Include signatures in blame hunks
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/examples/blame.c b/examples/blame.c
index df687a7..8ecf297 100644
--- a/examples/blame.c
+++ b/examples/blame.c
@@ -128,22 +128,20 @@ int main(int argc, char *argv[])
while (i < git_blob_rawsize(blob)) {
const char *eol = strchr(rawdata+i, '\n');
char oid[10] = {0};
- git_commit *hunkcommit;
- const git_signature *sig;
const git_blame_hunk *hunk = git_blame_get_hunk_byline(blame, line);
if (hunk) {
+ char sig[128] = {0};
+
git_oid_tostr(oid, 10, &hunk->final_commit_id);
- check(git_commit_lookup(&hunkcommit, repo, &hunk->final_commit_id), "Commit lookup error");
- sig = git_commit_author(hunkcommit);
+ snprintf(sig, 30, "%s <%s>", hunk->final_signature->name, hunk->final_signature->email);
printf("%s ( %-30s %3d) %.*s\n",
oid,
- sig->name,
+ sig,
line,
(int)(eol-rawdata-i),
rawdata+i);
- git_commit_free(hunkcommit);
}
i = eol - rawdata + 1;
diff --git a/include/git2/blame.h b/include/git2/blame.h
index ba3580f..fe51371 100644
--- a/include/git2/blame.h
+++ b/include/git2/blame.h
@@ -103,10 +103,12 @@ typedef struct git_blame_hunk {
git_oid final_commit_id;
uint16_t final_start_line_number;
+ git_signature *final_signature;
git_oid orig_commit_id;
const char *orig_path;
uint16_t orig_start_line_number;
+ git_signature *orig_signature;
char boundary;
} git_blame_hunk;
diff --git a/src/blame.c b/src/blame.c
index 0722ba0..5b0ebd4 100644
--- a/src/blame.c
+++ b/src/blame.c
@@ -12,6 +12,7 @@
#include "git2/tree.h"
#include "git2/diff.h"
#include "git2/blob.h"
+#include "git2/signature.h"
#include "util.h"
#include "repository.h"
#include "blame_git.h"
@@ -80,6 +81,8 @@ static git_blame_hunk* dup_hunk(git_blame_hunk *hunk)
static void free_hunk(git_blame_hunk *hunk)
{
git__free((void*)hunk->orig_path);
+ git_signature_free(hunk->final_signature);
+ git_signature_free(hunk->orig_signature);
git__free(hunk);
}
@@ -252,6 +255,7 @@ static git_blame_hunk* hunk_from_entry(git_blame__entry *e)
git_blame_hunk *h = new_hunk(
e->lno+1, e->num_lines, e->s_lno+1, e->suspect->path);
git_oid_cpy(&h->final_commit_id, git_commit_id(e->suspect->commit));
+ h->final_signature = git_signature_dup(git_commit_author(e->suspect->commit));
h->boundary = e->is_boundary ? 1 : 0;
return h;
}