(defcustom smerge-diff-switches
(append '("-d" "-b")
(if (listp diff-switches) diff-switches (list diff-switches)))
- "*A list of strings specifying switches to be be passed to diff.
+ "*A list of strings specifying switches to be passed to diff.
Used in `smerge-diff-base-mine' and related functions."
:group 'smerge
:type '(repeat string))
:help "Use Ediff to resolve the conflicts"
:active (smerge-check 1)]
["Auto Resolve" smerge-resolve
- :help "Use mode-provided resolution function"
- :active (and (smerge-check 1) (local-variable-p 'smerge-resolve-function))]
+ :help "Try auto-resolution heuristics"
+ :active (smerge-check 1)]
["Combine" smerge-combine-with-next
:help "Combine current conflict with next"
:active (smerge-check 1)]
))
-(easy-mmode-defmap smerge-context-menu-map
- `(([down-mouse-3] . smerge-activate-context-menu))
- "Keymap for context menu appeared on conflicts area.")
(easy-menu-define smerge-context-menu nil
"Context menu for mine area in `smerge-mode'."
'(nil
(defun smerge-keep-all ()
- "Keep all three versions.
-Convenient for the kind of conflicts that can arise in ChangeLog files."
+ "Concatenate all versions."
(interactive)
(smerge-match-conflict)
- (replace-match (concat (or (match-string 1) "")
- (or (match-string 2) "")
- (or (match-string 3) ""))
- t t)
- (smerge-auto-leave))
+ (let ((mb2 (or (match-beginning 2) (point-max)))
+ (me2 (or (match-end 2) (point-min))))
+ (delete-region (match-end 3) (match-end 0))
+ (delete-region (max me2 (match-end 1)) (match-beginning 3))
+ (if (and (match-end 2) (/= (match-end 1) (match-end 3)))
+ (delete-region (match-end 1) (match-beginning 2)))
+ (delete-region (match-beginning 0) (min (match-beginning 1) mb2))
+ (smerge-auto-leave)))
+
+(defun smerge-keep-n (n)
+ ;; We used to use replace-match, but that did not preserve markers so well.
+ (delete-region (match-end n) (match-end 0))
+ (delete-region (match-beginning 0) (match-beginning n)))
(defun smerge-combine-with-next ()
"Combine the current conflict with the next one."
"Pop up the Smerge mode context menu under mouse."
(interactive "e")
(if (and smerge-mode
- (save-excursion (mouse-set-point event) (smerge-check 1)))
+ (save-excursion (posn-set-point (event-end event)) (smerge-check 1)))
(progn
- (mouse-set-point event)
- (smerge-match-conflict)
- (let ((i (smerge-get-current))
- o)
- (if (<= i 0)
- ;; Out of range
- (popup-menu smerge-mode-menu)
- ;; Install overlay.
- (setq o (make-overlay (match-beginning i) (match-end i)))
- (unwind-protect
- (progn
- (overlay-put o 'face 'highlight)
- (sit-for 0)
- (popup-menu (if (smerge-check 2)
- smerge-mode-menu
- smerge-context-menu)))
- ;; Delete overlay.
- (delete-overlay o)))))
+ (posn-set-point (event-end event))
+ (smerge-match-conflict)
+ (let ((i (smerge-get-current))
+ o)
+ (if (<= i 0)
+ ;; Out of range
+ (popup-menu smerge-mode-menu)
+ ;; Install overlay.
+ (setq o (make-overlay (match-beginning i) (match-end i)))
+ (unwind-protect
+ (progn
+ (overlay-put o 'face 'highlight)
+ (sit-for 0) ;Display the new highlighting.
+ (popup-menu smerge-context-menu))
+ ;; Delete overlay.
+ (delete-overlay o)))))
;; There's no conflict at point, the text-props are just obsolete.
(save-excursion
(let ((beg (re-search-backward smerge-end-re nil t))
- (end (re-search-forward smerge-begin-re nil t)))
- (smerge-remove-props (or beg (point-min)) (or end (point-max)))
- (push event unread-command-events)))))
+ (end (re-search-forward smerge-begin-re nil t)))
+ (smerge-remove-props (or beg (point-min)) (or end (point-max)))
+ (push event unread-command-events)))))
(defun smerge-resolve ()
"Resolve the conflict at point intelligently.
(interactive)
(smerge-match-conflict)
(smerge-remove-props)
- (funcall smerge-resolve-function)
+ (cond
+ ;; Trivial diff3 -A non-conflicts.
+ ((and (eq (match-end 1) (match-end 3))
+ (eq (match-beginning 1) (match-beginning 3)))
+ ;; FIXME: Add "if [ diff -b MINE OTHER ]; then select OTHER; fi"
+ (smerge-keep-n 3))
+ ((and (match-end 2)
+ ;; FIXME: Add "diff -b BASE MINE | patch OTHER".
+ ;; FIXME: Add "diff -b BASE OTHER | patch MINE".
+ nil)
+ )
+ ((and (not (match-end 2))
+ ;; FIXME: Add "diff -b"-based refinement.
+ nil)
+ )
+ (t
+ ;; Mode-specific conflict resolution.
+ (funcall smerge-resolve-function)))
(smerge-auto-leave))
(defun smerge-keep-base ()
(smerge-match-conflict)
(smerge-ensure-match 2)
(smerge-remove-props)
- (replace-match (match-string 2) t t)
+ (smerge-keep-n 2)
(smerge-auto-leave))
(defun smerge-keep-other ()
(smerge-match-conflict)
;;(smerge-ensure-match 3)
(smerge-remove-props)
- (replace-match (match-string 3) t t)
+ (smerge-keep-n 3)
(smerge-auto-leave))
(defun smerge-keep-mine ()
(smerge-match-conflict)
;;(smerge-ensure-match 1)
(smerge-remove-props)
- (replace-match (match-string 1) t t)
+ (smerge-keep-n 1)
(smerge-auto-leave))
(defun smerge-get-current ()
(let ((i (smerge-get-current)))
(if (<= i 0) (error "Not inside a version")
(smerge-remove-props)
- (replace-match (match-string i) t t)
+ (smerge-keep-n i)
(smerge-auto-leave))))
(defun smerge-kill-current ()
(let ((i (smerge-get-current)))
(if (<= i 0) (error "Not inside a version")
(smerge-remove-props)
- (replace-match (mapconcat
- (lambda (j)
- (match-string j))
- (remove i '(1 2 3)) "") t t)
- (smerge-auto-leave))))
+ (let ((left nil))
+ (dolist (n '(3 2 1))
+ (if (and (match-end n) (/= (match-end n) (match-end i)))
+ (push n left)))
+ (if (and (cdr left)
+ (/= (match-end (car left)) (match-end (cadr left))))
+ (ding) ;We don't know how to do that.
+ (smerge-keep-n (car left))
+ (smerge-auto-leave))))))
(defun smerge-diff-base-mine ()
"Diff 'base' and 'mine' version in current conflict region."
;; handle the various conflict styles
(cond
+ ((save-excursion
+ (goto-char mine-start)
+ (re-search-forward smerge-begin-re end t))
+ ;; There's a nested conflict and we're after the the beginning
+ ;; of the outer one but before the beginning of the inner one.
+ (error "There is a nested conflict"))
+
((re-search-backward smerge-base-re start t)
;; a 3-parts conflict
(set (make-local-variable 'smerge-conflict-style) 'diff3-A)
(unwind-protect
(add-text-properties start end smerge-text-properties)
(restore-buffer-modified-p m)))
-
+
(store-match-data (list start end
mine-start mine-end
base-start base-end
Returns non-nil if a match is found between the point and LIMIT.
The point is moved to the end of the conflict."
(when (re-search-forward smerge-begin-re limit t)
- (ignore-errors
- (smerge-match-conflict)
- (goto-char (match-end 0)))))
+ (condition-case err
+ (progn
+ (smerge-match-conflict)
+ (goto-char (match-end 0)))
+ (error (smerge-find-conflict limit)))))
(defun smerge-diff (n1 n2)
(smerge-match-conflict)
(goto-char (point-min))
(while (smerge-find-conflict)
(when (match-beginning 2) (setq base t))
- (replace-match (match-string 1) t t))
+ (smerge-keep-n 1))
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode))
(insert-buffer-substring buf)
(goto-char (point-min))
(while (smerge-find-conflict)
- (replace-match (match-string 3) t t))
+ (smerge-keep-n 3))
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode))
(insert-buffer-substring buf)
(goto-char (point-min))
(while (smerge-find-conflict)
- (replace-match (or (match-string 2) "") t t))
+ (if (match-end 2)
+ (smerge-keep-n 2)
+ (delete-region (match-beginning 0) (match-end 0))))
(buffer-enable-undo)
(set-buffer-modified-p nil)
(funcall mode)))
(provide 'smerge-mode)
-;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
+;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
;;; smerge-mode.el ends here
HCoop / bpt / emacs.git / blobdiff