mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
81e50eabf0
Update the diff-raw format as Linus and I discussed, except that it does not use sequence of underscore '_' letters to express nonexistence. All '0' mode is used for that purpose instead. The new diff-raw format can express rename/copy, and the earlier restriction that -M and -C _must_ be used with the patch format output is no longer necessary. The patch makes -M and -C flags independent of -p flag, so you need to say git-whatchanged -M -p to get the diff/patch format. Updated are both documentations and tests. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
58 lines
1.3 KiB
C
58 lines
1.3 KiB
C
/*
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
*/
|
|
#include "cache.h"
|
|
#include "diff.h"
|
|
#include "diffcore.h"
|
|
#include "delta.h"
|
|
|
|
static int contains(struct diff_filespec *one,
|
|
const char *needle, unsigned long len)
|
|
{
|
|
unsigned long offset, sz;
|
|
const char *data;
|
|
if (diff_populate_filespec(one))
|
|
return 0;
|
|
sz = one->size;
|
|
data = one->data;
|
|
for (offset = 0; offset + len <= sz; offset++)
|
|
if (!strncmp(needle, data + offset, len))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
void diff_pickaxe(const char *needle)
|
|
{
|
|
struct diff_queue_struct *q = &diff_queued_diff;
|
|
unsigned long len = strlen(needle);
|
|
int i;
|
|
struct diff_queue_struct outq;
|
|
outq.queue = NULL;
|
|
outq.nr = outq.alloc = 0;
|
|
|
|
for (i = 0; i < q->nr; i++) {
|
|
struct diff_filepair *p = q->queue[i];
|
|
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);
|
|
}
|
|
else if (!DIFF_FILE_VALID(p->two)) {
|
|
if (contains(p->one, needle, len))
|
|
diff_queue(&outq, p->one, p->two);
|
|
}
|
|
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);
|
|
}
|
|
free(q->queue);
|
|
*q = outq;
|
|
return;
|
|
}
|