|
|
|
@ -28,16 +28,42 @@ static int remove_space(char *line)
@@ -28,16 +28,42 @@ static int remove_space(char *line)
|
|
|
|
|
return dst - line; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void generate_id_list(void) |
|
|
|
|
static int scan_hunk_header(const char *p, int *p_before, int *p_after) |
|
|
|
|
{ |
|
|
|
|
static const char digits[] = "0123456789"; |
|
|
|
|
const char *q, *r; |
|
|
|
|
int n; |
|
|
|
|
|
|
|
|
|
q = p + 4; |
|
|
|
|
n = strspn(q, digits); |
|
|
|
|
if (q[n] == ',') { |
|
|
|
|
q += n + 1; |
|
|
|
|
n = strspn(q, digits); |
|
|
|
|
} |
|
|
|
|
if (n == 0 || q[n] != ' ' || q[n+1] != '+') |
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
r = q + n + 2; |
|
|
|
|
n = strspn(r, digits); |
|
|
|
|
if (r[n] == ',') { |
|
|
|
|
r += n + 1; |
|
|
|
|
n = strspn(r, digits); |
|
|
|
|
} |
|
|
|
|
if (n == 0) |
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
*p_before = atoi(q); |
|
|
|
|
*p_after = atoi(r); |
|
|
|
|
return 1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int get_one_patchid(unsigned char *next_sha1, git_SHA_CTX *ctx) |
|
|
|
|
{ |
|
|
|
|
static unsigned char sha1[20]; |
|
|
|
|
static char line[1000]; |
|
|
|
|
git_SHA_CTX ctx; |
|
|
|
|
int patchlen = 0; |
|
|
|
|
int patchlen = 0, found_next = 0; |
|
|
|
|
int before = -1, after = -1; |
|
|
|
|
|
|
|
|
|
git_SHA1_Init(&ctx); |
|
|
|
|
while (fgets(line, sizeof(line), stdin) != NULL) { |
|
|
|
|
unsigned char n[20]; |
|
|
|
|
char *p = line; |
|
|
|
|
int len; |
|
|
|
|
|
|
|
|
@ -45,32 +71,75 @@ static void generate_id_list(void)
@@ -45,32 +71,75 @@ static void generate_id_list(void)
|
|
|
|
|
p += 10; |
|
|
|
|
else if (!memcmp(line, "commit ", 7)) |
|
|
|
|
p += 7; |
|
|
|
|
else if (!memcmp(line, "From ", 5)) |
|
|
|
|
p += 5; |
|
|
|
|
|
|
|
|
|
if (!get_sha1_hex(p, n)) { |
|
|
|
|
flush_current_id(patchlen, sha1, &ctx); |
|
|
|
|
hashcpy(sha1, n); |
|
|
|
|
patchlen = 0; |
|
|
|
|
continue; |
|
|
|
|
if (!get_sha1_hex(p, next_sha1)) { |
|
|
|
|
found_next = 1; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* Ignore commit comments */ |
|
|
|
|
if (!patchlen && memcmp(line, "diff ", 5)) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
/* Ignore git-diff index header */ |
|
|
|
|
if (!memcmp(line, "index ", 6)) |
|
|
|
|
continue; |
|
|
|
|
/* Parsing diff header? */ |
|
|
|
|
if (before == -1) { |
|
|
|
|
if (!memcmp(line, "index ", 6)) |
|
|
|
|
continue; |
|
|
|
|
else if (!memcmp(line, "--- ", 4)) |
|
|
|
|
before = after = 1; |
|
|
|
|
else if (!isalpha(line[0])) |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* Ignore line numbers when computing the SHA1 of the patch */ |
|
|
|
|
if (!memcmp(line, "@@ -", 4)) |
|
|
|
|
continue; |
|
|
|
|
/* Looking for a valid hunk header? */ |
|
|
|
|
if (before == 0 && after == 0) { |
|
|
|
|
if (!memcmp(line, "@@ -", 4)) { |
|
|
|
|
/* Parse next hunk, but ignore line numbers. */ |
|
|
|
|
scan_hunk_header(line, &before, &after); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* Split at the end of the patch. */ |
|
|
|
|
if (memcmp(line, "diff ", 5)) |
|
|
|
|
break; |
|
|
|
|
|
|
|
|
|
/* Else we're parsing another header. */ |
|
|
|
|
before = after = -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* If we get here, we're inside a hunk. */ |
|
|
|
|
if (line[0] == '-' || line[0] == ' ') |
|
|
|
|
before--; |
|
|
|
|
if (line[0] == '+' || line[0] == ' ') |
|
|
|
|
after--; |
|
|
|
|
|
|
|
|
|
/* Compute the sha without whitespace */ |
|
|
|
|
len = remove_space(line); |
|
|
|
|
patchlen += len; |
|
|
|
|
git_SHA1_Update(&ctx, line, len); |
|
|
|
|
git_SHA1_Update(ctx, line, len); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!found_next) |
|
|
|
|
hashclr(next_sha1); |
|
|
|
|
|
|
|
|
|
return patchlen; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static void generate_id_list(void) |
|
|
|
|
{ |
|
|
|
|
unsigned char sha1[20], n[20]; |
|
|
|
|
git_SHA_CTX ctx; |
|
|
|
|
int patchlen; |
|
|
|
|
|
|
|
|
|
git_SHA1_Init(&ctx); |
|
|
|
|
hashclr(sha1); |
|
|
|
|
while (!feof(stdin)) { |
|
|
|
|
patchlen = get_one_patchid(n, &ctx); |
|
|
|
|
flush_current_id(patchlen, sha1, &ctx); |
|
|
|
|
hashcpy(sha1, n); |
|
|
|
|
} |
|
|
|
|
flush_current_id(patchlen, sha1, &ctx); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static const char patch_id_usage[] = "git patch-id < patch"; |
|
|
|
|