Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "run-command.h" |
| 3 | #include "xdiff-interface.h" |
Junio C Hamano | 15b4f7a | 2010-01-16 21:45:40 -0800 | [diff] [blame] | 4 | #include "ll-merge.h" |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 5 | #include "blob.h" |
Junio C Hamano | fa2364e | 2012-12-06 15:08:01 -0800 | [diff] [blame] | 6 | #include "merge-blobs.h" |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 7 | |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 8 | static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) |
| 9 | { |
| 10 | void *buf; |
| 11 | unsigned long size; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 12 | enum object_type type; |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 13 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 14 | buf = read_sha1_file(obj->object.sha1, &type, &size); |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 15 | if (!buf) |
| 16 | return -1; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 17 | if (type != OBJ_BLOB) |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 18 | return -1; |
| 19 | f->ptr = buf; |
| 20 | f->size = size; |
| 21 | return 0; |
| 22 | } |
| 23 | |
| 24 | static void free_mmfile(mmfile_t *f) |
| 25 | { |
| 26 | free(f->ptr); |
| 27 | } |
| 28 | |
Junio C Hamano | 15b4f7a | 2010-01-16 21:45:40 -0800 | [diff] [blame] | 29 | static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size) |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 30 | { |
Johannes Schindelin | e2b7008 | 2006-12-13 00:01:41 +0100 | [diff] [blame] | 31 | int merge_status; |
Junio C Hamano | 15b4f7a | 2010-01-16 21:45:40 -0800 | [diff] [blame] | 32 | mmbuffer_t res; |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 33 | |
Jonathan Nieder | e44b385 | 2010-03-20 19:40:53 -0500 | [diff] [blame] | 34 | /* |
| 35 | * This function is only used by cmd_merge_tree, which |
| 36 | * does not respect the merge.conflictstyle option. |
| 37 | * There is no need to worry about a label for the |
| 38 | * common ancestor. |
| 39 | */ |
Jonathan Nieder | f01de62 | 2010-03-20 19:38:58 -0500 | [diff] [blame] | 40 | merge_status = ll_merge(&res, path, base, NULL, |
Jonathan Nieder | 712516b | 2010-08-26 00:49:53 -0500 | [diff] [blame] | 41 | our, ".our", their, ".their", NULL); |
Johannes Schindelin | e2b7008 | 2006-12-13 00:01:41 +0100 | [diff] [blame] | 42 | if (merge_status < 0) |
| 43 | return NULL; |
| 44 | |
| 45 | *size = res.size; |
| 46 | return res.ptr; |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 47 | } |
| 48 | |
| 49 | static int common_outf(void *priv_, mmbuffer_t *mb, int nbuf) |
| 50 | { |
| 51 | int i; |
| 52 | mmfile_t *dst = priv_; |
| 53 | |
| 54 | for (i = 0; i < nbuf; i++) { |
| 55 | memcpy(dst->ptr + dst->size, mb[i].ptr, mb[i].size); |
| 56 | dst->size += mb[i].size; |
| 57 | } |
| 58 | return 0; |
| 59 | } |
| 60 | |
| 61 | static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2) |
| 62 | { |
| 63 | unsigned long size = f1->size < f2->size ? f1->size : f2->size; |
| 64 | void *ptr = xmalloc(size); |
| 65 | xpparam_t xpp; |
| 66 | xdemitconf_t xecfg; |
| 67 | xdemitcb_t ecb; |
| 68 | |
Brian Downing | 9ccd0a8 | 2008-10-25 15:30:37 +0200 | [diff] [blame] | 69 | memset(&xpp, 0, sizeof(xpp)); |
René Scharfe | 582aa00 | 2010-05-02 15:04:41 +0200 | [diff] [blame] | 70 | xpp.flags = 0; |
Johannes Schindelin | 30b2501 | 2007-07-04 19:05:46 +0100 | [diff] [blame] | 71 | memset(&xecfg, 0, sizeof(xecfg)); |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 72 | xecfg.ctxlen = 3; |
| 73 | xecfg.flags = XDL_EMIT_COMMON; |
| 74 | ecb.outf = common_outf; |
| 75 | |
| 76 | res->ptr = ptr; |
| 77 | res->size = 0; |
| 78 | |
| 79 | ecb.priv = res; |
Junio C Hamano | c279d7e | 2007-12-13 13:25:07 -0800 | [diff] [blame] | 80 | return xdi_diff(f1, f2, &xpp, &xecfg, &ecb); |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 81 | } |
| 82 | |
Junio C Hamano | fa2364e | 2012-12-06 15:08:01 -0800 | [diff] [blame] | 83 | void *merge_blobs(const char *path, struct blob *base, struct blob *our, struct blob *their, unsigned long *size) |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 84 | { |
| 85 | void *res = NULL; |
| 86 | mmfile_t f1, f2, common; |
| 87 | |
| 88 | /* |
| 89 | * Removed in either branch? |
| 90 | * |
| 91 | * NOTE! This depends on the caller having done the |
| 92 | * proper warning about removing a file that got |
| 93 | * modified in the other branch! |
| 94 | */ |
| 95 | if (!our || !their) { |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 96 | enum object_type type; |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 97 | if (base) |
| 98 | return NULL; |
| 99 | if (!our) |
| 100 | our = their; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 101 | return read_sha1_file(our->object.sha1, &type, size); |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 102 | } |
| 103 | |
| 104 | if (fill_mmfile_blob(&f1, our) < 0) |
| 105 | goto out_no_mmfile; |
| 106 | if (fill_mmfile_blob(&f2, their) < 0) |
| 107 | goto out_free_f1; |
| 108 | |
| 109 | if (base) { |
| 110 | if (fill_mmfile_blob(&common, base) < 0) |
| 111 | goto out_free_f2_f1; |
| 112 | } else { |
| 113 | if (generate_common_file(&common, &f1, &f2) < 0) |
| 114 | goto out_free_f2_f1; |
| 115 | } |
Junio C Hamano | 15b4f7a | 2010-01-16 21:45:40 -0800 | [diff] [blame] | 116 | res = three_way_filemerge(path, &common, &f1, &f2, size); |
Linus Torvalds | 0c79938 | 2006-06-28 22:06:36 -0700 | [diff] [blame] | 117 | free_mmfile(&common); |
| 118 | out_free_f2_f1: |
| 119 | free_mmfile(&f2); |
| 120 | out_free_f1: |
| 121 | free_mmfile(&f1); |
| 122 | out_no_mmfile: |
| 123 | return res; |
| 124 | } |