kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

patch-ids: add flag to create the diff patch id using header only data 

This will allow a diff patch id to be created using only the header data
so that the contents of the file will not have to be loaded.

Signed-off-by: Kevin Willford <kcwillford@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Kevin Willford 2016-07-29 12:19:19 -04:00 committed by Junio C Hamano
parent 683f17ec44
commit 3e8e32c32e
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
diff.c
View File

@ -4449,7 +4449,7 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
} }


/* returns 0 upon success, and writes result into sha1 */ /* returns 0 upon success, and writes result into sha1 */
static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1) static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
{ {
struct diff_queue_struct *q = &diff_queued_diff; struct diff_queue_struct *q = &diff_queued_diff;
int i; int i;
@ -4484,9 +4484,6 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)


diff_fill_sha1_info(p->one); diff_fill_sha1_info(p->one);
diff_fill_sha1_info(p->two); diff_fill_sha1_info(p->two);
if (fill_mmfile(&mf1, p->one) < 0 ||
fill_mmfile(&mf2, p->two) < 0)
return error("unable to read files to diff");


len1 = remove_space(p->one->path, strlen(p->one->path)); len1 = remove_space(p->one->path, strlen(p->one->path));
len2 = remove_space(p->two->path, strlen(p->two->path)); len2 = remove_space(p->two->path, strlen(p->two->path));
@ -4521,6 +4518,13 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
len2, p->two->path); len2, p->two->path);
git_SHA1_Update(&ctx, buffer, len1); git_SHA1_Update(&ctx, buffer, len1);


if (diff_header_only)
continue;

if (fill_mmfile(&mf1, p->one) < 0 ||
fill_mmfile(&mf2, p->two) < 0)
return error("unable to read files to diff");

if (diff_filespec_is_binary(p->one) || if (diff_filespec_is_binary(p->one) ||
diff_filespec_is_binary(p->two)) { diff_filespec_is_binary(p->two)) {
git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40); git_SHA1_Update(&ctx, sha1_to_hex(p->one->sha1), 40);
@ -4541,11 +4545,11 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)
return 0; return 0;
} }


int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1) int diff_flush_patch_id(struct diff_options *options, unsigned char *sha1, int diff_header_only)
{ {
struct diff_queue_struct *q = &diff_queued_diff; struct diff_queue_struct *q = &diff_queued_diff;
int i; int i;
int result = diff_get_patch_id(options, sha1); int result = diff_get_patch_id(options, sha1, diff_header_only);


for (i = 0; i < q->nr; i++) for (i = 0; i < q->nr; i++)
diff_free_filepair(q->queue[i]); diff_free_filepair(q->queue[i]);

2
diff.h
View File

@ -342,7 +342,7 @@ extern int run_diff_files(struct rev_info *revs, unsigned int option);
extern int run_diff_index(struct rev_info *revs, int cached); extern int run_diff_index(struct rev_info *revs, int cached);


extern int do_diff_cache(const unsigned char *, struct diff_options *); extern int do_diff_cache(const unsigned char *, struct diff_options *);
extern int diff_flush_patch_id(struct diff_options *, unsigned char *); extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int);


extern int diff_result_code(struct diff_options *, int); extern int diff_result_code(struct diff_options *, int);



2
patch-ids.c
View File

@ -13,7 +13,7 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
else else
diff_root_tree_sha1(commit->object.oid.hash, "", options); diff_root_tree_sha1(commit->object.oid.hash, "", options);
diffcore_std(options); diffcore_std(options);
return diff_flush_patch_id(options, sha1); return diff_flush_patch_id(options, sha1, 0);
} }


static int patch_id_cmp(struct patch_id *a, static int patch_id_cmp(struct patch_id *a,