patch-id: convert to use the_hash_algo
Convert the two separate patch-id implementations to use the_hash_algo in their implementation. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
28ba1830d0
commit
36261e42ec
@ -1,15 +1,16 @@
|
|||||||
|
#include "cache.h"
|
||||||
#include "builtin.h"
|
#include "builtin.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "diff.h"
|
#include "diff.h"
|
||||||
|
|
||||||
static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
|
static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
|
||||||
{
|
{
|
||||||
char name[50];
|
char name[GIT_MAX_HEXSZ + 1];
|
||||||
|
|
||||||
if (!patchlen)
|
if (!patchlen)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
memcpy(name, oid_to_hex(id), GIT_SHA1_HEXSZ + 1);
|
memcpy(name, oid_to_hex(id), the_hash_algo->hexsz + 1);
|
||||||
printf("%s %s\n", oid_to_hex(result), name);
|
printf("%s %s\n", oid_to_hex(result), name);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,9 +61,9 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
|
|||||||
{
|
{
|
||||||
int patchlen = 0, found_next = 0;
|
int patchlen = 0, found_next = 0;
|
||||||
int before = -1, after = -1;
|
int before = -1, after = -1;
|
||||||
git_SHA_CTX ctx;
|
git_hash_ctx ctx;
|
||||||
|
|
||||||
git_SHA1_Init(&ctx);
|
the_hash_algo->init_fn(&ctx);
|
||||||
oidclr(result);
|
oidclr(result);
|
||||||
|
|
||||||
while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) {
|
while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) {
|
||||||
@ -122,7 +123,7 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
|
|||||||
/* Compute the sha without whitespace */
|
/* Compute the sha without whitespace */
|
||||||
len = remove_space(line);
|
len = remove_space(line);
|
||||||
patchlen += len;
|
patchlen += len;
|
||||||
git_SHA1_Update(&ctx, line, len);
|
the_hash_algo->update_fn(&ctx, line, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!found_next)
|
if (!found_next)
|
||||||
|
46
diff.c
46
diff.c
@ -5978,7 +5978,7 @@ static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct patch_id_t {
|
struct patch_id_t {
|
||||||
git_SHA_CTX *ctx;
|
git_hash_ctx *ctx;
|
||||||
int patchlen;
|
int patchlen;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -5995,16 +5995,16 @@ static int remove_space(char *line, int len)
|
|||||||
return dst - line;
|
return dst - line;
|
||||||
}
|
}
|
||||||
|
|
||||||
void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx)
|
void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx)
|
||||||
{
|
{
|
||||||
unsigned char hash[GIT_MAX_RAWSZ];
|
unsigned char hash[GIT_MAX_RAWSZ];
|
||||||
unsigned short carry = 0;
|
unsigned short carry = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
git_SHA1_Final(hash, ctx);
|
the_hash_algo->final_fn(hash, ctx);
|
||||||
git_SHA1_Init(ctx);
|
the_hash_algo->init_fn(ctx);
|
||||||
/* 20-byte sum, with carry */
|
/* 20-byte sum, with carry */
|
||||||
for (i = 0; i < GIT_SHA1_RAWSZ; ++i) {
|
for (i = 0; i < the_hash_algo->rawsz; ++i) {
|
||||||
carry += result->hash[i] + hash[i];
|
carry += result->hash[i] + hash[i];
|
||||||
result->hash[i] = carry;
|
result->hash[i] = carry;
|
||||||
carry >>= 8;
|
carry >>= 8;
|
||||||
@ -6018,21 +6018,21 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
|
|||||||
|
|
||||||
new_len = remove_space(line, len);
|
new_len = remove_space(line, len);
|
||||||
|
|
||||||
git_SHA1_Update(data->ctx, line, new_len);
|
the_hash_algo->update_fn(data->ctx, line, new_len);
|
||||||
data->patchlen += new_len;
|
data->patchlen += new_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void patch_id_add_string(git_SHA_CTX *ctx, const char *str)
|
static void patch_id_add_string(git_hash_ctx *ctx, const char *str)
|
||||||
{
|
{
|
||||||
git_SHA1_Update(ctx, str, strlen(str));
|
the_hash_algo->update_fn(ctx, str, strlen(str));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode)
|
static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode)
|
||||||
{
|
{
|
||||||
/* large enough for 2^32 in octal */
|
/* large enough for 2^32 in octal */
|
||||||
char buf[12];
|
char buf[12];
|
||||||
int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
|
int len = xsnprintf(buf, sizeof(buf), "%06o", mode);
|
||||||
git_SHA1_Update(ctx, buf, len);
|
the_hash_algo->update_fn(ctx, buf, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* returns 0 upon success, and writes result into oid */
|
/* returns 0 upon success, and writes result into oid */
|
||||||
@ -6040,10 +6040,10 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
|
|||||||
{
|
{
|
||||||
struct diff_queue_struct *q = &diff_queued_diff;
|
struct diff_queue_struct *q = &diff_queued_diff;
|
||||||
int i;
|
int i;
|
||||||
git_SHA_CTX ctx;
|
git_hash_ctx ctx;
|
||||||
struct patch_id_t data;
|
struct patch_id_t data;
|
||||||
|
|
||||||
git_SHA1_Init(&ctx);
|
the_hash_algo->init_fn(&ctx);
|
||||||
memset(&data, 0, sizeof(struct patch_id_t));
|
memset(&data, 0, sizeof(struct patch_id_t));
|
||||||
data.ctx = &ctx;
|
data.ctx = &ctx;
|
||||||
oidclr(oid);
|
oidclr(oid);
|
||||||
@ -6076,27 +6076,27 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
|
|||||||
len2 = remove_space(p->two->path, strlen(p->two->path));
|
len2 = remove_space(p->two->path, strlen(p->two->path));
|
||||||
patch_id_add_string(&ctx, "diff--git");
|
patch_id_add_string(&ctx, "diff--git");
|
||||||
patch_id_add_string(&ctx, "a/");
|
patch_id_add_string(&ctx, "a/");
|
||||||
git_SHA1_Update(&ctx, p->one->path, len1);
|
the_hash_algo->update_fn(&ctx, p->one->path, len1);
|
||||||
patch_id_add_string(&ctx, "b/");
|
patch_id_add_string(&ctx, "b/");
|
||||||
git_SHA1_Update(&ctx, p->two->path, len2);
|
the_hash_algo->update_fn(&ctx, p->two->path, len2);
|
||||||
|
|
||||||
if (p->one->mode == 0) {
|
if (p->one->mode == 0) {
|
||||||
patch_id_add_string(&ctx, "newfilemode");
|
patch_id_add_string(&ctx, "newfilemode");
|
||||||
patch_id_add_mode(&ctx, p->two->mode);
|
patch_id_add_mode(&ctx, p->two->mode);
|
||||||
patch_id_add_string(&ctx, "---/dev/null");
|
patch_id_add_string(&ctx, "---/dev/null");
|
||||||
patch_id_add_string(&ctx, "+++b/");
|
patch_id_add_string(&ctx, "+++b/");
|
||||||
git_SHA1_Update(&ctx, p->two->path, len2);
|
the_hash_algo->update_fn(&ctx, p->two->path, len2);
|
||||||
} else if (p->two->mode == 0) {
|
} else if (p->two->mode == 0) {
|
||||||
patch_id_add_string(&ctx, "deletedfilemode");
|
patch_id_add_string(&ctx, "deletedfilemode");
|
||||||
patch_id_add_mode(&ctx, p->one->mode);
|
patch_id_add_mode(&ctx, p->one->mode);
|
||||||
patch_id_add_string(&ctx, "---a/");
|
patch_id_add_string(&ctx, "---a/");
|
||||||
git_SHA1_Update(&ctx, p->one->path, len1);
|
the_hash_algo->update_fn(&ctx, p->one->path, len1);
|
||||||
patch_id_add_string(&ctx, "+++/dev/null");
|
patch_id_add_string(&ctx, "+++/dev/null");
|
||||||
} else {
|
} else {
|
||||||
patch_id_add_string(&ctx, "---a/");
|
patch_id_add_string(&ctx, "---a/");
|
||||||
git_SHA1_Update(&ctx, p->one->path, len1);
|
the_hash_algo->update_fn(&ctx, p->one->path, len1);
|
||||||
patch_id_add_string(&ctx, "+++b/");
|
patch_id_add_string(&ctx, "+++b/");
|
||||||
git_SHA1_Update(&ctx, p->two->path, len2);
|
the_hash_algo->update_fn(&ctx, p->two->path, len2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (diff_header_only)
|
if (diff_header_only)
|
||||||
@ -6108,10 +6108,10 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
|
|||||||
|
|
||||||
if (diff_filespec_is_binary(options->repo, p->one) ||
|
if (diff_filespec_is_binary(options->repo, p->one) ||
|
||||||
diff_filespec_is_binary(options->repo, p->two)) {
|
diff_filespec_is_binary(options->repo, p->two)) {
|
||||||
git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid),
|
the_hash_algo->update_fn(&ctx, oid_to_hex(&p->one->oid),
|
||||||
GIT_SHA1_HEXSZ);
|
the_hash_algo->hexsz);
|
||||||
git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid),
|
the_hash_algo->update_fn(&ctx, oid_to_hex(&p->two->oid),
|
||||||
GIT_SHA1_HEXSZ);
|
the_hash_algo->hexsz);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6128,7 +6128,7 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!stable)
|
if (!stable)
|
||||||
git_SHA1_Final(oid->hash, &ctx);
|
the_hash_algo->final_fn(oid->hash, &ctx);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
2
diff.h
2
diff.h
@ -438,7 +438,7 @@ int run_diff_index(struct rev_info *revs, int cached);
|
|||||||
|
|
||||||
int do_diff_cache(const struct object_id *, struct diff_options *);
|
int do_diff_cache(const struct object_id *, struct diff_options *);
|
||||||
int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
|
int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
|
||||||
void flush_one_hunk(struct object_id *, git_SHA_CTX *);
|
void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
|
||||||
|
|
||||||
int diff_result_code(struct diff_options *, int);
|
int diff_result_code(struct diff_options *, int);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user