@matheusbsbs / matheus-bagliano / commits / 0fe7c1de16
Fork 0

built-in diff: assorted updates.

"git diff(n)" without --base, --ours, etc. defaults to --cc, which usually is the same as -p unless you are in the middle of a conflicted merge, just like the shell script version. "git diff(n) blobA blobB path" complains and dies. "git diff(n) tree0 tree1 tree2...treeN" does combined diff that shows a merge of tree1..treeN to result in tree0. Giving "-c" option to any command that defaults to "--cc" turns off dense-combined flag. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Apr 29, 2006 at 01:24 UTC 0fe7c1de16f71312e6adac4b85bddf0d62a47168
4 files changed +79 -26
builtin-diff.c
+46 -9
@@ -47,13 +47,17 @@ static int builtin_diff_files(struct rev_info *revs,
47 }
48 /*
49 * Make sure there are NO revision (i.e. pending object) parameter,
50 - * rev.max_count is reasonable (0 <= n <= 3),
51 - * there is no other revision filtering parameters.
50 + * specified rev.max_count is reasonable (0 <= n <= 3), and
51 + * there is no other revision filtering parameter.
52 */
53 if (revs->pending_objects ||
54 revs->min_age != -1 ||
55 - revs->max_age != -1)
55 + revs->max_age != -1 ||
56 + 3 < revs->max_count)
57 usage(builtin_diff_usage);
58 + if (revs->max_count < 0 &&
59 + (revs->diffopt.output_format == DIFF_FORMAT_PATCH))
60 + revs->combine_merges = revs->dense_combined_merges = 1;
61 /*
62 * Backward compatibility wart - "diff-files -s" used to
63 * defeat the common diff option "-s" which asked for
@@ -178,9 +182,6 @@ static int builtin_diff_tree(struct rev_info *revs,
182 int argc, const char **argv,
183 struct object_list *ent)
184 {
181 - /* We saw two trees, ent[0] and ent[1].
182 - * unless ent[0] is unintesting, they are swapped
183 - */
185 const unsigned char *(sha1[2]);
186 int swap = 1;
187 while (1 < argc) {
@@ -191,6 +192,10 @@ static int builtin_diff_tree(struct rev_info *revs,
192 usage(builtin_diff_usage);
193 argv++; argc--;
194 }
195 +
196 + /* We saw two trees, ent[0] and ent[1].
197 + * unless ent[0] is unintesting, they are swapped
198 + */
199 if (ent[0].item->flags & UNINTERESTING)
200 swap = 0;
201 sha1[swap] = ent[0].item->sha1;
@@ -200,6 +205,33 @@ static int builtin_diff_tree(struct rev_info *revs,
205 return 0;
206 }
207
208 +static int builtin_diff_combined(struct rev_info *revs,
209 + int argc, const char **argv,
210 + struct object_list *ent,
211 + int ents)
212 +{
213 + const unsigned char (*parent)[20];
214 + int i;
215 +
216 + while (1 < argc) {
217 + const char *arg = argv[1];
218 + if (!strcmp(arg, "--raw"))
219 + revs->diffopt.output_format = DIFF_FORMAT_RAW;
220 + else
221 + usage(builtin_diff_usage);
222 + argv++; argc--;
223 + }
224 + if (!revs->dense_combined_merges && !revs->combine_merges)
225 + revs->dense_combined_merges = revs->combine_merges = 1;
226 + parent = xmalloc(ents * sizeof(*parent));
227 + /* Again, the revs are all reverse */
228 + for (i = 0; i < ents; i++)
229 + memcpy(parent + i, ent[ents - 1 - i].item->sha1, 20);
230 + diff_tree_combined(parent[0], parent + 1, ents - 1,
231 + revs->dense_combined_merges, revs);
232 + return 0;
233 +}
234 +
235 static void add_head(struct rev_info *revs)
236 {
237 unsigned char sha1[20];
@@ -215,7 +247,7 @@ static void add_head(struct rev_info *revs)
247 int cmd_diff(int argc, const char **argv, char **envp)
248 {
249 struct rev_info rev;
218 - struct object_list *list, ent[2];
250 + struct object_list *list, ent[100];
251 int ents = 0, blobs = 0, paths = 0;
252 const char *path = NULL;
253 struct blobinfo blob[2];
@@ -273,8 +305,9 @@ int cmd_diff(int argc, const char **argv, char **envp)
305 if (!strcmp(obj->type, commit_type))
306 obj = &((struct commit *)obj)->tree->object;
307 if (!strcmp(obj->type, tree_type)) {
276 - if (2 <= ents)
277 - die("more than two trees given: '%s'", name);
308 + if (ARRAY_SIZE(ent) <= ents)
309 + die("more than %d trees given: '%s'",
310 + ARRAY_SIZE(ent), name);
311 obj->flags |= flags;
312 ent[ents].item = obj;
313 ent[ents].name = name;
@@ -316,6 +349,8 @@ int cmd_diff(int argc, const char **argv, char **envp)
349 return builtin_diff_b_f(&rev, argc, argv, blob, path);
350 break;
351 case 2:
352 + if (paths)
353 + usage(builtin_diff_usage);
354 return builtin_diff_blobs(&rev, argc, argv, blob);
355 break;
356 default:
@@ -328,5 +363,7 @@ int cmd_diff(int argc, const char **argv, char **envp)
363 return builtin_diff_index(&rev, argc, argv);
364 else if (ents == 2)
365 return builtin_diff_tree(&rev, argc, argv, ent);
366 + else
367 + return builtin_diff_combined(&rev, argc, argv, ent, ents);
368 usage(builtin_diff_usage);
369 }
combine-diff.c
+30 -17
@@ -831,15 +831,16 @@ void show_combined_diff(struct combine_diff_path *p,
831 }
832 }
833
834 -void diff_tree_combined_merge(const unsigned char *sha1,
835 - int dense, struct rev_info *rev)
834 +void diff_tree_combined(const unsigned char *sha1,
835 + const unsigned char parent[][20],
836 + int num_parent,
837 + int dense,
838 + struct rev_info *rev)
839 {
840 struct diff_options *opt = &rev->diffopt;
838 - struct commit *commit = lookup_commit(sha1);
841 struct diff_options diffopts;
840 - struct commit_list *parents;
842 struct combine_diff_path *p, *paths = NULL;
842 - int num_parent, i, num_paths;
843 + int i, num_paths;
844 int do_diffstat;
845
846 do_diffstat = (opt->output_format == DIFF_FORMAT_DIFFSTAT ||
@@ -849,17 +850,8 @@ void diff_tree_combined_merge(const unsigned char *sha1,
850 diffopts.with_stat = 0;
851 diffopts.recursive = 1;
852
852 - /* count parents */
853 - for (parents = commit->parents, num_parent = 0;
854 - parents;
855 - parents = parents->next, num_parent++)
856 - ; /* nothing */
857 -
853 /* find set of paths that everybody touches */
859 - for (parents = commit->parents, i = 0;
860 - parents;
861 - parents = parents->next, i++) {
862 - struct commit *parent = parents->item;
854 + for (i = 0; i < num_parent; i++) {
855 /* show stat against the first parent even
856 * when doing combined diff.
857 */
@@ -867,8 +859,7 @@ void diff_tree_combined_merge(const unsigned char *sha1,
859 diffopts.output_format = DIFF_FORMAT_DIFFSTAT;
860 else
861 diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
870 - diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
871 - &diffopts);
862 + diff_tree_sha1(parent[i], sha1, "", &diffopts);
863 diffcore_std(&diffopts);
864 paths = intersect_paths(paths, i, num_parent);
865
@@ -907,3 +898,25 @@ void diff_tree_combined_merge(const unsigned char *sha1,
898 free(tmp);
899 }
900 }
901 +
902 +void diff_tree_combined_merge(const unsigned char *sha1,
903 + int dense, struct rev_info *rev)
904 +{
905 + int num_parent;
906 + const unsigned char (*parent)[20];
907 + struct commit *commit = lookup_commit(sha1);
908 + struct commit_list *parents;
909 +
910 + /* count parents */
911 + for (parents = commit->parents, num_parent = 0;
912 + parents;
913 + parents = parents->next, num_parent++)
914 + ; /* nothing */
915 +
916 + parent = xmalloc(num_parent * sizeof(*parent));
917 + for (parents = commit->parents, num_parent = 0;
918 + parents;
919 + parents = parents->next, num_parent++)
920 + memcpy(parent + num_parent, parents->item->object.sha1, 20);
921 + diff_tree_combined(sha1, parent, num_parent, dense, rev);
922 +}
diff.h
+2
@@ -75,6 +75,8 @@ struct combine_diff_path {
75 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
76 int dense, struct rev_info *);
77
78 +extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
79 +
80 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
81
82 extern void diff_addremove(struct diff_options *,
revision.c
+1
@@ -664,6 +664,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
664 }
665 if (!strcmp(arg, "-c")) {
666 revs->diff = 1;
667 + revs->dense_combined_merges = 0;
668 revs->combine_merges = 1;
669 continue;
670 }