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

Merge branch 'jc/combine' into next

Browse Source 
* jc/combine:
  combine-diff: fix hunks at the end (take #2).
  combine-diff: do not lose hunks with only deletion at end.
This commit is contained in:
Junio C Hamano
2006-04-11 14:34:59 -07:00
parent 4da8cbc234 740659519e
commit 72c159f642
1 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
combine-diff.c
View File

@ -243,7 +243,7 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
* started by showing sline[lno] (possibly showing the lost * started by showing sline[lno] (possibly showing the lost
* lines attached to it first). * lines attached to it first).
*/ */
for (lno = 0, p_lno = 1; lno < cnt; lno++) { for (lno = 0, p_lno = 1; lno <= cnt; lno++) {
struct lline *ll; struct lline *ll;
sline[lno].p_lno[n] = p_lno; sline[lno].p_lno[n] = p_lno;
@ -254,7 +254,7 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
p_lno++; /* '-' means parent had it */ p_lno++; /* '-' means parent had it */
ll = ll->next; ll = ll->next;
} }
if (!(sline[lno].flag & nmask)) if (lno < cnt && !(sline[lno].flag & nmask))
p_lno++; /* no '+' means parent had it */ p_lno++; /* no '+' means parent had it */
} }
sline[lno].p_lno[n] = p_lno; /* trailer */ sline[lno].p_lno[n] = p_lno; /* trailer */
@ -301,14 +301,14 @@ static unsigned long find_next(struct sline *sline,
* lines that are not interesting to interesting() function * lines that are not interesting to interesting() function
* that are surrounded by interesting() ones. * that are surrounded by interesting() ones.
*/ */
while (i < cnt) while (i <= cnt)
if (uninteresting if (uninteresting
? !(sline[i].flag & mark) ? !(sline[i].flag & mark)
: (sline[i].flag & mark)) : (sline[i].flag & mark))
return i; return i;
else else
i++; i++;
return cnt; return i;
} }
static int give_context(struct sline *sline, unsigned long cnt, int num_parent) static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
@ -327,10 +327,10 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
* lines but they are treated as "interesting" in the end. * lines but they are treated as "interesting" in the end.
*/ */
i = find_next(sline, mark, 0, cnt, 0); i = find_next(sline, mark, 0, cnt, 0);
if (cnt <= i) if (cnt < i)
return 0; return 0;
while (i < cnt) { while (i <= cnt) {
unsigned long j = (context < i) ? (i - context) : 0; unsigned long j = (context < i) ? (i - context) : 0;
unsigned long k; unsigned long k;
@ -343,7 +343,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
* next uninteresting one start? * next uninteresting one start?
*/ */
j = find_next(sline, mark, i, cnt, 1); j = find_next(sline, mark, i, cnt, 1);
if (cnt <= j) if (cnt < j)
break; /* the rest are all interesting */ break; /* the rest are all interesting */
/* lookahead context lines */ /* lookahead context lines */
@ -365,7 +365,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
* the trailing edge a bit. * the trailing edge a bit.
*/ */
i = k; i = k;
k = (j + context < cnt) ? j + context : cnt; k = (j + context < cnt+1) ? j + context : cnt+1;
while (j < k) while (j < k)
sline[j++].flag |= mark; sline[j++].flag |= mark;
} }
@ -380,7 +380,7 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
unsigned long i; unsigned long i;
int has_interesting = 0; int has_interesting = 0;
for (i = 0; i < cnt; i++) { for (i = 0; i <= cnt; i++) {
if (interesting(&sline[i], all_mask)) if (interesting(&sline[i], all_mask))
sline[i].flag |= mark; sline[i].flag |= mark;
else else
@ -394,15 +394,15 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
* parent, mark that uninteresting. * parent, mark that uninteresting.
*/ */
i = 0; i = 0;
while (i < cnt) { while (i <= cnt) {
unsigned long j, hunk_begin, hunk_end; unsigned long j, hunk_begin, hunk_end;
unsigned long same_diff; unsigned long same_diff;
while (i < cnt && !(sline[i].flag & mark)) while (i <= cnt && !(sline[i].flag & mark))
i++; i++;
if (cnt <= i) if (cnt < i)
break; /* No more interesting hunks */ break; /* No more interesting hunks */
hunk_begin = i; hunk_begin = i;
for (j = i + 1; j < cnt; j++) { for (j = i + 1; j <= cnt; j++) {
if (!(sline[j].flag & mark)) { if (!(sline[j].flag & mark)) {
/* Look beyond the end to see if there /* Look beyond the end to see if there
* is an interesting line after this * is an interesting line after this
@ -412,8 +412,8 @@ static int make_hunks(struct sline *sline, unsigned long cnt,
int contin = 0; int contin = 0;
la = adjust_hunk_tail(sline, all_mask, la = adjust_hunk_tail(sline, all_mask,
hunk_begin, j); hunk_begin, j);
la = (la + context < cnt) ? la = (la + context < cnt + 1) ?
(la + context) : cnt; (la + context) : cnt + 1;
while (j <= --la) { while (j <= --la) {
if (sline[la].flag & mark) { if (sline[la].flag & mark) {
contin = 1; contin = 1;
@ -507,17 +507,23 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
while (1) { while (1) {
struct sline *sl = &sline[lno]; struct sline *sl = &sline[lno];
int hunk_end; int hunk_end;
while (lno < cnt && !(sline[lno].flag & mark)) int rlines;
while (lno <= cnt && !(sline[lno].flag & mark))
lno++; lno++;
if (cnt <= lno) if (cnt < lno)
break; break;
for (hunk_end = lno + 1; hunk_end < cnt; hunk_end++) else {
if (!(sline[hunk_end].flag & mark)) for (hunk_end = lno + 1; hunk_end <= cnt; hunk_end++)
break; if (!(sline[hunk_end].flag & mark))
break;
}
rlines = hunk_end - lno;
if (cnt < hunk_end)
rlines--; /* pointing at the last delete hunk */
for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i <= num_parent; i++) putchar(combine_marker);
for (i = 0; i < num_parent; i++) for (i = 0; i < num_parent; i++)
show_parent_lno(sline, lno, hunk_end, cnt, i); show_parent_lno(sline, lno, hunk_end, cnt, i);
printf(" +%lu,%lu ", lno+1, hunk_end-lno); printf(" +%lu,%lu ", lno+1, rlines);
for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i <= num_parent; i++) putchar(combine_marker);
putchar('\n'); putchar('\n');
while (lno < hunk_end) { while (lno < hunk_end) {
@ -536,6 +542,8 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
puts(ll->line); puts(ll->line);
ll = ll->next; ll = ll->next;
} }
if (cnt < lno)
break;
p_mask = 1; p_mask = 1;
for (j = 0; j < num_parent; j++) { for (j = 0; j < num_parent; j++) {
if (p_mask & sl->flag) if (p_mask & sl->flag)
@ -560,7 +568,7 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
imask = (1UL<<i); imask = (1UL<<i);
jmask = (1UL<<j); jmask = (1UL<<j);
for (lno = 0; lno < cnt; lno++) { for (lno = 0; lno <= cnt; lno++) {
struct lline *ll = sline->lost_head; struct lline *ll = sline->lost_head;
sline->p_lno[i] = sline->p_lno[j]; sline->p_lno[i] = sline->p_lno[j];
while (ll) { while (ll) {
@ -632,10 +640,10 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (result_size && result[result_size-1] != '\n') if (result_size && result[result_size-1] != '\n')
cnt++; /* incomplete line */ cnt++; /* incomplete line */
sline = xcalloc(cnt+1, sizeof(*sline)); sline = xcalloc(cnt+2, sizeof(*sline));
ep = result; ep = result;
sline[0].bol = result; sline[0].bol = result;
for (lno = 0; lno <= cnt; lno++) { for (lno = 0; lno <= cnt + 1; lno++) {
sline[lno].lost_tail = &sline[lno].lost_head; sline[lno].lost_tail = &sline[lno].lost_head;
sline[lno].flag = 0; sline[lno].flag = 0;
} }
@ -653,8 +661,11 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
result_file.ptr = result; result_file.ptr = result;
result_file.size = result_size; result_file.size = result_size;
sline[0].p_lno = xcalloc((cnt+1) * num_parent, sizeof(unsigned long)); /* Even p_lno[cnt+1] is valid -- that is for the end line number
for (lno = 0; lno < cnt; lno++) * for deletion hunk at the end.
*/
sline[0].p_lno = xcalloc((cnt+2) * num_parent, sizeof(unsigned long));
for (lno = 0; lno <= cnt; lno++)
sline[lno+1].p_lno = sline[lno].p_lno + num_parent; sline[lno+1].p_lno = sline[lno].p_lno + num_parent;
for (i = 0; i < num_parent; i++) { for (i = 0; i < num_parent; i++) {