1 /* vim:set ts=8 sts=4 sw=4: 2 * 3 * VIM - Vi IMproved by Bram Moolenaar 4 * 5 * Do ":help uganda" in Vim to read copying and usage conditions. 6 * Do ":help credits" in Vim to see a list of people who contributed. 7 * See README.txt for an overview of the Vim source code. 8 */ 9 10 /* 11 * diff.c: code for diff'ing two, three or four buffers. 12 */ 13 14 #include "vim.h" 15 16 #if defined(FEAT_DIFF) || defined(PROTO) 17 18 static int diff_busy = FALSE; /* ex_diffgetput() is busy */ 19 20 /* flags obtained from the 'diffopt' option */ 21 #define DIFF_FILLER 1 /* display filler lines */ 22 #define DIFF_ICASE 2 /* ignore case */ 23 #define DIFF_IWHITE 4 /* ignore change in white space */ 24 #define DIFF_HORIZONTAL 8 /* horizontal splits */ 25 #define DIFF_VERTICAL 16 /* vertical splits */ 26 static int diff_flags = DIFF_FILLER; 27 28 #define LBUFLEN 50 /* length of line in diff file */ 29 30 static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it 31 doesn't work, MAYBE when not checked yet */ 32 #if defined(MSWIN) || defined(MSDOS) 33 static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE 34 when it doesn't work, MAYBE when not 35 checked yet */ 36 #endif 37 38 static int diff_buf_idx __ARGS((buf_T *buf)); 39 static int diff_buf_idx_tp __ARGS((buf_T *buf, tabpage_T *tp)); 40 static void diff_mark_adjust_tp __ARGS((tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after)); 41 static void diff_check_unchanged __ARGS((tabpage_T *tp, diff_T *dp)); 42 static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp)); 43 static void diff_redraw __ARGS((int dofold)); 44 static int diff_write __ARGS((buf_T *buf, char_u *fname)); 45 static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff)); 46 static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2)); 47 static int diff_cmp __ARGS((char_u *s1, char_u *s2)); 48 #ifdef FEAT_FOLDING 49 static void diff_fold_update __ARGS((diff_T *dp, int skip_idx)); 50 #endif 51 static void diff_read __ARGS((int idx_orig, int idx_new, char_u *fname)); 52 static void diff_copy_entry __ARGS((diff_T *dprev, diff_T *dp, int idx_orig, int idx_new)); 53 static diff_T *diff_alloc_new __ARGS((tabpage_T *tp, diff_T *dprev, diff_T *dp)); 54 55 #ifndef USE_CR 56 # define tag_fgets vim_fgets 57 #endif 58 59 /* 60 * Called when deleting or unloading a buffer: No longer make a diff with it. 61 */ 62 void 63 diff_buf_delete(buf) 64 buf_T *buf; 65 { 66 int i; 67 tabpage_T *tp; 68 69 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) 70 { 71 i = diff_buf_idx_tp(buf, tp); 72 if (i != DB_COUNT) 73 { 74 tp->tp_diffbuf[i] = NULL; 75 tp->tp_diff_invalid = TRUE; 76 if (tp == curtab) 77 diff_redraw(TRUE); 78 } 79 } 80 } 81 82 /* 83 * Check if the current buffer should be added to or removed from the list of 84 * diff buffers. 85 */ 86 void 87 diff_buf_adjust(win) 88 win_T *win; 89 { 90 win_T *wp; 91 int i; 92 93 if (!win->w_p_diff) 94 { 95 /* When there is no window showing a diff for this buffer, remove 96 * it from the diffs. */ 97 for (wp = firstwin; wp != NULL; wp = wp->w_next) 98 if (wp->w_buffer == win->w_buffer && wp->w_p_diff) 99 break; 100 if (wp == NULL) 101 { 102 i = diff_buf_idx(win->w_buffer); 103 if (i != DB_COUNT) 104 { 105 curtab->tp_diffbuf[i] = NULL; 106 curtab->tp_diff_invalid = TRUE; 107 diff_redraw(TRUE); 108 } 109 } 110 } 111 else 112 diff_buf_add(win->w_buffer); 113 } 114 115 /* 116 * Add a buffer to make diffs for. 117 * Call this when a new buffer is being edited in the current window where 118 * 'diff' is set. 119 * Marks the current buffer as being part of the diff and requiring updating. 120 * This must be done before any autocmd, because a command may use info 121 * about the screen contents. 122 */ 123 void 124 diff_buf_add(buf) 125 buf_T *buf; 126 { 127 int i; 128 129 if (diff_buf_idx(buf) != DB_COUNT) 130 return; /* It's already there. */ 131 132 for (i = 0; i < DB_COUNT; ++i) 133 if (curtab->tp_diffbuf[i] == NULL) 134 { 135 curtab->tp_diffbuf[i] = buf; 136 curtab->tp_diff_invalid = TRUE; 137 diff_redraw(TRUE); 138 return; 139 } 140 141 EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT); 142 } 143 144 /* 145 * Find buffer "buf" in the list of diff buffers for the current tab page. 146 * Return its index or DB_COUNT if not found. 147 */ 148 static int 149 diff_buf_idx(buf) 150 buf_T *buf; 151 { 152 int idx; 153 154 for (idx = 0; idx < DB_COUNT; ++idx) 155 if (curtab->tp_diffbuf[idx] == buf) 156 break; 157 return idx; 158 } 159 160 /* 161 * Find buffer "buf" in the list of diff buffers for tab page "tp". 162 * Return its index or DB_COUNT if not found. 163 */ 164 static int 165 diff_buf_idx_tp(buf, tp) 166 buf_T *buf; 167 tabpage_T *tp; 168 { 169 int idx; 170 171 for (idx = 0; idx < DB_COUNT; ++idx) 172 if (tp->tp_diffbuf[idx] == buf) 173 break; 174 return idx; 175 } 176 177 /* 178 * Mark the diff info involving buffer "buf" as invalid, it will be updated 179 * when info is requested. 180 */ 181 void 182 diff_invalidate(buf) 183 buf_T *buf; 184 { 185 tabpage_T *tp; 186 int i; 187 188 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) 189 { 190 i = diff_buf_idx_tp(buf, tp); 191 if (i != DB_COUNT) 192 { 193 tp->tp_diff_invalid = TRUE; 194 if (tp == curtab) 195 diff_redraw(TRUE); 196 } 197 } 198 } 199 200 /* 201 * Called by mark_adjust(): update line numbers in "curbuf". 202 */ 203 void 204 diff_mark_adjust(line1, line2, amount, amount_after) 205 linenr_T line1; 206 linenr_T line2; 207 long amount; 208 long amount_after; 209 { 210 int idx; 211 tabpage_T *tp; 212 213 /* Handle all tab pages that use the current buffer in a diff. */ 214 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) 215 { 216 idx = diff_buf_idx_tp(curbuf, tp); 217 if (idx != DB_COUNT) 218 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after); 219 } 220 } 221 222 /* 223 * Update line numbers in tab page "tp" for "curbuf" with index "idx". 224 * This attempts to update the changes as much as possible: 225 * When inserting/deleting lines outside of existing change blocks, create a 226 * new change block and update the line numbers in following blocks. 227 * When inserting/deleting lines in existing change blocks, update them. 228 */ 229 static void 230 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after) 231 tabpage_T *tp; 232 int idx; 233 linenr_T line1; 234 linenr_T line2; 235 long amount; 236 long amount_after; 237 { 238 diff_T *dp; 239 diff_T *dprev; 240 diff_T *dnext; 241 int i; 242 int inserted, deleted; 243 int n, off; 244 linenr_T last; 245 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */ 246 int check_unchanged; 247 248 if (line2 == MAXLNUM) 249 { 250 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */ 251 inserted = amount; 252 deleted = 0; 253 } 254 else if (amount_after > 0) 255 { 256 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/ 257 inserted = amount_after; 258 deleted = 0; 259 } 260 else 261 { 262 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */ 263 inserted = 0; 264 deleted = -amount_after; 265 } 266 267 dprev = NULL; 268 dp = tp->tp_first_diff; 269 for (;;) 270 { 271 /* If the change is after the previous diff block and before the next 272 * diff block, thus not touching an existing change, create a new diff 273 * block. Don't do this when ex_diffgetput() is busy. */ 274 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2 275 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1)) 276 && (dprev == NULL 277 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1) 278 && !diff_busy) 279 { 280 dnext = diff_alloc_new(tp, dprev, dp); 281 if (dnext == NULL) 282 return; 283 284 dnext->df_lnum[idx] = line1; 285 dnext->df_count[idx] = inserted; 286 for (i = 0; i < DB_COUNT; ++i) 287 if (tp->tp_diffbuf[i] != NULL && i != idx) 288 { 289 if (dprev == NULL) 290 dnext->df_lnum[i] = line1; 291 else 292 dnext->df_lnum[i] = line1 293 + (dprev->df_lnum[i] + dprev->df_count[i]) 294 - (dprev->df_lnum[idx] + dprev->df_count[idx]); 295 dnext->df_count[i] = deleted; 296 } 297 } 298 299 /* if at end of the list, quit */ 300 if (dp == NULL) 301 break; 302 303 /* 304 * Check for these situations: 305 * 1 2 3 306 * 1 2 3 307 * line1 2 3 4 5 308 * 2 3 4 5 309 * 2 3 4 5 310 * line2 2 3 4 5 311 * 3 5 6 312 * 3 5 6 313 */ 314 /* compute last line of this change */ 315 last = dp->df_lnum[idx] + dp->df_count[idx] - 1; 316 317 /* 1. change completely above line1: nothing to do */ 318 if (last >= line1 - 1) 319 { 320 /* 6. change below line2: only adjust for amount_after; also when 321 * "deleted" became zero when deleted all lines between two diffs */ 322 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2) 323 { 324 if (amount_after == 0) 325 break; /* nothing left to change */ 326 dp->df_lnum[idx] += amount_after; 327 } 328 else 329 { 330 check_unchanged = FALSE; 331 332 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */ 333 if (deleted > 0) 334 { 335 if (dp->df_lnum[idx] >= line1) 336 { 337 off = dp->df_lnum[idx] - lnum_deleted; 338 if (last <= line2) 339 { 340 /* 4. delete all lines of diff */ 341 if (dp->df_next != NULL 342 && dp->df_next->df_lnum[idx] - 1 <= line2) 343 { 344 /* delete continues in next diff, only do 345 * lines until that one */ 346 n = dp->df_next->df_lnum[idx] - lnum_deleted; 347 deleted -= n; 348 n -= dp->df_count[idx]; 349 lnum_deleted = dp->df_next->df_lnum[idx]; 350 } 351 else 352 n = deleted - dp->df_count[idx]; 353 dp->df_count[idx] = 0; 354 } 355 else 356 { 357 /* 5. delete lines at or just before top of diff */ 358 n = off; 359 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1; 360 check_unchanged = TRUE; 361 } 362 dp->df_lnum[idx] = line1; 363 } 364 else 365 { 366 off = 0; 367 if (last < line2) 368 { 369 /* 2. delete at end of of diff */ 370 dp->df_count[idx] -= last - lnum_deleted + 1; 371 if (dp->df_next != NULL 372 && dp->df_next->df_lnum[idx] - 1 <= line2) 373 { 374 /* delete continues in next diff, only do 375 * lines until that one */ 376 n = dp->df_next->df_lnum[idx] - 1 - last; 377 deleted -= dp->df_next->df_lnum[idx] 378 - lnum_deleted; 379 lnum_deleted = dp->df_next->df_lnum[idx]; 380 } 381 else 382 n = line2 - last; 383 check_unchanged = TRUE; 384 } 385 else 386 { 387 /* 3. delete lines inside the diff */ 388 n = 0; 389 dp->df_count[idx] -= deleted; 390 } 391 } 392 393 for (i = 0; i < DB_COUNT; ++i) 394 if (tp->tp_diffbuf[i] != NULL && i != idx) 395 { 396 dp->df_lnum[i] -= off; 397 dp->df_count[i] += n; 398 } 399 } 400 else 401 { 402 if (dp->df_lnum[idx] <= line1) 403 { 404 /* inserted lines somewhere in this diff */ 405 dp->df_count[idx] += inserted; 406 check_unchanged = TRUE; 407 } 408 else 409 /* inserted lines somewhere above this diff */ 410 dp->df_lnum[idx] += inserted; 411 } 412 413 if (check_unchanged) 414 /* Check if inserted lines are equal, may reduce the 415 * size of the diff. TODO: also check for equal lines 416 * in the middle and perhaps split the block. */ 417 diff_check_unchanged(tp, dp); 418 } 419 } 420 421 /* check if this block touches the previous one, may merge them. */ 422 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx] 423 == dp->df_lnum[idx]) 424 { 425 for (i = 0; i < DB_COUNT; ++i) 426 if (tp->tp_diffbuf[i] != NULL) 427 dprev->df_count[i] += dp->df_count[i]; 428 dprev->df_next = dp->df_next; 429 vim_free(dp); 430 dp = dprev->df_next; 431 } 432 else 433 { 434 /* Advance to next entry. */ 435 dprev = dp; 436 dp = dp->df_next; 437 } 438 } 439 440 dprev = NULL; 441 dp = tp->tp_first_diff; 442 while (dp != NULL) 443 { 444 /* All counts are zero, remove this entry. */ 445 for (i = 0; i < DB_COUNT; ++i) 446 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0) 447 break; 448 if (i == DB_COUNT) 449 { 450 dnext = dp->df_next; 451 vim_free(dp); 452 dp = dnext; 453 if (dprev == NULL) 454 tp->tp_first_diff = dnext; 455 else 456 dprev->df_next = dnext; 457 } 458 else 459 { 460 /* Advance to next entry. */ 461 dprev = dp; 462 dp = dp->df_next; 463 } 464 465 } 466 467 if (tp == curtab) 468 { 469 diff_redraw(TRUE); 470 471 /* Need to recompute the scroll binding, may remove or add filler 472 * lines (e.g., when adding lines above w_topline). But it's slow when 473 * making many changes, postpone until redrawing. */ 474 diff_need_scrollbind = TRUE; 475 } 476 } 477 478 /* 479 * Allocate a new diff block and link it between "dprev" and "dp". 480 */ 481 static diff_T * 482 diff_alloc_new(tp, dprev, dp) 483 tabpage_T *tp; 484 diff_T *dprev; 485 diff_T *dp; 486 { 487 diff_T *dnew; 488 489 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T)); 490 if (dnew != NULL) 491 { 492 dnew->df_next = dp; 493 if (dprev == NULL) 494 tp->tp_first_diff = dnew; 495 else 496 dprev->df_next = dnew; 497 } 498 return dnew; 499 } 500 501 /* 502 * Check if the diff block "dp" can be made smaller for lines at the start and 503 * end that are equal. Called after inserting lines. 504 * This may result in a change where all buffers have zero lines, the caller 505 * must take care of removing it. 506 */ 507 static void 508 diff_check_unchanged(tp, dp) 509 tabpage_T *tp; 510 diff_T *dp; 511 { 512 int i_org; 513 int i_new; 514 int off_org, off_new; 515 char_u *line_org; 516 int dir = FORWARD; 517 518 /* Find the first buffers, use it as the original, compare the other 519 * buffer lines against this one. */ 520 for (i_org = 0; i_org < DB_COUNT; ++i_org) 521 if (tp->tp_diffbuf[i_org] != NULL) 522 break; 523 if (i_org == DB_COUNT) /* safety check */ 524 return; 525 526 if (diff_check_sanity(tp, dp) == FAIL) 527 return; 528 529 /* First check lines at the top, then at the bottom. */ 530 off_org = 0; 531 off_new = 0; 532 for (;;) 533 { 534 /* Repeat until a line is found which is different or the number of 535 * lines has become zero. */ 536 while (dp->df_count[i_org] > 0) 537 { 538 /* Copy the line, the next ml_get() will invalidate it. */ 539 if (dir == BACKWARD) 540 off_org = dp->df_count[i_org] - 1; 541 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org], 542 dp->df_lnum[i_org] + off_org, FALSE)); 543 if (line_org == NULL) 544 return; 545 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new) 546 { 547 if (tp->tp_diffbuf[i_new] == NULL) 548 continue; 549 if (dir == BACKWARD) 550 off_new = dp->df_count[i_new] - 1; 551 /* if other buffer doesn't have this line, it was inserted */ 552 if (off_new < 0 || off_new >= dp->df_count[i_new]) 553 break; 554 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new], 555 dp->df_lnum[i_new] + off_new, FALSE)) != 0) 556 break; 557 } 558 vim_free(line_org); 559 560 /* Stop when a line isn't equal in all diff buffers. */ 561 if (i_new != DB_COUNT) 562 break; 563 564 /* Line matched in all buffers, remove it from the diff. */ 565 for (i_new = i_org; i_new < DB_COUNT; ++i_new) 566 if (tp->tp_diffbuf[i_new] != NULL) 567 { 568 if (dir == FORWARD) 569 ++dp->df_lnum[i_new]; 570 --dp->df_count[i_new]; 571 } 572 } 573 if (dir == BACKWARD) 574 break; 575 dir = BACKWARD; 576 } 577 } 578 579 /* 580 * Check if a diff block doesn't contain invalid line numbers. 581 * This can happen when the diff program returns invalid results. 582 */ 583 static int 584 diff_check_sanity(tp, dp) 585 tabpage_T *tp; 586 diff_T *dp; 587 { 588 int i; 589 590 for (i = 0; i < DB_COUNT; ++i) 591 if (tp->tp_diffbuf[i] != NULL) 592 if (dp->df_lnum[i] + dp->df_count[i] - 1 593 > tp->tp_diffbuf[i]->b_ml.ml_line_count) 594 return FAIL; 595 return OK; 596 } 597 598 /* 599 * Mark all diff buffers in the current tab page for redraw. 600 */ 601 static void 602 diff_redraw(dofold) 603 int dofold; /* also recompute the folds */ 604 { 605 win_T *wp; 606 int n; 607 608 for (wp = firstwin; wp != NULL; wp = wp->w_next) 609 if (wp->w_p_diff) 610 { 611 redraw_win_later(wp, SOME_VALID); 612 #ifdef FEAT_FOLDING 613 if (dofold && foldmethodIsDiff(wp)) 614 foldUpdateAll(wp); 615 #endif 616 /* A change may have made filler lines invalid, need to take care 617 * of that for other windows. */ 618 n = diff_check(wp, wp->w_topline); 619 if ((wp != curwin && wp->w_topfill > 0) || n > 0) 620 { 621 if (wp->w_topfill > n) 622 wp->w_topfill = (n < 0 ? 0 : n); 623 else if (n > 0 && n > wp->w_topfill) 624 wp->w_topfill = n; 625 } 626 } 627 } 628 629 /* 630 * Write buffer "buf" to file "name". 631 * Always use 'fileformat' set to "unix". 632 * Return FAIL for failure 633 */ 634 static int 635 diff_write(buf, fname) 636 buf_T *buf; 637 char_u *fname; 638 { 639 int r; 640 char_u *save_ff; 641 642 save_ff = buf->b_p_ff; 643 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); 644 r = buf_write(buf, fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count, 645 NULL, FALSE, FALSE, FALSE, TRUE); 646 free_string_option(buf->b_p_ff); 647 buf->b_p_ff = save_ff; 648 return r; 649 } 650 651 /* 652 * Completely update the diffs for the buffers involved. 653 * This uses the ordinary "diff" command. 654 * The buffers are written to a file, also for unmodified buffers (the file 655 * could have been produced by autocommands, e.g. the netrw plugin). 656 */ 657 void 658 ex_diffupdate(eap) 659 exarg_T *eap UNUSED; /* can be NULL */ 660 { 661 buf_T *buf; 662 int idx_orig; 663 int idx_new; 664 char_u *tmp_orig; 665 char_u *tmp_new; 666 char_u *tmp_diff; 667 FILE *fd; 668 int ok; 669 int io_error = FALSE; 670 671 /* Delete all diffblocks. */ 672 diff_clear(curtab); 673 curtab->tp_diff_invalid = FALSE; 674 675 /* Use the first buffer as the original text. */ 676 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig) 677 if (curtab->tp_diffbuf[idx_orig] != NULL) 678 break; 679 if (idx_orig == DB_COUNT) 680 return; 681 682 /* Only need to do something when there is another buffer. */ 683 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) 684 if (curtab->tp_diffbuf[idx_new] != NULL) 685 break; 686 if (idx_new == DB_COUNT) 687 return; 688 689 /* We need three temp file names. */ 690 tmp_orig = vim_tempname('o'); 691 tmp_new = vim_tempname('n'); 692 tmp_diff = vim_tempname('d'); 693 if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL) 694 goto theend; 695 696 /* 697 * Do a quick test if "diff" really works. Otherwise it looks like there 698 * are no differences. Can't use the return value, it's non-zero when 699 * there are differences. 700 * May try twice, first with "-a" and then without. 701 */ 702 for (;;) 703 { 704 ok = FALSE; 705 fd = mch_fopen((char *)tmp_orig, "w"); 706 if (fd == NULL) 707 io_error = TRUE; 708 else 709 { 710 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1) 711 io_error = TRUE; 712 fclose(fd); 713 fd = mch_fopen((char *)tmp_new, "w"); 714 if (fd == NULL) 715 io_error = TRUE; 716 else 717 { 718 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1) 719 io_error = TRUE; 720 fclose(fd); 721 diff_file(tmp_orig, tmp_new, tmp_diff); 722 fd = mch_fopen((char *)tmp_diff, "r"); 723 if (fd == NULL) 724 io_error = TRUE; 725 else 726 { 727 char_u linebuf[LBUFLEN]; 728 729 for (;;) 730 { 731 /* There must be a line that contains "1c1". */ 732 if (tag_fgets(linebuf, LBUFLEN, fd)) 733 break; 734 if (STRNCMP(linebuf, "1c1", 3) == 0) 735 ok = TRUE; 736 } 737 fclose(fd); 738 } 739 mch_remove(tmp_diff); 740 mch_remove(tmp_new); 741 } 742 mch_remove(tmp_orig); 743 } 744 745 #ifdef FEAT_EVAL 746 /* When using 'diffexpr' break here. */ 747 if (*p_dex != NUL) 748 break; 749 #endif 750 751 #if defined(MSWIN) || defined(MSDOS) 752 /* If the "-a" argument works, also check if "--binary" works. */ 753 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE) 754 { 755 diff_a_works = TRUE; 756 diff_bin_works = TRUE; 757 continue; 758 } 759 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE) 760 { 761 /* Tried --binary, but it failed. "-a" works though. */ 762 diff_bin_works = FALSE; 763 ok = TRUE; 764 } 765 #endif 766 767 /* If we checked if "-a" works already, break here. */ 768 if (diff_a_works != MAYBE) 769 break; 770 diff_a_works = ok; 771 772 /* If "-a" works break here, otherwise retry without "-a". */ 773 if (ok) 774 break; 775 } 776 if (!ok) 777 { 778 if (io_error) 779 EMSG(_("E810: Cannot read or write temp files")); 780 EMSG(_("E97: Cannot create diffs")); 781 diff_a_works = MAYBE; 782 #if defined(MSWIN) || defined(MSDOS) 783 diff_bin_works = MAYBE; 784 #endif 785 goto theend; 786 } 787 788 /* :diffupdate! */ 789 if (eap != NULL && eap->forceit) 790 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new) 791 { 792 buf = curtab->tp_diffbuf[idx_new]; 793 if (buf_valid(buf)) 794 buf_check_timestamp(buf, FALSE); 795 } 796 797 /* Write the first buffer to a tempfile. */ 798 buf = curtab->tp_diffbuf[idx_orig]; 799 if (diff_write(buf, tmp_orig) == FAIL) 800 goto theend; 801 802 /* Make a difference between the first buffer and every other. */ 803 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) 804 { 805 buf = curtab->tp_diffbuf[idx_new]; 806 if (buf == NULL) 807 continue; 808 if (diff_write(buf, tmp_new) == FAIL) 809 continue; 810 diff_file(tmp_orig, tmp_new, tmp_diff); 811 812 /* Read the diff output and add each entry to the diff list. */ 813 diff_read(idx_orig, idx_new, tmp_diff); 814 mch_remove(tmp_diff); 815 mch_remove(tmp_new); 816 } 817 mch_remove(tmp_orig); 818 819 /* force updating cursor position on screen */ 820 curwin->w_valid_cursor.lnum = 0; 821 822 diff_redraw(TRUE); 823 824 theend: 825 vim_free(tmp_orig); 826 vim_free(tmp_new); 827 vim_free(tmp_diff); 828 } 829 830 /* 831 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff". 832 */ 833 static void 834 diff_file(tmp_orig, tmp_new, tmp_diff) 835 char_u *tmp_orig; 836 char_u *tmp_new; 837 char_u *tmp_diff; 838 { 839 char_u *cmd; 840 size_t len; 841 842 #ifdef FEAT_EVAL 843 if (*p_dex != NUL) 844 /* Use 'diffexpr' to generate the diff file. */ 845 eval_diff(tmp_orig, tmp_new, tmp_diff); 846 else 847 #endif 848 { 849 len = STRLEN(tmp_orig) + STRLEN(tmp_new) 850 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27; 851 cmd = alloc((unsigned)len); 852 if (cmd != NULL) 853 { 854 /* We don't want $DIFF_OPTIONS to get in the way. */ 855 if (getenv("DIFF_OPTIONS")) 856 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)""); 857 858 /* Build the diff command and execute it. Always use -a, binary 859 * differences are of no use. Ignore errors, diff returns 860 * non-zero when differences have been found. */ 861 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s", 862 diff_a_works == FALSE ? "" : "-a ", 863 #if defined(MSWIN) || defined(MSDOS) 864 diff_bin_works == TRUE ? "--binary " : "", 865 #else 866 "", 867 #endif 868 (diff_flags & DIFF_IWHITE) ? "-b " : "", 869 (diff_flags & DIFF_ICASE) ? "-i " : "", 870 tmp_orig, tmp_new); 871 append_redir(cmd, (int)len, p_srr, tmp_diff); 872 #ifdef FEAT_AUTOCMD 873 block_autocmds(); /* Avoid ShellCmdPost stuff */ 874 #endif 875 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT); 876 #ifdef FEAT_AUTOCMD 877 unblock_autocmds(); 878 #endif 879 vim_free(cmd); 880 } 881 } 882 } 883 884 /* 885 * Create a new version of a file from the current buffer and a diff file. 886 * The buffer is written to a file, also for unmodified buffers (the file 887 * could have been produced by autocommands, e.g. the netrw plugin). 888 */ 889 void 890 ex_diffpatch(eap) 891 exarg_T *eap; 892 { 893 char_u *tmp_orig; /* name of original temp file */ 894 char_u *tmp_new; /* name of patched temp file */ 895 char_u *buf = NULL; 896 size_t buflen; 897 win_T *old_curwin = curwin; 898 char_u *newname = NULL; /* name of patched file buffer */ 899 #ifdef UNIX 900 char_u dirbuf[MAXPATHL]; 901 char_u *fullname = NULL; 902 #endif 903 #ifdef FEAT_BROWSE 904 char_u *browseFile = NULL; 905 int browse_flag = cmdmod.browse; 906 #endif 907 struct stat st; 908 909 #ifdef FEAT_BROWSE 910 if (cmdmod.browse) 911 { 912 browseFile = do_browse(0, (char_u *)_("Patch file"), 913 eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL); 914 if (browseFile == NULL) 915 return; /* operation cancelled */ 916 eap->arg = browseFile; 917 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */ 918 } 919 #endif 920 921 /* We need two temp file names. */ 922 tmp_orig = vim_tempname('o'); 923 tmp_new = vim_tempname('n'); 924 if (tmp_orig == NULL || tmp_new == NULL) 925 goto theend; 926 927 /* Write the current buffer to "tmp_orig". */ 928 if (buf_write(curbuf, tmp_orig, NULL, 929 (linenr_T)1, curbuf->b_ml.ml_line_count, 930 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL) 931 goto theend; 932 933 #ifdef UNIX 934 /* Get the absolute path of the patchfile, changing directory below. */ 935 fullname = FullName_save(eap->arg, FALSE); 936 #endif 937 buflen = STRLEN(tmp_orig) + ( 938 # ifdef UNIX 939 fullname != NULL ? STRLEN(fullname) : 940 # endif 941 STRLEN(eap->arg)) + STRLEN(tmp_new) + 16; 942 buf = alloc((unsigned)buflen); 943 if (buf == NULL) 944 goto theend; 945 946 #ifdef UNIX 947 /* Temporarily chdir to /tmp, to avoid patching files in the current 948 * directory when the patch file contains more than one patch. When we 949 * have our own temp dir use that instead, it will be cleaned up when we 950 * exit (any .rej files created). Don't change directory if we can't 951 * return to the current. */ 952 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0) 953 dirbuf[0] = NUL; 954 else 955 { 956 # ifdef TEMPDIRNAMES 957 if (vim_tempdir != NULL) 958 ignored = mch_chdir((char *)vim_tempdir); 959 else 960 # endif 961 ignored = mch_chdir("/tmp"); 962 shorten_fnames(TRUE); 963 } 964 #endif 965 966 #ifdef FEAT_EVAL 967 if (*p_pex != NUL) 968 /* Use 'patchexpr' to generate the new file. */ 969 eval_patch(tmp_orig, 970 # ifdef UNIX 971 fullname != NULL ? fullname : 972 # endif 973 eap->arg, tmp_new); 974 else 975 #endif 976 { 977 /* Build the patch command and execute it. Ignore errors. Switch to 978 * cooked mode to allow the user to respond to prompts. */ 979 vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", 980 tmp_new, tmp_orig, 981 # ifdef UNIX 982 fullname != NULL ? fullname : 983 # endif 984 eap->arg); 985 #ifdef FEAT_AUTOCMD 986 block_autocmds(); /* Avoid ShellCmdPost stuff */ 987 #endif 988 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED); 989 #ifdef FEAT_AUTOCMD 990 unblock_autocmds(); 991 #endif 992 } 993 994 #ifdef UNIX 995 if (dirbuf[0] != NUL) 996 { 997 if (mch_chdir((char *)dirbuf) != 0) 998 EMSG(_(e_prev_dir)); 999 shorten_fnames(TRUE); 1000 } 1001 #endif 1002 1003 /* patch probably has written over the screen */ 1004 redraw_later(CLEAR); 1005 1006 /* Delete any .orig or .rej file created. */ 1007 STRCPY(buf, tmp_new); 1008 STRCAT(buf, ".orig"); 1009 mch_remove(buf); 1010 STRCPY(buf, tmp_new); 1011 STRCAT(buf, ".rej"); 1012 mch_remove(buf); 1013 1014 /* Only continue if the output file was created. */ 1015 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0) 1016 EMSG(_("E816: Cannot read patch output")); 1017 else 1018 { 1019 if (curbuf->b_fname != NULL) 1020 { 1021 newname = vim_strnsave(curbuf->b_fname, 1022 (int)(STRLEN(curbuf->b_fname) + 4)); 1023 if (newname != NULL) 1024 STRCAT(newname, ".new"); 1025 } 1026 1027 #ifdef FEAT_GUI 1028 need_mouse_correct = TRUE; 1029 #endif 1030 /* don't use a new tab page, each tab page has its own diffs */ 1031 cmdmod.tab = 0; 1032 1033 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) 1034 { 1035 /* Pretend it was a ":split fname" command */ 1036 eap->cmdidx = CMD_split; 1037 eap->arg = tmp_new; 1038 do_exedit(eap, old_curwin); 1039 1040 /* check that split worked and editing tmp_new */ 1041 if (curwin != old_curwin && win_valid(old_curwin)) 1042 { 1043 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ 1044 diff_win_options(curwin, TRUE); 1045 diff_win_options(old_curwin, TRUE); 1046 1047 if (newname != NULL) 1048 { 1049 /* do a ":file filename.new" on the patched buffer */ 1050 eap->arg = newname; 1051 ex_file(eap); 1052 1053 #ifdef FEAT_AUTOCMD 1054 /* Do filetype detection with the new name. */ 1055 if (au_has_group((char_u *)"filetypedetect")) 1056 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead"); 1057 #endif 1058 } 1059 } 1060 } 1061 } 1062 1063 theend: 1064 if (tmp_orig != NULL) 1065 mch_remove(tmp_orig); 1066 vim_free(tmp_orig); 1067 if (tmp_new != NULL) 1068 mch_remove(tmp_new); 1069 vim_free(tmp_new); 1070 vim_free(newname); 1071 vim_free(buf); 1072 #ifdef UNIX 1073 vim_free(fullname); 1074 #endif 1075 #ifdef FEAT_BROWSE 1076 vim_free(browseFile); 1077 cmdmod.browse = browse_flag; 1078 #endif 1079 } 1080 1081 /* 1082 * Split the window and edit another file, setting options to show the diffs. 1083 */ 1084 void 1085 ex_diffsplit(eap) 1086 exarg_T *eap; 1087 { 1088 win_T *old_curwin = curwin; 1089 1090 #ifdef FEAT_GUI 1091 need_mouse_correct = TRUE; 1092 #endif 1093 /* don't use a new tab page, each tab page has its own diffs */ 1094 cmdmod.tab = 0; 1095 1096 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL) 1097 { 1098 /* Pretend it was a ":split fname" command */ 1099 eap->cmdidx = CMD_split; 1100 curwin->w_p_diff = TRUE; 1101 do_exedit(eap, old_curwin); 1102 1103 if (curwin != old_curwin) /* split must have worked */ 1104 { 1105 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ 1106 diff_win_options(curwin, TRUE); 1107 diff_win_options(old_curwin, TRUE); 1108 } 1109 } 1110 } 1111 1112 /* 1113 * Set options to show diffs for the current window. 1114 */ 1115 void 1116 ex_diffthis(eap) 1117 exarg_T *eap UNUSED; 1118 { 1119 /* Set 'diff', 'scrollbind' on and 'wrap' off. */ 1120 diff_win_options(curwin, TRUE); 1121 } 1122 1123 /* 1124 * Set options in window "wp" for diff mode. 1125 */ 1126 void 1127 diff_win_options(wp, addbuf) 1128 win_T *wp; 1129 int addbuf; /* Add buffer to diff. */ 1130 { 1131 # ifdef FEAT_FOLDING 1132 win_T *old_curwin = curwin; 1133 1134 /* close the manually opened folds */ 1135 curwin = wp; 1136 newFoldLevel(); 1137 curwin = old_curwin; 1138 # endif 1139 1140 wp->w_p_diff = TRUE; 1141 /* Use 'scrollbind' and 'cursorbind' when available */ 1142 #ifdef FEAT_SCROLLBIND 1143 wp->w_p_scb = TRUE; 1144 #endif 1145 #ifdef FEAT_CURSORBIND 1146 wp->w_p_crb = TRUE; 1147 #endif 1148 wp->w_p_wrap = FALSE; 1149 # ifdef FEAT_FOLDING 1150 curwin = wp; 1151 curbuf = curwin->w_buffer; 1152 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff", 1153 OPT_LOCAL|OPT_FREE, 0); 1154 curwin = old_curwin; 1155 curbuf = curwin->w_buffer; 1156 wp->w_p_fdc = diff_foldcolumn; 1157 wp->w_p_fen = TRUE; 1158 wp->w_p_fdl = 0; 1159 foldUpdateAll(wp); 1160 /* make sure topline is not halfway a fold */ 1161 changed_window_setting_win(wp); 1162 # endif 1163 #ifdef FEAT_SCROLLBIND 1164 if (vim_strchr(p_sbo, 'h') == NULL) 1165 do_cmdline_cmd((char_u *)"set sbo+=hor"); 1166 #endif 1167 1168 if (addbuf) 1169 diff_buf_add(wp->w_buffer); 1170 redraw_win_later(wp, NOT_VALID); 1171 } 1172 1173 /* 1174 * Set options not to show diffs. For the current window or all windows. 1175 * Only in the current tab page. 1176 */ 1177 void 1178 ex_diffoff(eap) 1179 exarg_T *eap; 1180 { 1181 win_T *wp; 1182 win_T *old_curwin = curwin; 1183 #ifdef FEAT_SCROLLBIND 1184 int diffwin = FALSE; 1185 #endif 1186 1187 for (wp = firstwin; wp != NULL; wp = wp->w_next) 1188 { 1189 if (wp == curwin || (eap->forceit && wp->w_p_diff)) 1190 { 1191 /* Set 'diff', 'scrollbind' off and 'wrap' on. */ 1192 wp->w_p_diff = FALSE; 1193 RESET_BINDING(wp); 1194 wp->w_p_wrap = TRUE; 1195 #ifdef FEAT_FOLDING 1196 curwin = wp; 1197 curbuf = curwin->w_buffer; 1198 set_string_option_direct((char_u *)"fdm", -1, 1199 (char_u *)"manual", OPT_LOCAL|OPT_FREE, 0); 1200 curwin = old_curwin; 1201 curbuf = curwin->w_buffer; 1202 wp->w_p_fdc = 0; 1203 wp->w_p_fen = FALSE; 1204 wp->w_p_fdl = 0; 1205 foldUpdateAll(wp); 1206 /* make sure topline is not halfway a fold */ 1207 changed_window_setting_win(wp); 1208 #endif 1209 diff_buf_adjust(wp); 1210 } 1211 #ifdef FEAT_SCROLLBIND 1212 diffwin |= wp->w_p_diff; 1213 #endif 1214 } 1215 1216 #ifdef FEAT_SCROLLBIND 1217 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */ 1218 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL) 1219 do_cmdline_cmd((char_u *)"set sbo-=hor"); 1220 #endif 1221 } 1222 1223 /* 1224 * Read the diff output and add each entry to the diff list. 1225 */ 1226 static void 1227 diff_read(idx_orig, idx_new, fname) 1228 int idx_orig; /* idx of original file */ 1229 int idx_new; /* idx of new file */ 1230 char_u *fname; /* name of diff output file */ 1231 { 1232 FILE *fd; 1233 diff_T *dprev = NULL; 1234 diff_T *dp = curtab->tp_first_diff; 1235 diff_T *dn, *dpl; 1236 long f1, l1, f2, l2; 1237 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */ 1238 int difftype; 1239 char_u *p; 1240 long off; 1241 int i; 1242 linenr_T lnum_orig, lnum_new; 1243 long count_orig, count_new; 1244 int notset = TRUE; /* block "*dp" not set yet */ 1245 1246 fd = mch_fopen((char *)fname, "r"); 1247 if (fd == NULL) 1248 { 1249 EMSG(_("E98: Cannot read diff output")); 1250 return; 1251 } 1252 1253 for (;;) 1254 { 1255 if (tag_fgets(linebuf, LBUFLEN, fd)) 1256 break; /* end of file */ 1257 if (!isdigit(*linebuf)) 1258 continue; /* not the start of a diff block */ 1259 1260 /* This line must be one of three formats: 1261 * {first}[,{last}]c{first}[,{last}] 1262 * {first}a{first}[,{last}] 1263 * {first}[,{last}]d{first} 1264 */ 1265 p = linebuf; 1266 f1 = getdigits(&p); 1267 if (*p == ',') 1268 { 1269 ++p; 1270 l1 = getdigits(&p); 1271 } 1272 else 1273 l1 = f1; 1274 if (*p != 'a' && *p != 'c' && *p != 'd') 1275 continue; /* invalid diff format */ 1276 difftype = *p++; 1277 f2 = getdigits(&p); 1278 if (*p == ',') 1279 { 1280 ++p; 1281 l2 = getdigits(&p); 1282 } 1283 else 1284 l2 = f2; 1285 if (l1 < f1 || l2 < f2) 1286 continue; /* invalid line range */ 1287 1288 if (difftype == 'a') 1289 { 1290 lnum_orig = f1 + 1; 1291 count_orig = 0; 1292 } 1293 else 1294 { 1295 lnum_orig = f1; 1296 count_orig = l1 - f1 + 1; 1297 } 1298 if (difftype == 'd') 1299 { 1300 lnum_new = f2 + 1; 1301 count_new = 0; 1302 } 1303 else 1304 { 1305 lnum_new = f2; 1306 count_new = l2 - f2 + 1; 1307 } 1308 1309 /* Go over blocks before the change, for which orig and new are equal. 1310 * Copy blocks from orig to new. */ 1311 while (dp != NULL 1312 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig]) 1313 { 1314 if (notset) 1315 diff_copy_entry(dprev, dp, idx_orig, idx_new); 1316 dprev = dp; 1317 dp = dp->df_next; 1318 notset = TRUE; 1319 } 1320 1321 if (dp != NULL 1322 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig] 1323 && lnum_orig + count_orig >= dp->df_lnum[idx_orig]) 1324 { 1325 /* New block overlaps with existing block(s). 1326 * First find last block that overlaps. */ 1327 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next) 1328 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig]) 1329 break; 1330 1331 /* If the newly found block starts before the old one, set the 1332 * start back a number of lines. */ 1333 off = dp->df_lnum[idx_orig] - lnum_orig; 1334 if (off > 0) 1335 { 1336 for (i = idx_orig; i < idx_new; ++i) 1337 if (curtab->tp_diffbuf[i] != NULL) 1338 dp->df_lnum[i] -= off; 1339 dp->df_lnum[idx_new] = lnum_new; 1340 dp->df_count[idx_new] = count_new; 1341 } 1342 else if (notset) 1343 { 1344 /* new block inside existing one, adjust new block */ 1345 dp->df_lnum[idx_new] = lnum_new + off; 1346 dp->df_count[idx_new] = count_new - off; 1347 } 1348 else 1349 /* second overlap of new block with existing block */ 1350 dp->df_count[idx_new] += count_new - count_orig 1351 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig] 1352 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]); 1353 1354 /* Adjust the size of the block to include all the lines to the 1355 * end of the existing block or the new diff, whatever ends last. */ 1356 off = (lnum_orig + count_orig) 1357 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]); 1358 if (off < 0) 1359 { 1360 /* new change ends in existing block, adjust the end if not 1361 * done already */ 1362 if (notset) 1363 dp->df_count[idx_new] += -off; 1364 off = 0; 1365 } 1366 for (i = idx_orig; i < idx_new; ++i) 1367 if (curtab->tp_diffbuf[i] != NULL) 1368 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] 1369 - dp->df_lnum[i] + off; 1370 1371 /* Delete the diff blocks that have been merged into one. */ 1372 dn = dp->df_next; 1373 dp->df_next = dpl->df_next; 1374 while (dn != dp->df_next) 1375 { 1376 dpl = dn->df_next; 1377 vim_free(dn); 1378 dn = dpl; 1379 } 1380 } 1381 else 1382 { 1383 /* Allocate a new diffblock. */ 1384 dp = diff_alloc_new(curtab, dprev, dp); 1385 if (dp == NULL) 1386 goto done; 1387 1388 dp->df_lnum[idx_orig] = lnum_orig; 1389 dp->df_count[idx_orig] = count_orig; 1390 dp->df_lnum[idx_new] = lnum_new; 1391 dp->df_count[idx_new] = count_new; 1392 1393 /* Set values for other buffers, these must be equal to the 1394 * original buffer, otherwise there would have been a change 1395 * already. */ 1396 for (i = idx_orig + 1; i < idx_new; ++i) 1397 if (curtab->tp_diffbuf[i] != NULL) 1398 diff_copy_entry(dprev, dp, idx_orig, i); 1399 } 1400 notset = FALSE; /* "*dp" has been set */ 1401 } 1402 1403 /* for remaining diff blocks orig and new are equal */ 1404 while (dp != NULL) 1405 { 1406 if (notset) 1407 diff_copy_entry(dprev, dp, idx_orig, idx_new); 1408 dprev = dp; 1409 dp = dp->df_next; 1410 notset = TRUE; 1411 } 1412 1413 done: 1414 fclose(fd); 1415 } 1416 1417 /* 1418 * Copy an entry at "dp" from "idx_orig" to "idx_new". 1419 */ 1420 static void 1421 diff_copy_entry(dprev, dp, idx_orig, idx_new) 1422 diff_T *dprev; 1423 diff_T *dp; 1424 int idx_orig; 1425 int idx_new; 1426 { 1427 long off; 1428 1429 if (dprev == NULL) 1430 off = 0; 1431 else 1432 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig]) 1433 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]); 1434 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off; 1435 dp->df_count[idx_new] = dp->df_count[idx_orig]; 1436 } 1437 1438 /* 1439 * Clear the list of diffblocks for tab page "tp". 1440 */ 1441 void 1442 diff_clear(tp) 1443 tabpage_T *tp; 1444 { 1445 diff_T *p, *next_p; 1446 1447 for (p = tp->tp_first_diff; p != NULL; p = next_p) 1448 { 1449 next_p = p->df_next; 1450 vim_free(p); 1451 } 1452 tp->tp_first_diff = NULL; 1453 } 1454 1455 /* 1456 * Check diff status for line "lnum" in buffer "buf": 1457 * Returns 0 for nothing special 1458 * Returns -1 for a line that should be highlighted as changed. 1459 * Returns -2 for a line that should be highlighted as added/deleted. 1460 * Returns > 0 for inserting that many filler lines above it (never happens 1461 * when 'diffopt' doesn't contain "filler"). 1462 * This should only be used for windows where 'diff' is set. 1463 */ 1464 int 1465 diff_check(wp, lnum) 1466 win_T *wp; 1467 linenr_T lnum; 1468 { 1469 int idx; /* index in tp_diffbuf[] for this buffer */ 1470 diff_T *dp; 1471 int maxcount; 1472 int i; 1473 buf_T *buf = wp->w_buffer; 1474 int cmp; 1475 1476 if (curtab->tp_diff_invalid) 1477 ex_diffupdate(NULL); /* update after a big change */ 1478 1479 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */ 1480 return 0; 1481 1482 /* safety check: "lnum" must be a buffer line */ 1483 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1) 1484 return 0; 1485 1486 idx = diff_buf_idx(buf); 1487 if (idx == DB_COUNT) 1488 return 0; /* no diffs for buffer "buf" */ 1489 1490 #ifdef FEAT_FOLDING 1491 /* A closed fold never has filler lines. */ 1492 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL)) 1493 return 0; 1494 #endif 1495 1496 /* search for a change that includes "lnum" in the list of diffblocks. */ 1497 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) 1498 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) 1499 break; 1500 if (dp == NULL || lnum < dp->df_lnum[idx]) 1501 return 0; 1502 1503 if (lnum < dp->df_lnum[idx] + dp->df_count[idx]) 1504 { 1505 int zero = FALSE; 1506 1507 /* Changed or inserted line. If the other buffers have a count of 1508 * zero, the lines were inserted. If the other buffers have the same 1509 * count, check if the lines are identical. */ 1510 cmp = FALSE; 1511 for (i = 0; i < DB_COUNT; ++i) 1512 if (i != idx && curtab->tp_diffbuf[i] != NULL) 1513 { 1514 if (dp->df_count[i] == 0) 1515 zero = TRUE; 1516 else 1517 { 1518 if (dp->df_count[i] != dp->df_count[idx]) 1519 return -1; /* nr of lines changed. */ 1520 cmp = TRUE; 1521 } 1522 } 1523 if (cmp) 1524 { 1525 /* Compare all lines. If they are equal the lines were inserted 1526 * in some buffers, deleted in others, but not changed. */ 1527 for (i = 0; i < DB_COUNT; ++i) 1528 if (i != idx && curtab->tp_diffbuf[i] != NULL && dp->df_count[i] != 0) 1529 if (!diff_equal_entry(dp, idx, i)) 1530 return -1; 1531 } 1532 /* If there is no buffer with zero lines then there is no difference 1533 * any longer. Happens when making a change (or undo) that removes 1534 * the difference. Can't remove the entry here, we might be halfway 1535 * updating the window. Just report the text as unchanged. Other 1536 * windows might still show the change though. */ 1537 if (zero == FALSE) 1538 return 0; 1539 return -2; 1540 } 1541 1542 /* If 'diffopt' doesn't contain "filler", return 0. */ 1543 if (!(diff_flags & DIFF_FILLER)) 1544 return 0; 1545 1546 /* Insert filler lines above the line just below the change. Will return 1547 * 0 when this buf had the max count. */ 1548 maxcount = 0; 1549 for (i = 0; i < DB_COUNT; ++i) 1550 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount) 1551 maxcount = dp->df_count[i]; 1552 return maxcount - dp->df_count[idx]; 1553 } 1554 1555 /* 1556 * Compare two entries in diff "*dp" and return TRUE if they are equal. 1557 */ 1558 static int 1559 diff_equal_entry(dp, idx1, idx2) 1560 diff_T *dp; 1561 int idx1; 1562 int idx2; 1563 { 1564 int i; 1565 char_u *line; 1566 int cmp; 1567 1568 if (dp->df_count[idx1] != dp->df_count[idx2]) 1569 return FALSE; 1570 if (diff_check_sanity(curtab, dp) == FAIL) 1571 return FALSE; 1572 for (i = 0; i < dp->df_count[idx1]; ++i) 1573 { 1574 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1], 1575 dp->df_lnum[idx1] + i, FALSE)); 1576 if (line == NULL) 1577 return FALSE; 1578 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2], 1579 dp->df_lnum[idx2] + i, FALSE)); 1580 vim_free(line); 1581 if (cmp != 0) 1582 return FALSE; 1583 } 1584 return TRUE; 1585 } 1586 1587 /* 1588 * Compare strings "s1" and "s2" according to 'diffopt'. 1589 * Return non-zero when they are different. 1590 */ 1591 static int 1592 diff_cmp(s1, s2) 1593 char_u *s1; 1594 char_u *s2; 1595 { 1596 char_u *p1, *p2; 1597 #ifdef FEAT_MBYTE 1598 int l; 1599 #endif 1600 1601 if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0) 1602 return STRCMP(s1, s2); 1603 if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE)) 1604 return MB_STRICMP(s1, s2); 1605 1606 /* Ignore white space changes and possibly ignore case. */ 1607 p1 = s1; 1608 p2 = s2; 1609 while (*p1 != NUL && *p2 != NUL) 1610 { 1611 if (vim_iswhite(*p1) && vim_iswhite(*p2)) 1612 { 1613 p1 = skipwhite(p1); 1614 p2 = skipwhite(p2); 1615 } 1616 else 1617 { 1618 #ifdef FEAT_MBYTE 1619 l = (*mb_ptr2len)(p1); 1620 if (l != (*mb_ptr2len)(p2)) 1621 break; 1622 if (l > 1) 1623 { 1624 if (STRNCMP(p1, p2, l) != 0 1625 && (!enc_utf8 1626 || !(diff_flags & DIFF_ICASE) 1627 || utf_fold(utf_ptr2char(p1)) 1628 != utf_fold(utf_ptr2char(p2)))) 1629 break; 1630 p1 += l; 1631 p2 += l; 1632 } 1633 else 1634 #endif 1635 { 1636 if (*p1 != *p2 && (!(diff_flags & DIFF_ICASE) 1637 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2))) 1638 break; 1639 ++p1; 1640 ++p2; 1641 } 1642 } 1643 } 1644 1645 /* Ignore trailing white space. */ 1646 p1 = skipwhite(p1); 1647 p2 = skipwhite(p2); 1648 if (*p1 != NUL || *p2 != NUL) 1649 return 1; 1650 return 0; 1651 } 1652 1653 /* 1654 * Return the number of filler lines above "lnum". 1655 */ 1656 int 1657 diff_check_fill(wp, lnum) 1658 win_T *wp; 1659 linenr_T lnum; 1660 { 1661 int n; 1662 1663 /* be quick when there are no filler lines */ 1664 if (!(diff_flags & DIFF_FILLER)) 1665 return 0; 1666 n = diff_check(wp, lnum); 1667 if (n <= 0) 1668 return 0; 1669 return n; 1670 } 1671 1672 /* 1673 * Set the topline of "towin" to match the position in "fromwin", so that they 1674 * show the same diff'ed lines. 1675 */ 1676 void 1677 diff_set_topline(fromwin, towin) 1678 win_T *fromwin; 1679 win_T *towin; 1680 { 1681 buf_T *frombuf = fromwin->w_buffer; 1682 linenr_T lnum = fromwin->w_topline; 1683 int fromidx; 1684 int toidx; 1685 diff_T *dp; 1686 int max_count; 1687 int i; 1688 1689 fromidx = diff_buf_idx(frombuf); 1690 if (fromidx == DB_COUNT) 1691 return; /* safety check */ 1692 1693 if (curtab->tp_diff_invalid) 1694 ex_diffupdate(NULL); /* update after a big change */ 1695 1696 towin->w_topfill = 0; 1697 1698 /* search for a change that includes "lnum" in the list of diffblocks. */ 1699 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) 1700 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx]) 1701 break; 1702 if (dp == NULL) 1703 { 1704 /* After last change, compute topline relative to end of file; no 1705 * filler lines. */ 1706 towin->w_topline = towin->w_buffer->b_ml.ml_line_count 1707 - (frombuf->b_ml.ml_line_count - lnum); 1708 } 1709 else 1710 { 1711 /* Find index for "towin". */ 1712 toidx = diff_buf_idx(towin->w_buffer); 1713 if (toidx == DB_COUNT) 1714 return; /* safety check */ 1715 1716 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]); 1717 if (lnum >= dp->df_lnum[fromidx]) 1718 { 1719 /* Inside a change: compute filler lines. With three or more 1720 * buffers we need to know the largest count. */ 1721 max_count = 0; 1722 for (i = 0; i < DB_COUNT; ++i) 1723 if (curtab->tp_diffbuf[i] != NULL 1724 && max_count < dp->df_count[i]) 1725 max_count = dp->df_count[i]; 1726 1727 if (dp->df_count[toidx] == dp->df_count[fromidx]) 1728 { 1729 /* same number of lines: use same filler count */ 1730 towin->w_topfill = fromwin->w_topfill; 1731 } 1732 else if (dp->df_count[toidx] > dp->df_count[fromidx]) 1733 { 1734 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) 1735 { 1736 /* more lines in towin and fromwin doesn't show diff 1737 * lines, only filler lines */ 1738 if (max_count - fromwin->w_topfill >= dp->df_count[toidx]) 1739 { 1740 /* towin also only shows filler lines */ 1741 towin->w_topline = dp->df_lnum[toidx] 1742 + dp->df_count[toidx]; 1743 towin->w_topfill = fromwin->w_topfill; 1744 } 1745 else 1746 /* towin still has some diff lines to show */ 1747 towin->w_topline = dp->df_lnum[toidx] 1748 + max_count - fromwin->w_topfill; 1749 } 1750 } 1751 else if (towin->w_topline >= dp->df_lnum[toidx] 1752 + dp->df_count[toidx]) 1753 { 1754 /* less lines in towin and no diff lines to show: compute 1755 * filler lines */ 1756 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx]; 1757 if (diff_flags & DIFF_FILLER) 1758 { 1759 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx]) 1760 /* fromwin is also out of diff lines */ 1761 towin->w_topfill = fromwin->w_topfill; 1762 else 1763 /* fromwin has some diff lines */ 1764 towin->w_topfill = dp->df_lnum[fromidx] 1765 + max_count - lnum; 1766 } 1767 } 1768 } 1769 } 1770 1771 /* safety check (if diff info gets outdated strange things may happen) */ 1772 towin->w_botfill = FALSE; 1773 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count) 1774 { 1775 towin->w_topline = towin->w_buffer->b_ml.ml_line_count; 1776 towin->w_botfill = TRUE; 1777 } 1778 if (towin->w_topline < 1) 1779 { 1780 towin->w_topline = 1; 1781 towin->w_topfill = 0; 1782 } 1783 1784 /* When w_topline changes need to recompute w_botline and cursor position */ 1785 invalidate_botline_win(towin); 1786 changed_line_abv_curs_win(towin); 1787 1788 check_topfill(towin, FALSE); 1789 #ifdef FEAT_FOLDING 1790 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline, 1791 NULL, TRUE, NULL); 1792 #endif 1793 } 1794 1795 /* 1796 * This is called when 'diffopt' is changed. 1797 */ 1798 int 1799 diffopt_changed() 1800 { 1801 char_u *p; 1802 int diff_context_new = 6; 1803 int diff_flags_new = 0; 1804 int diff_foldcolumn_new = 2; 1805 tabpage_T *tp; 1806 1807 p = p_dip; 1808 while (*p != NUL) 1809 { 1810 if (STRNCMP(p, "filler", 6) == 0) 1811 { 1812 p += 6; 1813 diff_flags_new |= DIFF_FILLER; 1814 } 1815 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8])) 1816 { 1817 p += 8; 1818 diff_context_new = getdigits(&p); 1819 } 1820 else if (STRNCMP(p, "icase", 5) == 0) 1821 { 1822 p += 5; 1823 diff_flags_new |= DIFF_ICASE; 1824 } 1825 else if (STRNCMP(p, "iwhite", 6) == 0) 1826 { 1827 p += 6; 1828 diff_flags_new |= DIFF_IWHITE; 1829 } 1830 else if (STRNCMP(p, "horizontal", 10) == 0) 1831 { 1832 p += 10; 1833 diff_flags_new |= DIFF_HORIZONTAL; 1834 } 1835 else if (STRNCMP(p, "vertical", 8) == 0) 1836 { 1837 p += 8; 1838 diff_flags_new |= DIFF_VERTICAL; 1839 } 1840 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11])) 1841 { 1842 p += 11; 1843 diff_foldcolumn_new = getdigits(&p); 1844 } 1845 if (*p != ',' && *p != NUL) 1846 return FAIL; 1847 if (*p == ',') 1848 ++p; 1849 } 1850 1851 /* Can't have both "horizontal" and "vertical". */ 1852 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL)) 1853 return FAIL; 1854 1855 /* If "icase" or "iwhite" was added or removed, need to update the diff. */ 1856 if (diff_flags != diff_flags_new) 1857 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) 1858 tp->tp_diff_invalid = TRUE; 1859 1860 diff_flags = diff_flags_new; 1861 diff_context = diff_context_new; 1862 diff_foldcolumn = diff_foldcolumn_new; 1863 1864 diff_redraw(TRUE); 1865 1866 /* recompute the scroll binding with the new option value, may 1867 * remove or add filler lines */ 1868 check_scrollbind((linenr_T)0, 0L); 1869 1870 return OK; 1871 } 1872 1873 /* 1874 * Return TRUE if 'diffopt' contains "horizontal". 1875 */ 1876 int 1877 diffopt_horizontal() 1878 { 1879 return (diff_flags & DIFF_HORIZONTAL) != 0; 1880 } 1881 1882 /* 1883 * Find the difference within a changed line. 1884 * Returns TRUE if the line was added, no other buffer has it. 1885 */ 1886 int 1887 diff_find_change(wp, lnum, startp, endp) 1888 win_T *wp; 1889 linenr_T lnum; 1890 int *startp; /* first char of the change */ 1891 int *endp; /* last char of the change */ 1892 { 1893 char_u *line_org; 1894 char_u *line_new; 1895 int i; 1896 int si_org, si_new; 1897 int ei_org, ei_new; 1898 diff_T *dp; 1899 int idx; 1900 int off; 1901 int added = TRUE; 1902 1903 /* Make a copy of the line, the next ml_get() will invalidate it. */ 1904 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE)); 1905 if (line_org == NULL) 1906 return FALSE; 1907 1908 idx = diff_buf_idx(wp->w_buffer); 1909 if (idx == DB_COUNT) /* cannot happen */ 1910 { 1911 vim_free(line_org); 1912 return FALSE; 1913 } 1914 1915 /* search for a change that includes "lnum" in the list of diffblocks. */ 1916 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) 1917 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) 1918 break; 1919 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL) 1920 { 1921 vim_free(line_org); 1922 return FALSE; 1923 } 1924 1925 off = lnum - dp->df_lnum[idx]; 1926 1927 for (i = 0; i < DB_COUNT; ++i) 1928 if (curtab->tp_diffbuf[i] != NULL && i != idx) 1929 { 1930 /* Skip lines that are not in the other change (filler lines). */ 1931 if (off >= dp->df_count[i]) 1932 continue; 1933 added = FALSE; 1934 line_new = ml_get_buf(curtab->tp_diffbuf[i], 1935 dp->df_lnum[i] + off, FALSE); 1936 1937 /* Search for start of difference */ 1938 si_org = si_new = 0; 1939 while (line_org[si_org] != NUL) 1940 { 1941 if ((diff_flags & DIFF_IWHITE) 1942 && vim_iswhite(line_org[si_org]) 1943 && vim_iswhite(line_new[si_new])) 1944 { 1945 si_org = (int)(skipwhite(line_org + si_org) - line_org); 1946 si_new = (int)(skipwhite(line_new + si_new) - line_new); 1947 } 1948 else 1949 { 1950 if (line_org[si_org] != line_new[si_new]) 1951 break; 1952 ++si_org; 1953 ++si_new; 1954 } 1955 } 1956 #ifdef FEAT_MBYTE 1957 if (has_mbyte) 1958 { 1959 /* Move back to first byte of character in both lines (may 1960 * have "nn^" in line_org and "n^ in line_new). */ 1961 si_org -= (*mb_head_off)(line_org, line_org + si_org); 1962 si_new -= (*mb_head_off)(line_new, line_new + si_new); 1963 } 1964 #endif 1965 if (*startp > si_org) 1966 *startp = si_org; 1967 1968 /* Search for end of difference, if any. */ 1969 if (line_org[si_org] != NUL || line_new[si_new] != NUL) 1970 { 1971 ei_org = (int)STRLEN(line_org); 1972 ei_new = (int)STRLEN(line_new); 1973 while (ei_org >= *startp && ei_new >= si_new 1974 && ei_org >= 0 && ei_new >= 0) 1975 { 1976 if ((diff_flags & DIFF_IWHITE) 1977 && vim_iswhite(line_org[ei_org]) 1978 && vim_iswhite(line_new[ei_new])) 1979 { 1980 while (ei_org >= *startp 1981 && vim_iswhite(line_org[ei_org])) 1982 --ei_org; 1983 while (ei_new >= si_new 1984 && vim_iswhite(line_new[ei_new])) 1985 --ei_new; 1986 } 1987 else 1988 { 1989 if (line_org[ei_org] != line_new[ei_new]) 1990 break; 1991 --ei_org; 1992 --ei_new; 1993 } 1994 } 1995 if (*endp < ei_org) 1996 *endp = ei_org; 1997 } 1998 } 1999 2000 vim_free(line_org); 2001 return added; 2002 } 2003 2004 #if defined(FEAT_FOLDING) || defined(PROTO) 2005 /* 2006 * Return TRUE if line "lnum" is not close to a diff block, this line should 2007 * be in a fold. 2008 * Return FALSE if there are no diff blocks at all in this window. 2009 */ 2010 int 2011 diff_infold(wp, lnum) 2012 win_T *wp; 2013 linenr_T lnum; 2014 { 2015 int i; 2016 int idx = -1; 2017 int other = FALSE; 2018 diff_T *dp; 2019 2020 /* Return if 'diff' isn't set. */ 2021 if (!wp->w_p_diff) 2022 return FALSE; 2023 2024 for (i = 0; i < DB_COUNT; ++i) 2025 { 2026 if (curtab->tp_diffbuf[i] == wp->w_buffer) 2027 idx = i; 2028 else if (curtab->tp_diffbuf[i] != NULL) 2029 other = TRUE; 2030 } 2031 2032 /* return here if there are no diffs in the window */ 2033 if (idx == -1 || !other) 2034 return FALSE; 2035 2036 if (curtab->tp_diff_invalid) 2037 ex_diffupdate(NULL); /* update after a big change */ 2038 2039 /* Return if there are no diff blocks. All lines will be folded. */ 2040 if (curtab->tp_first_diff == NULL) 2041 return TRUE; 2042 2043 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) 2044 { 2045 /* If this change is below the line there can't be any further match. */ 2046 if (dp->df_lnum[idx] - diff_context > lnum) 2047 break; 2048 /* If this change ends before the line we have a match. */ 2049 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum) 2050 return FALSE; 2051 } 2052 return TRUE; 2053 } 2054 #endif 2055 2056 /* 2057 * "dp" and "do" commands. 2058 */ 2059 void 2060 nv_diffgetput(put) 2061 int put; 2062 { 2063 exarg_T ea; 2064 2065 ea.arg = (char_u *)""; 2066 if (put) 2067 ea.cmdidx = CMD_diffput; 2068 else 2069 ea.cmdidx = CMD_diffget; 2070 ea.addr_count = 0; 2071 ea.line1 = curwin->w_cursor.lnum; 2072 ea.line2 = curwin->w_cursor.lnum; 2073 ex_diffgetput(&ea); 2074 } 2075 2076 /* 2077 * ":diffget" 2078 * ":diffput" 2079 */ 2080 void 2081 ex_diffgetput(eap) 2082 exarg_T *eap; 2083 { 2084 linenr_T lnum; 2085 int count; 2086 linenr_T off = 0; 2087 diff_T *dp; 2088 diff_T *dprev; 2089 diff_T *dfree; 2090 int idx_cur; 2091 int idx_other; 2092 int idx_from; 2093 int idx_to; 2094 int i; 2095 int added; 2096 char_u *p; 2097 aco_save_T aco; 2098 buf_T *buf; 2099 int start_skip, end_skip; 2100 int new_count; 2101 int buf_empty; 2102 int found_not_ma = FALSE; 2103 2104 /* Find the current buffer in the list of diff buffers. */ 2105 idx_cur = diff_buf_idx(curbuf); 2106 if (idx_cur == DB_COUNT) 2107 { 2108 EMSG(_("E99: Current buffer is not in diff mode")); 2109 return; 2110 } 2111 2112 if (*eap->arg == NUL) 2113 { 2114 /* No argument: Find the other buffer in the list of diff buffers. */ 2115 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other) 2116 if (curtab->tp_diffbuf[idx_other] != curbuf 2117 && curtab->tp_diffbuf[idx_other] != NULL) 2118 { 2119 if (eap->cmdidx != CMD_diffput 2120 || curtab->tp_diffbuf[idx_other]->b_p_ma) 2121 break; 2122 found_not_ma = TRUE; 2123 } 2124 if (idx_other == DB_COUNT) 2125 { 2126 if (found_not_ma) 2127 EMSG(_("E793: No other buffer in diff mode is modifiable")); 2128 else 2129 EMSG(_("E100: No other buffer in diff mode")); 2130 return; 2131 } 2132 2133 /* Check that there isn't a third buffer in the list */ 2134 for (i = idx_other + 1; i < DB_COUNT; ++i) 2135 if (curtab->tp_diffbuf[i] != curbuf 2136 && curtab->tp_diffbuf[i] != NULL 2137 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma)) 2138 { 2139 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use")); 2140 return; 2141 } 2142 } 2143 else 2144 { 2145 /* Buffer number or pattern given. Ignore trailing white space. */ 2146 p = eap->arg + STRLEN(eap->arg); 2147 while (p > eap->arg && vim_iswhite(p[-1])) 2148 --p; 2149 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i) 2150 ; 2151 if (eap->arg + i == p) /* digits only */ 2152 i = atol((char *)eap->arg); 2153 else 2154 { 2155 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE); 2156 if (i < 0) 2157 return; /* error message already given */ 2158 } 2159 buf = buflist_findnr(i); 2160 if (buf == NULL) 2161 { 2162 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg); 2163 return; 2164 } 2165 if (buf == curbuf) 2166 return; /* nothing to do */ 2167 idx_other = diff_buf_idx(buf); 2168 if (idx_other == DB_COUNT) 2169 { 2170 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg); 2171 return; 2172 } 2173 } 2174 2175 diff_busy = TRUE; 2176 2177 /* When no range given include the line above or below the cursor. */ 2178 if (eap->addr_count == 0) 2179 { 2180 /* Make it possible that ":diffget" on the last line gets line below 2181 * the cursor line when there is no difference above the cursor. */ 2182 if (eap->cmdidx == CMD_diffget 2183 && eap->line1 == curbuf->b_ml.ml_line_count 2184 && diff_check(curwin, eap->line1) == 0 2185 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0)) 2186 ++eap->line2; 2187 else if (eap->line1 > 0) 2188 --eap->line1; 2189 } 2190 2191 if (eap->cmdidx == CMD_diffget) 2192 { 2193 idx_from = idx_other; 2194 idx_to = idx_cur; 2195 } 2196 else 2197 { 2198 idx_from = idx_cur; 2199 idx_to = idx_other; 2200 /* Need to make the other buffer the current buffer to be able to make 2201 * changes in it. */ 2202 /* set curwin/curbuf to buf and save a few things */ 2203 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]); 2204 } 2205 2206 /* May give the warning for a changed buffer here, which can trigger the 2207 * FileChangedRO autocommand, which may do nasty things and mess 2208 * everything up. */ 2209 if (!curbuf->b_changed) 2210 { 2211 change_warning(0); 2212 if (diff_buf_idx(curbuf) != idx_to) 2213 { 2214 EMSG(_("E787: Buffer changed unexpectedly")); 2215 return; 2216 } 2217 } 2218 2219 dprev = NULL; 2220 for (dp = curtab->tp_first_diff; dp != NULL; ) 2221 { 2222 if (dp->df_lnum[idx_cur] > eap->line2 + off) 2223 break; /* past the range that was specified */ 2224 2225 dfree = NULL; 2226 lnum = dp->df_lnum[idx_to]; 2227 count = dp->df_count[idx_to]; 2228 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off 2229 && u_save(lnum - 1, lnum + count) != FAIL) 2230 { 2231 /* Inside the specified range and saving for undo worked. */ 2232 start_skip = 0; 2233 end_skip = 0; 2234 if (eap->addr_count > 0) 2235 { 2236 /* A range was specified: check if lines need to be skipped. */ 2237 start_skip = eap->line1 + off - dp->df_lnum[idx_cur]; 2238 if (start_skip > 0) 2239 { 2240 /* range starts below start of current diff block */ 2241 if (start_skip > count) 2242 { 2243 lnum += count; 2244 count = 0; 2245 } 2246 else 2247 { 2248 count -= start_skip; 2249 lnum += start_skip; 2250 } 2251 } 2252 else 2253 start_skip = 0; 2254 2255 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1 2256 - (eap->line2 + off); 2257 if (end_skip > 0) 2258 { 2259 /* range ends above end of current/from diff block */ 2260 if (idx_cur == idx_from) /* :diffput */ 2261 { 2262 i = dp->df_count[idx_cur] - start_skip - end_skip; 2263 if (count > i) 2264 count = i; 2265 } 2266 else /* :diffget */ 2267 { 2268 count -= end_skip; 2269 end_skip = dp->df_count[idx_from] - start_skip - count; 2270 if (end_skip < 0) 2271 end_skip = 0; 2272 } 2273 } 2274 else 2275 end_skip = 0; 2276 } 2277 2278 buf_empty = FALSE; 2279 added = 0; 2280 for (i = 0; i < count; ++i) 2281 { 2282 /* remember deleting the last line of the buffer */ 2283 buf_empty = curbuf->b_ml.ml_line_count == 1; 2284 ml_delete(lnum, FALSE); 2285 --added; 2286 } 2287 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i) 2288 { 2289 linenr_T nr; 2290 2291 nr = dp->df_lnum[idx_from] + start_skip + i; 2292 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count) 2293 break; 2294 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from], 2295 nr, FALSE)); 2296 if (p != NULL) 2297 { 2298 ml_append(lnum + i - 1, p, 0, FALSE); 2299 vim_free(p); 2300 ++added; 2301 if (buf_empty && curbuf->b_ml.ml_line_count == 2) 2302 { 2303 /* Added the first line into an empty buffer, need to 2304 * delete the dummy empty line. */ 2305 buf_empty = FALSE; 2306 ml_delete((linenr_T)2, FALSE); 2307 } 2308 } 2309 } 2310 new_count = dp->df_count[idx_to] + added; 2311 dp->df_count[idx_to] = new_count; 2312 2313 if (start_skip == 0 && end_skip == 0) 2314 { 2315 /* Check if there are any other buffers and if the diff is 2316 * equal in them. */ 2317 for (i = 0; i < DB_COUNT; ++i) 2318 if (curtab->tp_diffbuf[i] != NULL && i != idx_from 2319 && i != idx_to 2320 && !diff_equal_entry(dp, idx_from, i)) 2321 break; 2322 if (i == DB_COUNT) 2323 { 2324 /* delete the diff entry, the buffers are now equal here */ 2325 dfree = dp; 2326 dp = dp->df_next; 2327 if (dprev == NULL) 2328 curtab->tp_first_diff = dp; 2329 else 2330 dprev->df_next = dp; 2331 } 2332 } 2333 2334 /* Adjust marks. This will change the following entries! */ 2335 if (added != 0) 2336 { 2337 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added); 2338 if (curwin->w_cursor.lnum >= lnum) 2339 { 2340 /* Adjust the cursor position if it's in/after the changed 2341 * lines. */ 2342 if (curwin->w_cursor.lnum >= lnum + count) 2343 curwin->w_cursor.lnum += added; 2344 else if (added < 0) 2345 curwin->w_cursor.lnum = lnum; 2346 } 2347 } 2348 changed_lines(lnum, 0, lnum + count, (long)added); 2349 2350 if (dfree != NULL) 2351 { 2352 /* Diff is deleted, update folds in other windows. */ 2353 #ifdef FEAT_FOLDING 2354 diff_fold_update(dfree, idx_to); 2355 #endif 2356 vim_free(dfree); 2357 } 2358 else 2359 /* mark_adjust() may have changed the count in a wrong way */ 2360 dp->df_count[idx_to] = new_count; 2361 2362 /* When changing the current buffer, keep track of line numbers */ 2363 if (idx_cur == idx_to) 2364 off += added; 2365 } 2366 2367 /* If before the range or not deleted, go to next diff. */ 2368 if (dfree == NULL) 2369 { 2370 dprev = dp; 2371 dp = dp->df_next; 2372 } 2373 } 2374 2375 /* restore curwin/curbuf and a few other things */ 2376 if (eap->cmdidx != CMD_diffget) 2377 { 2378 /* Syncing undo only works for the current buffer, but we change 2379 * another buffer. Sync undo if the command was typed. This isn't 2380 * 100% right when ":diffput" is used in a function or mapping. */ 2381 if (KeyTyped) 2382 u_sync(FALSE); 2383 aucmd_restbuf(&aco); 2384 } 2385 2386 diff_busy = FALSE; 2387 2388 /* Check that the cursor is on a valid character and update it's position. 2389 * When there were filler lines the topline has become invalid. */ 2390 check_cursor(); 2391 changed_line_abv_curs(); 2392 2393 /* Also need to redraw the other buffers. */ 2394 diff_redraw(FALSE); 2395 } 2396 2397 #ifdef FEAT_FOLDING 2398 /* 2399 * Update folds for all diff buffers for entry "dp". 2400 * Skip buffer with index "skip_idx". 2401 * When there are no diffs, all folds are removed. 2402 */ 2403 static void 2404 diff_fold_update(dp, skip_idx) 2405 diff_T *dp; 2406 int skip_idx; 2407 { 2408 int i; 2409 win_T *wp; 2410 2411 for (wp = firstwin; wp != NULL; wp = wp->w_next) 2412 for (i = 0; i < DB_COUNT; ++i) 2413 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx) 2414 foldUpdate(wp, dp->df_lnum[i], 2415 dp->df_lnum[i] + dp->df_count[i]); 2416 } 2417 #endif 2418 2419 /* 2420 * Return TRUE if buffer "buf" is in diff-mode. 2421 */ 2422 int 2423 diff_mode_buf(buf) 2424 buf_T *buf; 2425 { 2426 tabpage_T *tp; 2427 2428 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) 2429 if (diff_buf_idx_tp(buf, tp) != DB_COUNT) 2430 return TRUE; 2431 return FALSE; 2432 } 2433 2434 /* 2435 * Move "count" times in direction "dir" to the next diff block. 2436 * Return FAIL if there isn't such a diff block. 2437 */ 2438 int 2439 diff_move_to(dir, count) 2440 int dir; 2441 long count; 2442 { 2443 int idx; 2444 linenr_T lnum = curwin->w_cursor.lnum; 2445 diff_T *dp; 2446 2447 idx = diff_buf_idx(curbuf); 2448 if (idx == DB_COUNT || curtab->tp_first_diff == NULL) 2449 return FAIL; 2450 2451 if (curtab->tp_diff_invalid) 2452 ex_diffupdate(NULL); /* update after a big change */ 2453 2454 if (curtab->tp_first_diff == NULL) /* no diffs today */ 2455 return FAIL; 2456 2457 while (--count >= 0) 2458 { 2459 /* Check if already before first diff. */ 2460 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx]) 2461 break; 2462 2463 for (dp = curtab->tp_first_diff; ; dp = dp->df_next) 2464 { 2465 if (dp == NULL) 2466 break; 2467 if ((dir == FORWARD && lnum < dp->df_lnum[idx]) 2468 || (dir == BACKWARD 2469 && (dp->df_next == NULL 2470 || lnum <= dp->df_next->df_lnum[idx]))) 2471 { 2472 lnum = dp->df_lnum[idx]; 2473 break; 2474 } 2475 } 2476 } 2477 2478 /* don't end up past the end of the file */ 2479 if (lnum > curbuf->b_ml.ml_line_count) 2480 lnum = curbuf->b_ml.ml_line_count; 2481 2482 /* When the cursor didn't move at all we fail. */ 2483 if (lnum == curwin->w_cursor.lnum) 2484 return FAIL; 2485 2486 setpcmark(); 2487 curwin->w_cursor.lnum = lnum; 2488 curwin->w_cursor.col = 0; 2489 2490 return OK; 2491 } 2492 2493 #if defined(FEAT_CURSORBIND) || defined(PROTO) 2494 linenr_T 2495 diff_get_corresponding_line(buf1, lnum1, buf2, lnum3) 2496 buf_T *buf1; 2497 linenr_T lnum1; 2498 buf_T *buf2; 2499 linenr_T lnum3; 2500 { 2501 int idx1; 2502 int idx2; 2503 diff_T *dp; 2504 int baseline = 0; 2505 linenr_T lnum2; 2506 2507 idx1 = diff_buf_idx(buf1); 2508 idx2 = diff_buf_idx(buf2); 2509 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL) 2510 return lnum1; 2511 2512 if (curtab->tp_diff_invalid) 2513 ex_diffupdate(NULL); /* update after a big change */ 2514 2515 if (curtab->tp_first_diff == NULL) /* no diffs today */ 2516 return lnum1; 2517 2518 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) 2519 { 2520 if (dp->df_lnum[idx1] > lnum1) 2521 { 2522 lnum2 = lnum1 - baseline; 2523 /* don't end up past the end of the file */ 2524 if (lnum2 > buf2->b_ml.ml_line_count) 2525 lnum2 = buf2->b_ml.ml_line_count; 2526 2527 return lnum2; 2528 } 2529 else if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1) 2530 { 2531 /* Inside the diffblock */ 2532 baseline = lnum1 - dp->df_lnum[idx1]; 2533 if (baseline > dp->df_count[idx2]) 2534 baseline = dp->df_count[idx2]; 2535 2536 return dp->df_lnum[idx2] + baseline; 2537 } 2538 else if ( (dp->df_lnum[idx1] == lnum1) 2539 && (dp->df_count[idx1] == 0) 2540 && (dp->df_lnum[idx2] <= lnum3) 2541 && ((dp->df_lnum[idx2] + dp->df_count[idx2]) > lnum3)) 2542 /* 2543 * Special case: if the cursor is just after a zero-count 2544 * block (i.e. all filler) and the target cursor is already 2545 * inside the corresponding block, leave the target cursor 2546 * unmoved. This makes repeated CTRL-W W operations work 2547 * as expected. 2548 */ 2549 return lnum3; 2550 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1]) 2551 - (dp->df_lnum[idx2] + dp->df_count[idx2]); 2552 } 2553 2554 /* If we get here then the cursor is after the last diff */ 2555 lnum2 = lnum1 - baseline; 2556 /* don't end up past the end of the file */ 2557 if (lnum2 > buf2->b_ml.ml_line_count) 2558 lnum2 = buf2->b_ml.ml_line_count; 2559 2560 return lnum2; 2561 } 2562 #endif 2563 2564 #if defined(FEAT_FOLDING) || defined(PROTO) 2565 /* 2566 * For line "lnum" in the current window find the equivalent lnum in window 2567 * "wp", compensating for inserted/deleted lines. 2568 */ 2569 linenr_T 2570 diff_lnum_win(lnum, wp) 2571 linenr_T lnum; 2572 win_T *wp; 2573 { 2574 diff_T *dp; 2575 int idx; 2576 int i; 2577 linenr_T n; 2578 2579 idx = diff_buf_idx(curbuf); 2580 if (idx == DB_COUNT) /* safety check */ 2581 return (linenr_T)0; 2582 2583 if (curtab->tp_diff_invalid) 2584 ex_diffupdate(NULL); /* update after a big change */ 2585 2586 /* search for a change that includes "lnum" in the list of diffblocks. */ 2587 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) 2588 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) 2589 break; 2590 2591 /* When after the last change, compute relative to the last line number. */ 2592 if (dp == NULL) 2593 return wp->w_buffer->b_ml.ml_line_count 2594 - (curbuf->b_ml.ml_line_count - lnum); 2595 2596 /* Find index for "wp". */ 2597 i = diff_buf_idx(wp->w_buffer); 2598 if (i == DB_COUNT) /* safety check */ 2599 return (linenr_T)0; 2600 2601 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]); 2602 if (n > dp->df_lnum[i] + dp->df_count[i]) 2603 n = dp->df_lnum[i] + dp->df_count[i]; 2604 return n; 2605 } 2606 #endif 2607 2608 #endif /* FEAT_DIFF */ 2609