summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-21 10:14:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-25 05:38:51 (GMT)
commitaa4ed402c9721170fde2e9e43c3825562070e65e (patch)
treebd53ad59439661046b506c7b42153bb3caeb9009 /convert.c
parent3fed15f568c24ec00ef78fddc6cbb881fbbb0277 (diff)
downloadgit-aa4ed402c9721170fde2e9e43c3825562070e65e.zip
git-aa4ed402c9721170fde2e9e43c3825562070e65e.tar.gz
git-aa4ed402c9721170fde2e9e43c3825562070e65e.tar.bz2
Add 'filter' attribute and external filter driver definition.
The interface is similar to the custom low-level merge drivers. First you configure your filter driver by defining 'filter.<name>.*' variables in the configuration. filter.<name>.clean filter command to run upon checkin filter.<name>.smudge filter command to run upon checkout Then you assign filter attribute to each path, whose name matches the custom filter driver's name. Example: (in .gitattributes) *.c filter=indent (in config) [filter "indent"] clean = indent smudge = cat Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'convert.c')
-rw-r--r--convert.c237
1 files changed, 234 insertions, 3 deletions
diff --git a/convert.c b/convert.c
index 5fdaee7..9ee31b0 100644
--- a/convert.c
+++ b/convert.c
@@ -201,17 +201,212 @@ static char *crlf_to_worktree(const char *path, const char *src, unsigned long *
return buffer;
}
+static int filter_buffer(const char *path, const char *src,
+ unsigned long size, const char *cmd)
+{
+ /*
+ * Spawn cmd and feed the buffer contents through its stdin.
+ */
+ struct child_process child_process;
+ int pipe_feed[2];
+ int write_err, status;
+
+ memset(&child_process, 0, sizeof(child_process));
+
+ if (pipe(pipe_feed) < 0) {
+ error("cannot create pipe to run external filter %s", cmd);
+ return 1;
+ }
+
+ child_process.pid = fork();
+ if (child_process.pid < 0) {
+ error("cannot fork to run external filter %s", cmd);
+ close(pipe_feed[0]);
+ close(pipe_feed[1]);
+ return 1;
+ }
+ if (!child_process.pid) {
+ dup2(pipe_feed[0], 0);
+ close(pipe_feed[0]);
+ close(pipe_feed[1]);
+ execlp("sh", "sh", "-c", cmd, NULL);
+ return 1;
+ }
+ close(pipe_feed[0]);
+
+ write_err = (write_in_full(pipe_feed[1], src, size) < 0);
+ if (close(pipe_feed[1]))
+ write_err = 1;
+ if (write_err)
+ error("cannot feed the input to external filter %s", cmd);
+
+ status = finish_command(&child_process);
+ if (status)
+ error("external filter %s failed %d", cmd, -status);
+ return (write_err || status);
+}
+
+static char *apply_filter(const char *path, const char *src,
+ unsigned long *sizep, const char *cmd)
+{
+ /*
+ * Create a pipeline to have the command filter the buffer's
+ * contents.
+ *
+ * (child --> cmd) --> us
+ */
+ const int SLOP = 4096;
+ int pipe_feed[2];
+ int status;
+ char *dst;
+ unsigned long dstsize, dstalloc;
+ struct child_process child_process;
+
+ if (!cmd)
+ return NULL;
+
+ memset(&child_process, 0, sizeof(child_process));
+
+ if (pipe(pipe_feed) < 0) {
+ error("cannot create pipe to run external filter %s", cmd);
+ return NULL;
+ }
+
+ fflush(NULL);
+ child_process.pid = fork();
+ if (child_process.pid < 0) {
+ error("cannot fork to run external filter %s", cmd);
+ close(pipe_feed[0]);
+ close(pipe_feed[1]);
+ return NULL;
+ }
+ if (!child_process.pid) {
+ dup2(pipe_feed[1], 1);
+ close(pipe_feed[0]);
+ close(pipe_feed[1]);
+ exit(filter_buffer(path, src, *sizep, cmd));
+ }
+ close(pipe_feed[1]);
+
+ dstalloc = *sizep;
+ dst = xmalloc(dstalloc);
+ dstsize = 0;
+
+ while (1) {
+ ssize_t numread = xread(pipe_feed[0], dst + dstsize,
+ dstalloc - dstsize);
+
+ if (numread <= 0) {
+ if (!numread)
+ break;
+ error("read from external filter %s failed", cmd);
+ free(dst);
+ dst = NULL;
+ break;
+ }
+ dstsize += numread;
+ if (dstalloc <= dstsize + SLOP) {
+ dstalloc = dstsize + SLOP;
+ dst = xrealloc(dst, dstalloc);
+ }
+ }
+ if (close(pipe_feed[0])) {
+ error("read from external filter %s failed", cmd);
+ free(dst);
+ dst = NULL;
+ }
+
+ status = finish_command(&child_process);
+ if (status) {
+ error("external filter %s failed %d", cmd, -status);
+ free(dst);
+ dst = NULL;
+ }
+
+ if (dst)
+ *sizep = dstsize;
+ return dst;
+}
+
+static struct convert_driver {
+ const char *name;
+ struct convert_driver *next;
+ char *smudge;
+ char *clean;
+} *user_convert, **user_convert_tail;
+
+static int read_convert_config(const char *var, const char *value)
+{
+ const char *ep, *name;
+ int namelen;
+ struct convert_driver *drv;
+
+ /*
+ * External conversion drivers are configured using
+ * "filter.<name>.variable".
+ */
+ if (prefixcmp(var, "filter.") || (ep = strrchr(var, '.')) == var + 6)
+ return 0;
+ name = var + 7;
+ namelen = ep - name;
+ for (drv = user_convert; drv; drv = drv->next)
+ if (!strncmp(drv->name, name, namelen) && !drv->name[namelen])
+ break;
+ if (!drv) {
+ char *namebuf;
+ drv = xcalloc(1, sizeof(struct convert_driver));
+ namebuf = xmalloc(namelen + 1);
+ memcpy(namebuf, name, namelen);
+ namebuf[namelen] = 0;
+ drv->name = namebuf;
+ drv->next = NULL;
+ *user_convert_tail = drv;
+ user_convert_tail = &(drv->next);
+ }
+
+ ep++;
+
+ /*
+ * filter.<name>.smudge and filter.<name>.clean specifies
+ * the command line:
+ *
+ * command-line
+ *
+ * The command-line will not be interpolated in any way.
+ */
+
+ if (!strcmp("smudge", ep)) {
+ if (!value)
+ return error("%s: lacks value", var);
+ drv->smudge = strdup(value);
+ return 0;
+ }
+
+ if (!strcmp("clean", ep)) {
+ if (!value)
+ return error("%s: lacks value", var);
+ drv->clean = strdup(value);
+ return 0;
+ }
+ return 0;
+}
+
static void setup_convert_check(struct git_attr_check *check)
{
static struct git_attr *attr_crlf;
static struct git_attr *attr_ident;
+ static struct git_attr *attr_filter;
if (!attr_crlf) {
attr_crlf = git_attr("crlf", 4);
attr_ident = git_attr("ident", 5);
+ attr_filter = git_attr("filter", 6);
+ user_convert_tail = &user_convert;
+ git_config(read_convert_config);
}
check[0].attr = attr_crlf;
check[1].attr = attr_ident;
+ check[2].attr = attr_filter;
}
static int count_ident(const char *cp, unsigned long size)
@@ -367,6 +562,20 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check)
return CRLF_GUESS;
}
+static struct convert_driver *git_path_check_convert(const char *path,
+ struct git_attr_check *check)
+{
+ const char *value = check->value;
+ struct convert_driver *drv;
+
+ if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value))
+ return NULL;
+ for (drv = user_convert; drv; drv = drv->next)
+ if (!strcmp(value, drv->name))
+ return drv;
+ return NULL;
+}
+
static int git_path_check_ident(const char *path, struct git_attr_check *check)
{
const char *value = check->value;
@@ -376,18 +585,29 @@ static int git_path_check_ident(const char *path, struct git_attr_check *check)
char *convert_to_git(const char *path, const char *src, unsigned long *sizep)
{
- struct git_attr_check check[2];
+ struct git_attr_check check[3];
int crlf = CRLF_GUESS;
int ident = 0;
+ char *filter = NULL;
char *buf, *buf2;
setup_convert_check(check);
if (!git_checkattr(path, ARRAY_SIZE(check), check)) {
+ struct convert_driver *drv;
crlf = git_path_check_crlf(path, check + 0);
ident = git_path_check_ident(path, check + 1);
+ drv = git_path_check_convert(path, check + 2);
+ if (drv && drv->clean)
+ filter = drv->clean;
}
- buf = crlf_to_git(path, src, sizep, crlf);
+ buf = apply_filter(path, src, sizep, filter);
+
+ buf2 = crlf_to_git(path, buf ? buf : src, sizep, crlf);
+ if (buf2) {
+ free(buf);
+ buf = buf2;
+ }
buf2 = ident_to_git(path, buf ? buf : src, sizep, ident);
if (buf2) {
@@ -400,15 +620,20 @@ char *convert_to_git(const char *path, const char *src, unsigned long *sizep)
char *convert_to_working_tree(const char *path, const char *src, unsigned long *sizep)
{
- struct git_attr_check check[2];
+ struct git_attr_check check[3];
int crlf = CRLF_GUESS;
int ident = 0;
+ char *filter = NULL;
char *buf, *buf2;
setup_convert_check(check);
if (!git_checkattr(path, ARRAY_SIZE(check), check)) {
+ struct convert_driver *drv;
crlf = git_path_check_crlf(path, check + 0);
ident = git_path_check_ident(path, check + 1);
+ drv = git_path_check_convert(path, check + 2);
+ if (drv && drv->smudge)
+ filter = drv->smudge;
}
buf = ident_to_worktree(path, src, sizep, ident);
@@ -419,5 +644,11 @@ char *convert_to_working_tree(const char *path, const char *src, unsigned long *
buf = buf2;
}
+ buf2 = apply_filter(path, buf ? buf : src, sizep, filter);
+ if (buf2) {
+ free(buf);
+ buf = buf2;
+ }
+
return buf;
}