Merge branch 'jk/combine-diff-binary-etc' into maint

* jk/combine-diff-binary-etc:
  combine-diff: respect textconv attributes
  refactor get_textconv to not require diff_filespec
  combine-diff: handle binary files as binary
  combine-diff: calculate mode_differs earlier
  combine-diff: split header printing into its own function
This commit is contained in:
Junio C Hamano 2011-08-16 11:23:24 -07:00
commit e10e476fb1
5 changed files with 376 additions and 83 deletions

View File

@ -7,6 +7,7 @@
#include "xdiff-interface.h" #include "xdiff-interface.h"
#include "log-tree.h" #include "log-tree.h"
#include "refs.h" #include "refs.h"
#include "userdiff.h"
static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent) static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
{ {
@ -92,7 +93,9 @@ struct sline {
unsigned long *p_lno; unsigned long *p_lno;
}; };
static char *grab_blob(const unsigned char *sha1, unsigned int mode, unsigned long *size) static char *grab_blob(const unsigned char *sha1, unsigned int mode,
unsigned long *size, struct userdiff_driver *textconv,
const char *path)
{ {
char *blob; char *blob;
enum object_type type; enum object_type type;
@ -105,6 +108,11 @@ static char *grab_blob(const unsigned char *sha1, unsigned int mode, unsigned lo
/* deleted blob */ /* deleted blob */
*size = 0; *size = 0;
return xcalloc(1, 1); return xcalloc(1, 1);
} else if (textconv) {
struct diff_filespec *df = alloc_filespec(path);
fill_filespec(df, sha1, mode);
*size = fill_textconv(textconv, df, &blob);
free_filespec(df);
} else { } else {
blob = read_sha1_file(sha1, &type, size); blob = read_sha1_file(sha1, &type, size);
if (type != OBJ_BLOB) if (type != OBJ_BLOB)
@ -204,7 +212,9 @@ static void consume_line(void *state_, char *line, unsigned long len)
static void combine_diff(const unsigned char *parent, unsigned int mode, static void combine_diff(const unsigned char *parent, unsigned int mode,
mmfile_t *result_file, mmfile_t *result_file,
struct sline *sline, unsigned int cnt, int n, struct sline *sline, unsigned int cnt, int n,
int num_parent, int result_deleted) int num_parent, int result_deleted,
struct userdiff_driver *textconv,
const char *path)
{ {
unsigned int p_lno, lno; unsigned int p_lno, lno;
unsigned long nmask = (1UL << n); unsigned long nmask = (1UL << n);
@ -217,7 +227,7 @@ static void combine_diff(const unsigned char *parent, unsigned int mode,
if (result_deleted) if (result_deleted)
return; /* result deleted */ return; /* result deleted */
parent_file.ptr = grab_blob(parent, mode, &sz); parent_file.ptr = grab_blob(parent, mode, &sz, textconv, path);
parent_file.size = sz; parent_file.size = sz;
memset(&xpp, 0, sizeof(xpp)); memset(&xpp, 0, sizeof(xpp));
xpp.flags = 0; xpp.flags = 0;
@ -681,6 +691,82 @@ static void dump_quoted_path(const char *head,
puts(buf.buf); puts(buf.buf);
} }
static void show_combined_header(struct combine_diff_path *elem,
int num_parent,
int dense,
struct rev_info *rev,
int mode_differs,
int show_file_header)
{
struct diff_options *opt = &rev->diffopt;
int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";
int use_color = DIFF_OPT_TST(opt, COLOR_DIFF);
const char *c_meta = diff_get_color(use_color, DIFF_METAINFO);
const char *c_reset = diff_get_color(use_color, DIFF_RESET);
const char *abb;
int added = 0;
int deleted = 0;
int i;
if (rev->loginfo && !rev->no_commit_id)
show_log(rev);
dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
"", elem->path, c_meta, c_reset);
printf("%sindex ", c_meta);
for (i = 0; i < num_parent; i++) {
abb = find_unique_abbrev(elem->parent[i].sha1,
abbrev);
printf("%s%s", i ? "," : "", abb);
}
abb = find_unique_abbrev(elem->sha1, abbrev);
printf("..%s%s\n", abb, c_reset);
if (mode_differs) {
deleted = !elem->mode;
/* We say it was added if nobody had it */
added = !deleted;
for (i = 0; added && i < num_parent; i++)
if (elem->parent[i].status !=
DIFF_STATUS_ADDED)
added = 0;
if (added)
printf("%snew file mode %06o",
c_meta, elem->mode);
else {
if (deleted)
printf("%sdeleted file ", c_meta);
printf("mode ");
for (i = 0; i < num_parent; i++) {
printf("%s%06o", i ? "," : "",
elem->parent[i].mode);
}
if (elem->mode)
printf("..%06o", elem->mode);
}
printf("%s\n", c_reset);
}
if (!show_file_header)
return;
if (added)
dump_quoted_path("--- ", "", "/dev/null",
c_meta, c_reset);
else
dump_quoted_path("--- ", a_prefix, elem->path,
c_meta, c_reset);
if (deleted)
dump_quoted_path("+++ ", "", "/dev/null",
c_meta, c_reset);
else
dump_quoted_path("+++ ", b_prefix, elem->path,
c_meta, c_reset);
}
static void show_patch_diff(struct combine_diff_path *elem, int num_parent, static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
int dense, struct rev_info *rev) int dense, struct rev_info *rev)
{ {
@ -692,17 +778,22 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
int mode_differs = 0; int mode_differs = 0;
int i, show_hunks; int i, show_hunks;
int working_tree_file = is_null_sha1(elem->sha1); int working_tree_file = is_null_sha1(elem->sha1);
int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
const char *a_prefix, *b_prefix;
mmfile_t result_file; mmfile_t result_file;
struct userdiff_driver *userdiff;
struct userdiff_driver *textconv = NULL;
int is_binary;
context = opt->context; context = opt->context;
a_prefix = opt->a_prefix ? opt->a_prefix : "a/"; userdiff = userdiff_find_by_path(elem->path);
b_prefix = opt->b_prefix ? opt->b_prefix : "b/"; if (!userdiff)
userdiff = userdiff_find_by_name("default");
if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV))
textconv = userdiff_get_textconv(userdiff);
/* Read the result of merge first */ /* Read the result of merge first */
if (!working_tree_file) if (!working_tree_file)
result = grab_blob(elem->sha1, elem->mode, &result_size); result = grab_blob(elem->sha1, elem->mode, &result_size,
textconv, elem->path);
else { else {
/* Used by diff-tree to read from the working tree */ /* Used by diff-tree to read from the working tree */
struct stat st; struct stat st;
@ -725,9 +816,16 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
} else if (S_ISDIR(st.st_mode)) { } else if (S_ISDIR(st.st_mode)) {
unsigned char sha1[20]; unsigned char sha1[20];
if (resolve_gitlink_ref(elem->path, "HEAD", sha1) < 0) if (resolve_gitlink_ref(elem->path, "HEAD", sha1) < 0)
result = grab_blob(elem->sha1, elem->mode, &result_size); result = grab_blob(elem->sha1, elem->mode,
&result_size, NULL, NULL);
else else
result = grab_blob(sha1, elem->mode, &result_size); result = grab_blob(sha1, elem->mode,
&result_size, NULL, NULL);
} else if (textconv) {
struct diff_filespec *df = alloc_filespec(elem->path);
fill_filespec(df, null_sha1, st.st_mode);
result_size = fill_textconv(textconv, df, &result);
free_filespec(df);
} else if (0 <= (fd = open(elem->path, O_RDONLY))) { } else if (0 <= (fd = open(elem->path, O_RDONLY))) {
size_t len = xsize_t(st.st_size); size_t len = xsize_t(st.st_size);
ssize_t done; ssize_t done;
@ -777,6 +875,38 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
close(fd); close(fd);
} }
for (i = 0; i < num_parent; i++) {
if (elem->parent[i].mode != elem->mode) {
mode_differs = 1;
break;
}
}
if (textconv)
is_binary = 0;
else if (userdiff->binary != -1)
is_binary = userdiff->binary;
else {
is_binary = buffer_is_binary(result, result_size);
for (i = 0; !is_binary && i < num_parent; i++) {
char *buf;
unsigned long size;
buf = grab_blob(elem->parent[i].sha1,
elem->parent[i].mode,
&size, NULL, NULL);
if (buffer_is_binary(buf, size))
is_binary = 1;
free(buf);
}
}
if (is_binary) {
show_combined_header(elem, num_parent, dense, rev,
mode_differs, 0);
printf("Binary files differ\n");
free(result);
return;
}
for (cnt = 0, cp = result; cp < result + result_size; cp++) { for (cnt = 0, cp = result; cp < result + result_size; cp++) {
if (*cp == '\n') if (*cp == '\n')
cnt++; cnt++;
@ -824,71 +954,15 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
combine_diff(elem->parent[i].sha1, combine_diff(elem->parent[i].sha1,
elem->parent[i].mode, elem->parent[i].mode,
&result_file, sline, &result_file, sline,
cnt, i, num_parent, result_deleted); cnt, i, num_parent, result_deleted,
if (elem->parent[i].mode != elem->mode) textconv, elem->path);
mode_differs = 1;
} }
show_hunks = make_hunks(sline, cnt, num_parent, dense); show_hunks = make_hunks(sline, cnt, num_parent, dense);
if (show_hunks || mode_differs || working_tree_file) { if (show_hunks || mode_differs || working_tree_file) {
const char *abb; show_combined_header(elem, num_parent, dense, rev,
int use_color = DIFF_OPT_TST(opt, COLOR_DIFF); mode_differs, 1);
const char *c_meta = diff_get_color(use_color, DIFF_METAINFO);
const char *c_reset = diff_get_color(use_color, DIFF_RESET);
int added = 0;
int deleted = 0;
if (rev->loginfo && !rev->no_commit_id)
show_log(rev);
dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
"", elem->path, c_meta, c_reset);
printf("%sindex ", c_meta);
for (i = 0; i < num_parent; i++) {
abb = find_unique_abbrev(elem->parent[i].sha1,
abbrev);
printf("%s%s", i ? "," : "", abb);
}
abb = find_unique_abbrev(elem->sha1, abbrev);
printf("..%s%s\n", abb, c_reset);
if (mode_differs) {
deleted = !elem->mode;
/* We say it was added if nobody had it */
added = !deleted;
for (i = 0; added && i < num_parent; i++)
if (elem->parent[i].status !=
DIFF_STATUS_ADDED)
added = 0;
if (added)
printf("%snew file mode %06o",
c_meta, elem->mode);
else {
if (deleted)
printf("%sdeleted file ", c_meta);
printf("mode ");
for (i = 0; i < num_parent; i++) {
printf("%s%06o", i ? "," : "",
elem->parent[i].mode);
}
if (elem->mode)
printf("..%06o", elem->mode);
}
printf("%s\n", c_reset);
}
if (added)
dump_quoted_path("--- ", "", "/dev/null",
c_meta, c_reset);
else
dump_quoted_path("--- ", a_prefix, elem->path,
c_meta, c_reset);
if (deleted)
dump_quoted_path("+++ ", "", "/dev/null",
c_meta, c_reset);
else
dump_quoted_path("+++ ", b_prefix, elem->path,
c_meta, c_reset);
dump_sline(sline, cnt, num_parent, dump_sline(sline, cnt, num_parent,
DIFF_OPT_TST(opt, COLOR_DIFF), result_deleted); DIFF_OPT_TST(opt, COLOR_DIFF), result_deleted);
} }

14
diff.c
View File

@ -1984,19 +1984,7 @@ struct userdiff_driver *get_textconv(struct diff_filespec *one)
return NULL; return NULL;
diff_filespec_load_driver(one); diff_filespec_load_driver(one);
if (!one->driver->textconv) return userdiff_get_textconv(one->driver);
return NULL;
if (one->driver->textconv_want_cache && !one->driver->textconv_cache) {
struct notes_cache *c = xmalloc(sizeof(*c));
struct strbuf name = STRBUF_INIT;
strbuf_addf(&name, "textconv/%s", one->driver->name);
notes_cache_init(c, name.buf, one->driver->textconv);
one->driver->textconv_cache = c;
}
return one->driver;
} }
static void builtin_diff(const char *name_a, static void builtin_diff(const char *name_a,

212
t/t4048-diff-combined-binary.sh Executable file
View File

@ -0,0 +1,212 @@
#!/bin/sh
test_description='combined and merge diff handle binary files and textconv'
. ./test-lib.sh
test_expect_success 'setup binary merge conflict' '
echo oneQ1 | q_to_nul >binary &&
git add binary &&
git commit -m one &&
echo twoQ2 | q_to_nul >binary &&
git commit -a -m two &&
git checkout -b branch-binary HEAD^ &&
echo threeQ3 | q_to_nul >binary &&
git commit -a -m three &&
test_must_fail git merge master &&
echo resolvedQhooray | q_to_nul >binary &&
git commit -a -m resolved
'
cat >expect <<'EOF'
resolved
diff --git a/binary b/binary
index 7ea6ded..9563691 100644
Binary files a/binary and b/binary differ
resolved
diff --git a/binary b/binary
index 6197570..9563691 100644
Binary files a/binary and b/binary differ
EOF
test_expect_success 'diff -m indicates binary-ness' '
git show --format=%s -m >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
resolved
diff --combined binary
index 7ea6ded,6197570..9563691
Binary files differ
EOF
test_expect_success 'diff -c indicates binary-ness' '
git show --format=%s -c >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
resolved
diff --cc binary
index 7ea6ded,6197570..9563691
Binary files differ
EOF
test_expect_success 'diff --cc indicates binary-ness' '
git show --format=%s --cc >actual &&
test_cmp expect actual
'
test_expect_success 'setup non-binary with binary attribute' '
git checkout master &&
test_commit one text &&
test_commit two text &&
git checkout -b branch-text HEAD^ &&
test_commit three text &&
test_must_fail git merge master &&
test_commit resolved text &&
echo text -diff >.gitattributes
'
cat >expect <<'EOF'
resolved
diff --git a/text b/text
index 2bdf67a..2ab19ae 100644
Binary files a/text and b/text differ
resolved
diff --git a/text b/text
index f719efd..2ab19ae 100644
Binary files a/text and b/text differ
EOF
test_expect_success 'diff -m respects binary attribute' '
git show --format=%s -m >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
resolved
diff --combined text
index 2bdf67a,f719efd..2ab19ae
Binary files differ
EOF
test_expect_success 'diff -c respects binary attribute' '
git show --format=%s -c >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
resolved
diff --cc text
index 2bdf67a,f719efd..2ab19ae
Binary files differ
EOF
test_expect_success 'diff --cc respects binary attribute' '
git show --format=%s --cc >actual &&
test_cmp expect actual
'
test_expect_success 'setup textconv attribute' '
echo "text diff=upcase" >.gitattributes &&
git config diff.upcase.textconv "tr a-z A-Z <"
'
cat >expect <<'EOF'
resolved
diff --git a/text b/text
index 2bdf67a..2ab19ae 100644
--- a/text
+++ b/text
@@ -1 +1 @@
-THREE
+RESOLVED
resolved
diff --git a/text b/text
index f719efd..2ab19ae 100644
--- a/text
+++ b/text
@@ -1 +1 @@
-TWO
+RESOLVED
EOF
test_expect_success 'diff -m respects textconv attribute' '
git show --format=%s -m >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
resolved
diff --combined text
index 2bdf67a,f719efd..2ab19ae
--- a/text
+++ b/text
@@@ -1,1 -1,1 +1,1 @@@
- THREE
-TWO
++RESOLVED
EOF
test_expect_success 'diff -c respects textconv attribute' '
git show --format=%s -c >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
resolved
diff --cc text
index 2bdf67a,f719efd..2ab19ae
--- a/text
+++ b/text
@@@ -1,1 -1,1 +1,1 @@@
- THREE
-TWO
++RESOLVED
EOF
test_expect_success 'diff --cc respects textconv attribute' '
git show --format=%s --cc >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
diff --combined text
index 2bdf67a,f719efd..2ab19ae
--- a/text
+++ b/text
@@@ -1,1 -1,1 +1,1 @@@
- three
-two
++resolved
EOF
test_expect_success 'diff-tree plumbing does not respect textconv' '
git diff-tree HEAD -c -p >full &&
tail -n +2 full >actual &&
test_cmp expect actual
'
cat >expect <<'EOF'
diff --cc text
index 2bdf67a,f719efd..0000000
--- a/text
+++ b/text
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
+THREE
++=======
+ TWO
++>>>>>>> MASTER
EOF
test_expect_success 'diff --cc respects textconv on worktree file' '
git reset --hard HEAD^ &&
test_must_fail git merge master &&
git diff >actual &&
test_cmp expect actual
'
test_done

View File

@ -281,3 +281,20 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)
return NULL; return NULL;
return userdiff_find_by_name(check.value); return userdiff_find_by_name(check.value);
} }
struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver)
{
if (!driver->textconv)
return NULL;
if (driver->textconv_want_cache && !driver->textconv_cache) {
struct notes_cache *c = xmalloc(sizeof(*c));
struct strbuf name = STRBUF_INIT;
strbuf_addf(&name, "textconv/%s", driver->name);
notes_cache_init(c, name.buf, driver->textconv);
driver->textconv_cache = c;
}
return driver;
}

View File

@ -23,4 +23,6 @@ int userdiff_config(const char *k, const char *v);
struct userdiff_driver *userdiff_find_by_name(const char *name); struct userdiff_driver *userdiff_find_by_name(const char *name);
struct userdiff_driver *userdiff_find_by_path(const char *path); struct userdiff_driver *userdiff_find_by_path(const char *path);
struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);
#endif /* USERDIFF */ #endif /* USERDIFF */