mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Diffcore updates.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-05-22 10:04:37 -07:00
committed by Linus Torvalds
parent 26dee0adfc
commit 6b14d7faf0
11 changed files with 266 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
diffcore-pickaxe.c
View File

@ -21,7 +21,7 @@ static int contains(struct diff_filespec *one,
return 0;
}
void diff_pickaxe(const char *needle)
void diffcore_pickaxe(const char *needle)
{
struct diff_queue_struct *q = &diff_queued_diff;
unsigned long len = strlen(needle);
@ -32,24 +32,23 @@ void diff_pickaxe(const char *needle)
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
int onum = outq.nr;
if (!DIFF_FILE_VALID(p->one)) {
if (!DIFF_FILE_VALID(p->two))
continue; /* ignore nonsense */
/* created */
if (contains(p->two, needle, len))
diff_queue(&outq, p->one, p->two);
diff_q(&outq, p);
}
else if (!DIFF_FILE_VALID(p->two)) {
if (contains(p->one, needle, len))
diff_queue(&outq, p->one, p->two);
diff_q(&outq, p);
}
else if (contains(p->one, needle, len) !=
contains(p->two, needle, len))
diff_queue(&outq, p->one, p->two);
}
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
free(p);
diff_q(&outq, p);
if (onum == outq.nr)
diff_free_filepair(p);
}
free(q->queue);
*q = outq;