diff options
author | Junio C Hamano <junkio@cox.net> | 2005-05-22 10:04:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 10:17:50 -0700 |
commit | 6b14d7faf0bad026a81a27bac07b47691f621b8f (patch) | |
tree | b9d1923aaaea706179e9b27e07a843d277ad1bee /diffcore-pathspec.c | |
parent | [PATCH] Add the code to set default minimum score back in. (diff) | |
download | tgif-6b14d7faf0bad026a81a27bac07b47691f621b8f.tar.xz |
[PATCH] Diffcore updates.
This moves the path selection logic from individual programs to a new
diffcore transformer (diff-tree still needs to have its own for
performance reasons). Also the header printing code in diff-tree was
tweaked not to produce anything when pickaxe is in effect and there is
nothing interesting to report. An interesting example is the following
in the GIT archive itself:
$ git-whatchanged -p -C -S'or something in a real script'
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore-pathspec.c')
-rw-r--r-- | diffcore-pathspec.c | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c new file mode 100644 index 0000000000..25ab9eda93 --- /dev/null +++ b/diffcore-pathspec.c @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2005 Junio C Hamano + */ +#include "cache.h" +#include "diff.h" +#include "diffcore.h" +#include "delta.h" + +struct path_spec { + const char *spec; + int len; +}; + +static int matches_pathspec(const char *name, struct path_spec *s, int cnt) +{ + int i; + int namelen; + + if (cnt == 0) + return 1; + + namelen = strlen(name); + for (i = 0; i < cnt; i++) { + int len = s->len; + if (! strncmp(s->spec, name, len) && + len <= namelen && + (name[len] == 0 || name[len] == '/')) + return 1; + } + return 0; +} + +void diffcore_pathspec(const char **pathspec) +{ + struct diff_queue_struct *q = &diff_queued_diff; + int i, speccnt; + struct diff_queue_struct outq; + struct path_spec *spec; + + outq.queue = NULL; + outq.nr = outq.alloc = 0; + + for (i = 0; pathspec[i]; i++) + ; + speccnt = i; + spec = xmalloc(sizeof(*spec) * speccnt); + for (i = 0; pathspec[i]; i++) { + spec[i].spec = pathspec[i]; + spec[i].len = strlen(pathspec[i]); + } + + for (i = 0; i < q->nr; i++) { + struct diff_filepair *p = q->queue[i]; + if (matches_pathspec(p->one->path, spec, speccnt) || + matches_pathspec(p->two->path, spec, speccnt)) + diff_q(&outq, p); + else + diff_free_filepair(p); + } + free(q->queue); + *q = outq; + return; +} |