Commit 4e22badc0de082b8d0e6cbd19be4db4f15b86718
2017-11-30T05:34:24
implement diff_added_blob
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 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
diff --git a/lib/diff.c b/lib/diff.c
index 2ae156f..08c283d 100644
--- a/lib/diff.c
+++ b/lib/diff.c
@@ -54,32 +54,42 @@ got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
struct got_diff_state ds;
struct got_diff_args args;
const struct got_error *err = NULL;
- FILE *f1, *f2;
+ FILE *f1 = NULL, *f2 = NULL;
char hex1[SHA1_DIGEST_STRING_LENGTH];
char hex2[SHA1_DIGEST_STRING_LENGTH];
size_t len, hdrlen;
- int res;
-
- f1 = opentemp();
- if (f1 == NULL)
- return got_error(GOT_ERR_FILE_OPEN);
-
- f2 = opentemp();
- if (f2 == NULL) {
- fclose(f1);
- return got_error(GOT_ERR_FILE_OPEN);
+ int res, flags = 0;
+
+ if (blob1) {
+ f1 = opentemp();
+ if (f1 == NULL)
+ return got_error(GOT_ERR_FILE_OPEN);
+ } else
+ flags |= D_EMPTY1;
+
+ if (blob2) {
+ f2 = opentemp();
+ if (f2 == NULL) {
+ fclose(f1);
+ return got_error(GOT_ERR_FILE_OPEN);
+ }
+ } else
+ flags |= D_EMPTY2;
+
+ if (blob1 == NULL) {
+ f1 = NULL;
+ } else {
+ hdrlen = blob1->hdrlen;
+ do {
+ err = got_object_blob_read_block(blob1, &len);
+ if (err)
+ goto done;
+ /* Skip blob object header first time around. */
+ fwrite(blob1->zb.outbuf + hdrlen, len - hdrlen, 1, f1);
+ hdrlen = 0;
+ } while (len != 0);
}
- hdrlen = blob1->hdrlen;
- do {
- err = got_object_blob_read_block(blob1, &len);
- if (err)
- goto done;
- /* Skip blob object header first time around. */
- fwrite(blob1->zb.outbuf + hdrlen, len - hdrlen, 1, f1);
- hdrlen = 0;
- } while (len != 0);
-
hdrlen = blob2->hdrlen;
do {
err = got_object_blob_read_block(blob2, &len);
@@ -112,7 +122,7 @@ got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
args.label[1] = label2 ?
label2 : got_object_id_str(&blob2->id, hex2, sizeof(hex2));
- err = got_diffreg(&res, f1, f2, 0, &args, &ds);
+ err = got_diffreg(&res, f1, f2, flags, &args, &ds);
done:
fclose(f1);
fclose(f2);
@@ -134,9 +144,20 @@ same_id(struct got_object_id *id1, struct got_object_id *id2)
}
static const struct got_error *
-diff_added_blob(struct got_object_id *id)
+diff_added_blob(struct got_object_id *id, struct got_repository *repo)
{
- return NULL;
+ const struct got_error *err;
+ struct got_blob_object *blob;
+ struct got_object *obj;
+
+ err = got_object_open(&obj, repo, id);
+ if (err)
+ return err;
+ err = got_object_blob_open(&blob, repo, obj, 512);
+ if (err != NULL)
+ return err;
+
+ return got_diff_blob(NULL, blob, NULL, NULL, stdout);
}
static const struct got_error *
@@ -202,7 +223,8 @@ diff_entry_old_new(struct got_tree_entry *te1, struct got_tree_object *tree2)
}
static const struct got_error *
-diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1)
+diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1,
+ struct got_repository *repo)
{
const struct got_error *err;
struct got_tree_entry *te1;
@@ -215,7 +237,7 @@ diff_entry_new_old(struct got_tree_entry *te2, struct got_tree_object *tree1)
if (S_ISDIR(te2->mode))
return diff_added_tree(&te2->id);
- return diff_added_blob(&te2->id);
+ return diff_added_blob(&te2->id, repo);
}
const struct got_error *
@@ -240,7 +262,7 @@ got_diff_tree(struct got_tree_object *tree1, struct got_tree_object *tree2,
}
if (te2) {
- err = diff_entry_new_old(te2, tree1);
+ err = diff_entry_new_old(te2, tree1, repo);
if (err)
break;
}