diff --git a/combine-diff.c b/combine-diff.c
index 210ffcbce38bf1155c6e9b054e0950ee07c979fe..6a9f3683c51879ab147f9a3f37c38fc1e8a46b47 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
{
if (diff_unmodified_pair(p))
return 1;
- if (!S_ISREG(p->one->mode) || !S_ISREG(p->two->mode))
- return 1;
return 0;
}
@@ -28,15 +26,19 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
continue;
path = q->queue[i]->two->path;
len = strlen(path);
-
- p = xmalloc(sizeof(*p) + len + 1 + num_parent * 20);
- p->path = (char*) &(p->parent_sha1[num_parent][0]);
+ p = xmalloc(combine_diff_path_size(num_parent, len));
+ p->path = (char*) &(p->parent[num_parent]);
memcpy(p->path, path, len);
p->path[len] = 0;
p->len = len;
p->next = NULL;
+ memset(p->parent, 0,
+ sizeof(p->parent[0]) * num_parent);
+
memcpy(p->sha1, q->queue[i]->two->sha1, 20);
- memcpy(p->parent_sha1[n], q->queue[i]->one->sha1, 20);
+ p->mode = q->queue[i]->two->mode;
+ memcpy(p->parent[n].sha1, q->queue[i]->one->sha1, 20);
+ p->parent[n].mode = q->queue[i]->one->mode;
*tail = p;
tail = &p->next;
}
len = strlen(path);
if (len == p->len && !memcmp(path, p->path, len)) {
found = 1;
- memcpy(p->parent_sha1[n],
+ memcpy(p->parent[n].sha1,
q->queue[i]->one->sha1, 20);
+ p->parent[n].mode = q->queue[i]->one->mode;
break;
}
}
unsigned long nmask = (1UL << n);
struct sline *lost_bucket = NULL;
+ if (!cnt)
+ return; /* result deleted */
+
write_temp_blob(parent_tmp, parent);
sprintf(cmd, "diff --unified=0 -La/x -Lb/x '%s' '%s'",
parent_tmp, ourtmp);
int i;
unsigned long lno = 0;
+ if (!cnt)
+ return; /* result deleted */
+
while (1) {
struct sline *sl = &sline[lno];
int hunk_end;
sline->flag |= imask;
sline++;
}
+ /* the overall size of the file (sline[cnt]) */
+ sline->p_lno[i] = sline->p_lno[j];
}
int show_combined_diff(struct combine_diff_path *elem, int num_parent,
- int dense, const char *header, int show_empty)
+ int dense, const char *header)
{
unsigned long size, cnt, lno;
char *result, *cp, *ep;
struct sline *sline; /* survived lines */
+ int mode_differs = 0;
int i, show_hunks, shown_header = 0;
char ourtmp_buf[TMPPATHLEN];
char *ourtmp = ourtmp_buf;
write_to_temp_file(ourtmp, result, size);
}
else {
+ /* Used by diff-tree to read from the working tree */
struct stat st;
int fd;
ourtmp = elem->path;
if (*cp == '\n')
cnt++;
}
- if (result[size-1] != '\n')
+ if (size && result[size-1] != '\n')
cnt++; /* incomplete line */
sline = xcalloc(cnt+1, sizeof(*sline));
ep = result;
sline[0].bol = result;
+ for (lno = 0; lno <= cnt; lno++) {
+ sline[lno].lost_tail = &sline[lno].lost_head;
+ sline[lno].flag = 0;
+ }
for (lno = 0, cp = result; cp - result < size; cp++) {
if (*cp == '\n') {
- sline[lno].lost_tail = &sline[lno].lost_head;
sline[lno].len = cp - sline[lno].bol;
- sline[lno].flag = 0;
lno++;
if (lno < cnt)
sline[lno].bol = cp + 1;
}
}
- if (result[size-1] != '\n') {
- sline[cnt-1].lost_tail = &sline[cnt-1].lost_head;
+ if (size && result[size-1] != '\n')
sline[cnt-1].len = size - (sline[cnt-1].bol - result);
- sline[cnt-1].flag = 0;
- }
sline[0].p_lno = xcalloc((cnt+1) * num_parent, sizeof(unsigned long));
for (lno = 0; lno < cnt; lno++)
for (i = 0; i < num_parent; i++) {
int j;
for (j = 0; j < i; j++) {
- if (!memcmp(elem->parent_sha1[i],
- elem->parent_sha1[j], 20)) {
+ if (!memcmp(elem->parent[i].sha1,
+ elem->parent[j].sha1, 20)) {
reuse_combine_diff(sline, cnt, i, j);
break;
}
}
if (i <= j)
- combine_diff(elem->parent_sha1[i], ourtmp, sline,
+ combine_diff(elem->parent[i].sha1, ourtmp, sline,
cnt, i, num_parent);
+ if (elem->parent[i].mode != elem->mode)
+ mode_differs = 1;
}
show_hunks = make_hunks(sline, cnt, num_parent, dense);
- if (show_hunks) {
+ if (show_hunks || mode_differs) {
+ const char *abb;
+ char null_abb[DEFAULT_ABBREV + 1];
+
+ memset(null_abb, '0', DEFAULT_ABBREV);
+ null_abb[DEFAULT_ABBREV] = 0;
if (header) {
shown_header++;
puts(header);
putchar('\n');
printf("index ");
for (i = 0; i < num_parent; i++) {
- printf("%s%s",
- i ? "," : "",
- find_unique_abbrev(elem->parent_sha1[i],
- DEFAULT_ABBREV));
+ if (elem->parent[i].mode != elem->mode)
+ mode_differs = 1;
+ if (memcmp(elem->parent[i].sha1, null_sha1, 20))
+ abb = find_unique_abbrev(elem->parent[i].sha1,
+ DEFAULT_ABBREV);
+ else
+ abb = null_abb;
+ printf("%s%s", i ? "," : "", abb);
+ }
+ if (memcmp(elem->sha1, null_sha1, 20))
+ abb = find_unique_abbrev(elem->sha1, DEFAULT_ABBREV);
+ else
+ abb = null_abb;
+ printf("..%s\n", abb);
+
+ if (mode_differs) {
+ printf("mode ");
+ for (i = 0; i < num_parent; i++) {
+ printf("%s%06o", i ? "," : "",
+ elem->parent[i].mode);
+ }
+ printf("..%06o\n", elem->mode);
}
- printf("..%s\n",
- find_unique_abbrev(elem->sha1, DEFAULT_ABBREV));
dump_sline(sline, cnt, num_parent);
}
if (ourtmp == ourtmp_buf)
}
int diff_tree_combined_merge(const unsigned char *sha1,
- const char *header,
- int show_empty_merge, int dense)
+ const char *header, int dense)
{
struct commit *commit = lookup_commit(sha1);
struct diff_options diffopts;
if (p->len)
num_paths++;
}
- if (num_paths || show_empty_merge) {
+ if (num_paths) {
for (p = paths; p; p = p->next) {
if (!p->len)
continue;
- if (show_combined_diff(p, num_parent, dense, header,
- show_empty_merge))
+ if (show_combined_diff(p, num_parent, dense, header))
header = NULL;
}
}