emacs: lisp/ediff-diff.el comparison

comparison lisp/ediff-diff.el @ 49588:37645a051842

Trailing whitespace deleted.

author	Juanma Barranquero <lekktu@gmail.com>
date	Tue, 04 Feb 2003 11:26:42 +0000
parents	1b4ba54b52de
children	695cf19ef79e d7ddb3e565de

comparison

equal deleted inserted replaced

-:e82b3fe06d4c
+:37645a051842
 are `-I REGEXP', to ignore changes whose lines match the REGEXP."
 :type '(repeat string)
 :group 'ediff-diff)
 (defcustom ediff-diff-options ""
 "*Options to pass to `ediff-diff-program'.
 If Unix diff is used as `ediff-diff-program', then the most useful options are
 `-w', to ignore space, and `-i', to ignore case of letters.
 At present, the option `-c' is not allowed."
 :set 'ediff-reset-diff-options
 :type 'string
 ;; keeps the status of the current diff in 3-way jobs.
 ;; the status can be =diff(A), =diff(B), or =diff(A+B)
 (ediff-defvar-local ediff-diff-status "" "")
 ;;; Fine differences
 (ediff-defvar-local ediff-auto-refine (if (ediff-has-face-support-p) 'on 'nix)
 "If `on', Ediff auto-highlights fine diffs for the current diff region.
 If `off', auto-highlighting is not used. If `nix', no fine diffs are shown
 This variable can be set either in .emacs or toggled interactively.
 Use `setq-default' if setting it in .emacs")
 (ediff-defvar-local ediff-auto-refine-limit 1400
 "*Auto-refine only the regions of this size \(in bytes\) or less.")
 ;;; General
 (defvar ediff-diff-ok-lines-regexp
 (concat
 "^\\("
 The function should take three mandatory arguments, file-A, file-B, and
 file-C. It may ignore file C for diff2 jobs. It should also take
 one optional arguments, diff-number to refine.")
 ;;; Functions
 ;; Generate the difference vector and overlays for the two files
 ;; With optional arg REG-TO-REFINE, refine this region.
 ;; File-C argument is not used here. It is there just because
 ;; ediff-setup-diff-regions3, which takes 4 arguments.
 (defun ediff-setup-diff-regions (file-A file-B file-C)
 ;; looking either for '-c' or a 'c' in a set of clustered non-long options
 (if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options)
 (error "Option `-c' is not allowed in `ediff-diff-options'"))
 ;; create, if it doesn't exist
 (or (ediff-buffer-live-p ediff-diff-buffer)
 (setq ediff-diff-buffer
 	    (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
 (ediff-make-diff2-buffer ediff-diff-buffer file-A file-B)
 				 'synchronize
 				 ediff-diff-options file1 file2)
 	     (message "")
 	     (ediff-with-current-buffer diff-buffer
 	       (buffer-size))))))
 ;; If file-A/B/C is nil, do 2-way comparison with the non-nil buffers
 ;; This function works for diff3 and diff2 jobs
 (defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num)
 (or (ediff-buffer-live-p ediff-fine-diff-buffer)
 (setq ediff-fine-diff-buffer
 	    (get-buffer-create
 	     (ediff-unique-buffer-name "*ediff-fine-diff" "*"))))
 (let (diff3-job diff-program diff-options ok-regexp diff-list)
 (setq diff3-job ediff-3way-job
 	  diff-program (if diff3-job ediff-diff3-program ediff-diff-program)
 	  diff-options (if diff3-job ediff-diff3-options ediff-diff-options)
 	  ok-regexp (if diff3-job
 			ediff-diff3-ok-lines-regexp
 			ediff-diff-ok-lines-regexp))
 (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num))
 (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize
 			diff-options
 			;; The shuffle below is because we can compare 3-way
 			;; or in several 2-way fashions, like fA fC, fA fB,
 			(if file-A file-A file-B)
 			(if file-B file-B file-A)
 			(if diff3-job
 			    (if file-C file-C file-B))
 			) ; exec process
 (ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer)
 (ediff-message-if-verbose
 "")
 ;; "Refining difference region %d ... done" (1+ reg-num))
 (setq diff-list
 	  (if diff3-job
 	      (ediff-extract-diffs3
 	       ediff-fine-diff-buffer '3way-comparison 'word-mode)
 	    (ediff-extract-diffs ediff-fine-diff-buffer 'word-mode)))
 	       (mapcar (lambda (elt)
 			 (aset elt 4 nil)
 			 (aset elt 5 nil))
 		       (cdr diff-list)))
 	  ))
 (ediff-convert-fine-diffs-to-overlays diff-list reg-num)
 ))
 (defun ediff-prepare-error-list (ok-regexp diff-buff)
 (or (ediff-buffer-live-p ediff-error-buffer)
 (setq ediff-error-buffer
 	    (get-buffer-create (ediff-unique-buffer-name
 				"*ediff-errors" "*"))))
 	(a-prev 1) ; this is needed to set the first diff line correctly
 	(b-prev 1)
 	(c-prev 1)
 	diff-list shift-A shift-B
 	)
 ;; diff list contains word numbers, unless changed later
 (setq diff-list (cons (if word-mode 'words 'points)
 			  diff-list))
 ;; we don't use visibility bounds for buffer C when merging
 (if bounds
 	      (ediff-overlay-start
 	       (ediff-get-value-according-to-buffer-type 'A bounds))
 	      shift-B
 	      (ediff-overlay-start
 	       (ediff-get-value-according-to-buffer-type 'B bounds))))
 ;; reset point in buffers A/B/C
 (ediff-with-current-buffer A-buffer
 (goto-char (if shift-A shift-A (point-min))))
 (ediff-with-current-buffer B-buffer
 (goto-char (if shift-B shift-B (point-min))))
 (if (ediff-buffer-live-p C-buffer)
 	(ediff-with-current-buffer C-buffer
 	  (goto-char (point-min))))
 (ediff-with-current-buffer diff-buffer
 (goto-char (point-min))
 (while (re-search-forward ediff-match-diff-line nil t)
 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
 							(match-end 1))))
 		     b-begin (1+ b-begin)
 		     b-end b-begin)
 	     ;; (string-equal diff-type "c")
 	     (setq a-end (1+ a-end)
 		   b-end (1+ b-end))))
 	 (if (eq ediff-default-variant 'default-B)
 	     (setq c-begin b-begin
 		   c-end b-end)
 	   (setq c-begin a-begin
 		 c-end a-end))
 	 ;; compute main diff vector
 	 (if word-mode
 	     ;; make diff-list contain word numbers
 	     (setq diff-list
 		   (nconc diff-list
 			     nil nil	; dummy ancestor
 			     nil nil	; dummy state of diff & merge
 			     nil	; dummy state of ancestor
 			     )))
 		  )))
 	 ))) ; end ediff-with-current-buffer
 diff-list
 ))
 (defun ediff-convert-diffs-to-overlays (diff-list)
 (ediff-set-diff-overlays-in-one-buffer 'A diff-list)
 (ediff-set-diff-overlays-in-one-buffer 'B diff-list)
 (if ediff-3way-job
 		     ;; the first elt designates type of list
 		     (cdr diff-list))
 	     )))
 (message "Processing difference regions ... done"))
 (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list)
 (let* ((current-diff -1)
 	 (buff (ediff-get-buffer buf-type))
 	 ;; ediff-extract-diffs puts the type of diff-list as the first elt
 	 ;; of this list. The type is either 'points or 'words
 	 diff-overlay-list list-element total-diffs
 	 begin end pt-saved overlay state-of-diff)
 (setq diff-list (cdr diff-list)) ; discard diff list type
 (setq total-diffs (length diff-list))
 ;; shift, if necessary
 (ediff-with-current-buffer buff (setq pt-saved shift))
 (while diff-list
 (setq current-diff (1+ current-diff)
 	    list-element (car diff-list)
 	    begin 	 (aref list-element (cond ((eq buf-type 'A) 0)
 						  ((eq buf-type 'B) 2)
 						  ((eq buf-type 'B) 3)
 						  ((eq buf-type 'C) 5)
 						  (t 7)))  ; Ancestor
 	    state-of-diff (aref list-element 8)
 	    )
 (cond ((and (not (eq buf-type state-of-diff))
 		  (not (eq buf-type 'Ancestor))
 		  (memq state-of-diff '(A B C)))
 	     (setq state-of-diff
 		   (car (delq buf-type (delq state-of-diff (list 'A 'B 'C)))))
 	     (setq state-of-diff (format "=diff(%S)" state-of-diff))
 	     )
 	    (t (setq state-of-diff nil)))
 ;; Put overlays at appropriate places in buffer
 ;; convert word numbers to points, if necessary
 (if (eq diff-list-type 'words)
 	  (progn
 	    (ediff-with-current-buffer buff (goto-char pt-saved))
 		  end (ediff-goto-word end buff 'end))
 	    (if (> end limit) (setq end limit))
 	    (if (> begin end) (setq begin end))
 	    (setq pt-saved (ediff-with-current-buffer buff (point)))))
 (setq overlay (ediff-make-bullet-proof-overlay begin end buff))
 (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority)
 (ediff-overlay-put overlay 'ediff-diff-num current-diff)
 (if (and (ediff-has-face-support-p)
 	       ediff-use-faces ediff-highlight-all-diffs)
 	  (ediff-set-overlay-face
 	     diff-overlay-list
 	     (list (vector overlay nil nil state-of-diff)))
 	    diff-list
 	    (cdr diff-list))
 ) ; while
 (set (ediff-get-symbol-from-alist buf-type ediff-difference-vector-alist)
 	 (vconcat diff-overlay-list))
 ))
 ;; `n' is the diff region to work on.  Default is ediff-current-difference.
 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine
 ;; diffs have not been computed before.
 ;; if `flag' is 'skip then don't compute fine diffs for this region.
 (defun ediff-make-fine-diffs (&optional n flag)
 (or n  (setq n ediff-current-difference))
 (if (< ediff-number-of-differences 1)
 (error ediff-NO-DIFFERENCES))
 (if ediff-word-mode
 (setq flag 'skip
 	    ediff-auto-refine 'nix))
 (or (< n 0)
 (>= n ediff-number-of-differences)
 ;; n is within the range
 (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
 	    (file-A ediff-temp-file-A)
 	    (empty-C (ediff-empty-diff-region-p n 'C))
 	    (whitespace-A (ediff-whitespace-diff-region-p n 'A))
 	    (whitespace-B (ediff-whitespace-diff-region-p n 'B))
 	    (whitespace-C (ediff-whitespace-diff-region-p n 'C))
 	    cumulative-fine-diff-length)
 	(cond ;; If one of the regions is empty (or 2 in 3way comparison)
 	      ;; then don't refine.
 	      ;; If the region happens to be entirely whitespace or empty then
 	      ;; mark as such.
 	      ((> (length (delq nil (list empty-A empty-B empty-C))) 1)
 		ediff-buffer-A
 		tmp-buffer
 		ediff-control-buffer)
 	       (setq file-A
 		     (ediff-make-temp-file tmp-buffer "fineDiffA" file-A))
 	       (ediff-wordify
 		(ediff-get-diff-posn 'B 'beg n)
 		(ediff-get-diff-posn 'B 'end n)
 		ediff-buffer-B
 		tmp-buffer
 		ediff-control-buffer)
 	       (setq file-B
 		     (ediff-make-temp-file tmp-buffer "fineDiffB" file-B))
 	       (if ediff-3way-job
 		   (progn
 		     (ediff-wordify
 		      (ediff-get-diff-posn 'C 'beg n)
 		      (ediff-get-diff-posn 'C 'end n)
 		      tmp-buffer
 		      ediff-control-buffer)
 		     (setq file-C
 			   (ediff-make-temp-file
 			    tmp-buffer "fineDiffC" file-C))))
 	       ;; save temp file names.
 	       (setq ediff-temp-file-A file-A
 		     ediff-temp-file-B file-B
 		     ediff-temp-file-C file-C)
 	       ;; set the new vector of fine diffs, if none exists
 	       (cond ((and ediff-3way-job whitespace-A)
 		      (ediff-setup-fine-diff-regions nil file-B file-C n))
 		     ((and ediff-3way-job whitespace-B)
 		      (ediff-setup-fine-diff-regions file-A nil file-C n))
 			   ;; ediff-empty-diff-region-p returns t in this case
 			   whitespace-C)
 		      (ediff-setup-fine-diff-regions file-A file-B nil n))
 		     (t
 		      (ediff-setup-fine-diff-regions file-A file-B file-C n)))
 	       (setq cumulative-fine-diff-length
 		     (+ (length (ediff-get-fine-diff-vector n 'A))
 			(length (ediff-get-fine-diff-vector n 'B))
 			;; in merge jobs, the merge buffer is never refined
 			(if (and file-C (not ediff-merge-job))
 			    (length (ediff-get-fine-diff-vector n 'C))
 			  0)))
 	       (cond ((or
 		       ;; all regions are white space
 		       (and whitespace-A whitespace-B whitespace-C)
 		       ;; none is white space and no fine diffs detected
 		       (and (not whitespace-A)
 		      (ediff-mark-diff-as-space-only n nil)))
 	       )
 	      ) ; end cond
 	(ediff-set-fine-diff-properties n)
 	)))
 ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc.
 (defun ediff-install-fine-diff-if-necessary (n)
 (cond ((and (eq ediff-auto-refine 'on)
 	      ediff-use-faces
 	      (not (eq ediff-highlighting-style 'off))
 	      (> ediff-auto-refine-limit
 		 (- (ediff-get-diff-posn 'B 'end n)
 		    (ediff-get-diff-posn 'B 'beg n))))
 	     (ediff-make-fine-diffs n 'noforce)
 	   (ediff-make-fine-diffs n 'skip)))
 	;; highlight iff fine diffs already exist
 	((eq ediff-auto-refine 'off)
 	 (ediff-make-fine-diffs n 'skip))))
 ;; if fine diff vector is not set for diff N, then do nothing
 (defun ediff-set-fine-diff-properties (n &optional default)
 (or (not (ediff-has-face-support-p))
 (< n 0)
 (>= n ediff-number-of-differences)
 (progn
 	(ediff-set-fine-diff-properties-in-one-buffer 'A n default)
 	(ediff-set-fine-diff-properties-in-one-buffer 'B n default)
 	(if ediff-3way-job
 	    (ediff-set-fine-diff-properties-in-one-buffer 'C n default)))))
 (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type
 						     n &optional default)
 (let ((fine-diff-vector  (ediff-get-fine-diff-vector n buf-type))
 	(face (if default
 		  'default
 			    0)))))
 (mapcar (lambda (overl)
 	      (ediff-set-overlay-face overl face)
 	      (ediff-overlay-put overl 'priority priority))
 	    fine-diff-vector)))
 ;; Set overlays over the regions that denote delimiters
 (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)
 (let (overlay overlay-list)
 (while diff-list
 (condition-case nil
 )
 (setq overlay-list (reverse overlay-list))
 (ediff-set-fine-diff-vector
 reg-num 'C (apply 'vector overlay-list))
 ))
 ;; Convert diff list to overlays for a given DIFF-REGION
 ;; in buffer of type BUF-TYPE
 (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num)
 (let* ((current-diff -1)
 	 (reg-start (ediff-get-diff-posn buf-type 'beg region-num))
 	 begin end overlay)
 (ediff-clear-fine-differences-in-one-buffer region-num buf-type)
 (setq diff-list (cdr diff-list)) ; discard list type (words or points)
 (ediff-with-current-buffer buff (goto-char reg-start))
 ;; if it is a combined merge then set overlays in buff C specially
 (if (and ediff-merge-job (eq buf-type 'C)
 	     (setq combined-merge-diff-list
 		   (ediff-looks-like-combined-merge region-num)))
 	(ediff-set-fine-overlays-for-combined-merge
 	  (setq begin (ediff-goto-word (1+ begin) buff)
 		end (ediff-goto-word end buff 'end))
 	  (setq overlay (ediff-make-bullet-proof-overlay begin end buff))
 	  ;; record all overlays for this difference region
 	  (setq diff-overlay-list (nconc diff-overlay-list (list overlay))))
 	(setq diff-list (cdr diff-list))
 	) ; while
 ;; convert the list of difference information into a vector
 ;; for fast access
 (ediff-set-fine-diff-vector
 	(b-prev 1)
 	(c-prev 1)
 	(anc-prev 1)
 	diff-list shift-A shift-B shift-C
 	)
 ;; diff list contains word numbers or points, depending on word-mode
 (setq diff-list (cons (if word-mode 'words 'points)
 			  diff-list))
 (if bounds
 	(setq shift-A
 	       (ediff-get-value-according-to-buffer-type 'B bounds))
 	      shift-C
 	      (if three-way-comp
 		  (ediff-overlay-start
 		   (ediff-get-value-according-to-buffer-type 'C bounds)))))
 ;; reset point in buffers A, B, C
 (ediff-with-current-buffer A-buffer
 (goto-char (if shift-A shift-A (point-min))))
 (ediff-with-current-buffer B-buffer
 (goto-char (if shift-B shift-B (point-min))))
 	(ediff-with-current-buffer C-buffer
 	  (goto-char (if shift-C shift-C (point-min)))))
 (if (ediff-buffer-live-p anc-buffer)
 	(ediff-with-current-buffer anc-buffer
 	  (goto-char (point-min))))
 (ediff-with-current-buffer diff-buffer
 (goto-char (point-min))
 (while (re-search-forward ediff-match-diff3-line nil t)
 	;; leave point after matched line
 (beginning-of-line 2)
 		    c-begin c-end
 		    a-begin-pt a-end-pt
 		    b-begin-pt b-end-pt
 		    c-begin-pt c-end-pt
 		    anc-begin-pt anc-end-pt)
 	       (setq state-of-ancestor
 		     (= c-or-anc-begin c-or-anc-end))
 	       (cond (three-way-comp
 		      (setq c-begin c-or-anc-begin
 		      (setq c-begin b-begin
 			    c-end b-end))
 		     (t
 		      (setq c-begin a-begin
 			    c-end a-end)))
 	       ;; compute main diff vector
 	       (if word-mode
 		   ;; make diff-list contain word numbers
 		   (setq diff-list
 			 (nconc diff-list
 					state-of-merge
 					state-of-ancestor
 					)))
 			)))
 	       ))
 	 ))) ; end ediff-with-current-buffer
 diff-list
 ))
 ;; Generate the difference vector and overlays for three files
 ;; File-C is either the third file to compare (in case of 3-way comparison)
 ;; or it is the ancestor file.
 (defun ediff-setup-diff-regions3 (file-A file-B file-C)
 (or (ediff-buffer-live-p ediff-diff-buffer)
 (setq ediff-diff-buffer
 	    (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
 (message "Computing differences ...")
 (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
 		      ediff-diff3-options file-A file-B file-C)
 (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer)
 ;;(message "Computing differences ... done")
 (ediff-convert-diffs-to-overlays
 (ediff-extract-diffs3
 ediff-diff-buffer
 ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds)
 ))
 ;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless
 ;; SYNCH is non-nil.  BUFFER must be a buffer object, and must be alive.  The
 ;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank
 ;; string.  All elements in FILES must be strings.  We also delete nil from
 	      (setq mode-line-process '(":%s"))
 	      (set-process-sentinel proc 'ediff-process-sentinel)
 	      (set-process-filter proc 'ediff-process-filter)
 	      )))
 (store-match-data data))))
 ;; This is shell-command-filter from simple.el in Emacs.
 ;; Copied here because XEmacs doesn't have it.
 (defun ediff-process-filter (proc string)
 ;; Do save-excursion by hand so that we can leave point numerically unchanged
 ;; despite an insertion immediately after it.
 (set-window-start window pos)
 ;; Finish our save-excursion.
 (if opoint
 (goto-char opoint))
 (set-buffer obuf))))
 ;; like shell-command-sentinel but doesn't print an exit status message
 ;; we do this because diff always exits with status 1, if diffs are found
 ;; so shell-command-sentinel displays a confusing message to the user
 (defun ediff-process-sentinel (process signal)
 (if (and (memq (process-status process) '(exit signal))
 (progn
 (save-excursion
 (set-buffer (process-buffer process))
 (setq mode-line-process nil))
 (delete-process process))))
 ;;; Word functions used to refine the current diff
 (defvar ediff-forward-word-function 'ediff-forward-word
 "*Function to call to move to the next word.
 (erase-buffer)
 (insert diff-string)
 (goto-char (point-min))
 (skip-chars-forward ediff-whitespace)
 (delete-region (point-min) (point))
 (while (not (eobp))
 (funcall forward-word-function)
 (setq sv-point (point))
 (skip-chars-forward ediff-whitespace)
 (delete-region sv-point (point))
 (insert "\n")))))
 ;; copy string specified as BEG END from IN-BUF to OUT-BUF
 (defun ediff-copy-to-buffer (beg end in-buffer out-buffer)
 (with-current-buffer out-buffer
 (erase-buffer)
 (insert-buffer-substring in-buffer beg end)

Mercurial > emacs

comparison lisp/ediff-diff.el @ 49588:37645a051842