summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-10-05 21:43:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-18 15:02:26 (GMT)
commit122aa6f9c000d0d286898e2eb7b3504ac6cb9ebd (patch)
tree723567bb21f454514fc807deeb685de00ff6dba2 /diff.c
parentbe58e70dbadf3cb3f4aa5829d513d886ae8bc460 (diff)
downloadgit-122aa6f9c000d0d286898e2eb7b3504ac6cb9ebd.zip
git-122aa6f9c000d0d286898e2eb7b3504ac6cb9ebd.tar.gz
git-122aa6f9c000d0d286898e2eb7b3504ac6cb9ebd.tar.bz2
diff: introduce diff.<driver>.binary
The "diff" gitattribute is somewhat overloaded right now. It can say one of three things: 1. this file is definitely binary, or definitely not (i.e., diff or !diff) 2. this file should use an external diff engine (i.e., diff=foo, diff.foo.command = custom-script) 3. this file should use particular funcname patterns (i.e., diff=foo, diff.foo.(x?)funcname = some-regex) Most of the time, there is no conflict between these uses, since using one implies that the other is irrelevant (e.g., an external diff engine will decide for itself whether the file is binary). However, there is at least one conflicting situation: there is no way to say "use the regular rules to determine whether this file is binary, but if we do diff it textually, use this funcname pattern." That is, currently setting diff=foo indicates that the file is definitely text. This patch introduces a "binary" config option for a diff driver, so that one can explicitly set diff.foo.binary. We default this value to "don't know". That is, setting a diff attribute to "foo" and using "diff.foo.funcname" will have no effect on the binaryness of a file. To get the current behavior, one can set diff.foo.binary to true. This patch also has one additional advantage: it cleans up the interface to the userdiff code a bit. Before, calling code had to know more about whether attributes were false, true, or unset to determine binaryness. Now that binaryness is a property of a driver, we can represent these situations just by passing back a driver struct. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c52
1 files changed, 22 insertions, 30 deletions
diff --git a/diff.c b/diff.c
index d50355e..dabd7f5 100644
--- a/diff.c
+++ b/diff.c
@@ -1268,46 +1268,37 @@ static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two)
emit_binary_diff_body(file, two, one);
}
-static void diff_filespec_check_attr(struct diff_filespec *one)
+void diff_filespec_load_driver(struct diff_filespec *one)
{
- struct userdiff_driver *drv;
- int check_from_data = 0;
-
- if (one->checked_attr)
- return;
-
- drv = userdiff_find_by_path(one->path);
- one->is_binary = 0;
-
- /* binaryness */
- if (drv == USERDIFF_ATTR_TRUE)
- ;
- else if (drv == USERDIFF_ATTR_FALSE)
- one->is_binary = 1;
- else
- check_from_data = 1;
-
- if (check_from_data) {
- if (!one->data && DIFF_FILE_VALID(one))
- diff_populate_filespec(one, 0);
-
- if (one->data)
- one->is_binary = buffer_is_binary(one->data, one->size);
- }
+ if (!one->driver)
+ one->driver = userdiff_find_by_path(one->path);
+ if (!one->driver)
+ one->driver = userdiff_find_by_name("default");
}
int diff_filespec_is_binary(struct diff_filespec *one)
{
- diff_filespec_check_attr(one);
+ if (one->is_binary == -1) {
+ diff_filespec_load_driver(one);
+ if (one->driver->binary != -1)
+ one->is_binary = one->driver->binary;
+ else {
+ if (!one->data && DIFF_FILE_VALID(one))
+ diff_populate_filespec(one, 0);
+ if (one->data)
+ one->is_binary = buffer_is_binary(one->data,
+ one->size);
+ if (one->is_binary == -1)
+ one->is_binary = 0;
+ }
+ }
return one->is_binary;
}
static const struct userdiff_funcname *diff_funcname_pattern(struct diff_filespec *one)
{
- struct userdiff_driver *drv = userdiff_find_by_path(one->path);
- if (!drv)
- drv = userdiff_find_by_name("default");
- return drv && drv->funcname.pattern ? &drv->funcname : NULL;
+ diff_filespec_load_driver(one);
+ return one->driver->funcname.pattern ? &one->driver->funcname : NULL;
}
void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b)
@@ -1559,6 +1550,7 @@ struct diff_filespec *alloc_filespec(const char *path)
spec->path = (char *)(spec + 1);
memcpy(spec->path, path, namelen+1);
spec->count = 1;
+ spec->is_binary = -1;
return spec;
}