![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 04e7e91adfb83b7d25319d7307aec1584f9bdb71..a5fc56bdad5d96b2a4e0e1140206b8367a257867 100644 (file)
--- a/diff.c
+++ b/diff.c
char *cmd;
} *user_diff, **user_diff_tail;
+static void read_config_if_needed(void)
+{
+ if (!user_diff_tail) {
+ user_diff_tail = &user_diff;
+ git_config(git_diff_ui_config);
+ }
+}
+
/*
* Currently there is only "diff.<drivername>.command" variable;
* because there are "diff.color.<slot>" variables, we are parsing
@@ -93,6 +101,45 @@ static int parse_lldiff_command(const char *var, const char *ep, const char *val
return 0;
}
+/*
+ * 'diff.<what>.funcname' attribute can be specified in the configuration
+ * to define a customized regexp to find the beginning of a function to
+ * be used for hunk header lines of "diff -p" style output.
+ */
+static struct funcname_pattern {
+ char *name;
+ char *pattern;
+ struct funcname_pattern *next;
+} *funcname_pattern_list;
+
+static int parse_funcname_pattern(const char *var, const char *ep, const char *value)
+{
+ const char *name;
+ int namelen;
+ struct funcname_pattern *pp;
+
+ name = var + 5; /* "diff." */
+ namelen = ep - name;
+
+ for (pp = funcname_pattern_list; pp; pp = pp->next)
+ if (!strncmp(pp->name, name, namelen) && !pp->name[namelen])
+ break;
+ if (!pp) {
+ char *namebuf;
+ pp = xcalloc(1, sizeof(*pp));
+ namebuf = xmalloc(namelen + 1);
+ memcpy(namebuf, name, namelen);
+ namebuf[namelen] = 0;
+ pp->name = namebuf;
+ pp->next = funcname_pattern_list;
+ funcname_pattern_list = pp;
+ }
+ if (pp->pattern)
+ free(pp->pattern);
+ pp->pattern = xstrdup(value);
+ return 0;
+}
+
/*
* These are to give UI layer defaults.
* The core-level commands such as git-diff-files should
if (!prefixcmp(var, "diff.")) {
const char *ep = strrchr(var, '.');
- if (ep != var + 4 && !strcmp(ep, ".command"))
- return parse_lldiff_command(var, ep, value);
+ if (ep != var + 4) {
+ if (!strcmp(ep, ".command"))
+ return parse_lldiff_command(var, ep, value);
+ if (!strcmp(ep, ".funcname"))
+ return parse_funcname_pattern(var, ep, value);
+ }
}
if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
int slot = parse_diff_color_slot(var, 11);
static void setup_diff_attr_check(struct git_attr_check *check)
{
static struct git_attr *attr_diff;
- static struct git_attr *attr_diff_func_name;
if (!attr_diff) {
attr_diff = git_attr("diff", 4);
- attr_diff_func_name = git_attr("funcname", 8);
}
check[0].attr = attr_diff;
- check[1].attr = attr_diff_func_name;
}
static void diff_filespec_check_attr(struct diff_filespec *one)
{
- struct git_attr_check attr_diff_check[2];
+ struct git_attr_check attr_diff_check;
+ int check_from_data = 0;
if (one->checked_attr)
return;
- setup_diff_attr_check(attr_diff_check);
+ setup_diff_attr_check(&attr_diff_check);
one->is_binary = 0;
- one->hunk_header_ident = NULL;
+ one->funcname_pattern_ident = NULL;
- if (!git_checkattr(one->path, ARRAY_SIZE(attr_diff_check), attr_diff_check)) {
+ if (!git_checkattr(one->path, 1, &attr_diff_check)) {
const char *value;
/* binaryness */
- value = attr_diff_check[0].value;
+ value = attr_diff_check.value;
if (ATTR_TRUE(value))
;
else if (ATTR_FALSE(value))
one->is_binary = 1;
+ else
+ check_from_data = 1;
- /* hunk header ident */
- value = attr_diff_check[1].value;
+ /* funcname pattern ident */
if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
;
else
- one->hunk_header_ident = value;
+ one->funcname_pattern_ident = value;
}
- 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 (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);
+ }
}
int diff_filespec_is_binary(struct diff_filespec *one)
return one->is_binary;
}
-static struct hunk_header_regexp {
- char *name;
- char *regexp;
- struct hunk_header_regexp *next;
-} *hunk_header_regexp_list, **hunk_header_regexp_tail;
-
-static int hunk_header_config(const char *var, const char *value)
-{
- static const char funcname[] = "funcname.";
- struct hunk_header_regexp *hh;
-
- if (prefixcmp(var, funcname))
- return 0;
- var += strlen(funcname);
- for (hh = hunk_header_regexp_list; hh; hh = hh->next)
- if (!strcmp(var, hh->name)) {
- free(hh->regexp);
- hh->regexp = xstrdup(value);
- return 0;
- }
- hh = xcalloc(1, sizeof(*hh));
- hh->name = xstrdup(var);
- hh->regexp = xstrdup(value);
- hh->next = NULL;
- *hunk_header_regexp_tail = hh;
- return 0;
-}
-
-static const char *hunk_header_regexp(const char *ident)
+static const char *funcname_pattern(const char *ident)
{
- struct hunk_header_regexp *hh;
+ struct funcname_pattern *pp;
- if (!hunk_header_regexp_tail) {
- hunk_header_regexp_tail = &hunk_header_regexp_list;
- git_config(hunk_header_config);
- }
- for (hh = hunk_header_regexp_list; hh; hh = hh->next)
- if (!strcmp(ident, hh->name))
- return hh->regexp;
+ read_config_if_needed();
+ for (pp = funcname_pattern_list; pp; pp = pp->next)
+ if (!strcmp(ident, pp->name))
+ return pp->pattern;
return NULL;
}
-static const char *diff_hunk_header_regexp(struct diff_filespec *one)
+static struct builtin_funcname_pattern {
+ const char *name;
+ const char *pattern;
+} builtin_funcname_pattern[] = {
+ { "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
+ "new\\|return\\|switch\\|throw\\|while\\)\n"
+ "^[ ]*\\(\\([ ]*"
+ "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
+ "[ ]*([^;]*$\\)" },
+ { "tex", "^\\(\\\\\\(sub\\)*section{.*\\)$" },
+};
+
+static const char *diff_funcname_pattern(struct diff_filespec *one)
{
- const char *ident, *regexp;
+ const char *ident, *pattern;
+ int i;
diff_filespec_check_attr(one);
- ident = one->hunk_header_ident;
+ ident = one->funcname_pattern_ident;
if (!ident)
/*
* regexp is used; otherwise NULL is returned and xemit uses
* the built-in default.
*/
- return hunk_header_regexp("default");
+ return funcname_pattern("default");
/* Look up custom "funcname.$ident" regexp from config. */
- regexp = hunk_header_regexp(ident);
- if (regexp)
- return regexp;
+ pattern = funcname_pattern(ident);
+ if (pattern)
+ return pattern;
/*
* And define built-in fallback patterns here. Note that
* these can be overriden by the user's config settings.
*/
- if (!strcmp(ident, "java"))
- return "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
- "new\\|return\\|switch\\|throw\\|while\\)\n"
- "^[ ]*\\(\\([ ]*"
- "[A-Za-z_][A-Za-z_0-9]*\\)\\{2,\\}"
- "[ ]*([^;]*$\\)";
+ for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
+ if (!strcmp(ident, builtin_funcname_pattern[i].name))
+ return builtin_funcname_pattern[i].pattern;
return NULL;
}
xdemitconf_t xecfg;
xdemitcb_t ecb;
struct emit_callback ecbdata;
- const char *hunk_header_regexp;
+ const char *funcname_pattern;
- hunk_header_regexp = diff_hunk_header_regexp(one);
- if (!hunk_header_regexp)
- hunk_header_regexp = diff_hunk_header_regexp(two);
+ funcname_pattern = diff_funcname_pattern(one);
+ if (!funcname_pattern)
+ funcname_pattern = diff_funcname_pattern(two);
memset(&xecfg, 0, sizeof(xecfg));
memset(&ecbdata, 0, sizeof(ecbdata));
xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
xecfg.ctxlen = o->context;
xecfg.flags = XDL_EMIT_FUNCNAMES;
- if (hunk_header_regexp)
- xdiff_set_find_func(&xecfg, hunk_header_regexp);
+ if (funcname_pattern)
+ xdiff_set_find_func(&xecfg, funcname_pattern);
if (!diffopts)
;
else if (!prefixcmp(diffopts, "--unified="))
fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
if (fd < 0)
- die("unable to create temp-file");
+ die("unable to create temp-file: %s", strerror(errno));
if (write_in_full(fd, blob, size) != size)
die("unable to write temp-file");
close(fd);
!ATTR_UNSET(value)) {
struct ll_diff_driver *drv;
- if (!user_diff_tail) {
- user_diff_tail = &user_diff;
- git_config(git_diff_ui_config);
- }
+ read_config_if_needed();
for (drv = user_diff; drv; drv = drv->next)
if (!strcmp(drv->name, value))
return drv->cmd;