;; Copyright (C) 1999, 2000, 01, 03, 2004 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
-;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.24 2003/10/06 16:34:59 fx Exp $
+;; Keywords: revision-control merge diff3 cvs conflict
;; This file is part of GNU Emacs.
: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-menu-define smerge-context-menu nil
+ "Context menu for mine area in `smerge-mode'."
+ '(nil
+ ["Keep Current" smerge-keep-current :help "Use current (at point) version"]
+ ["Kill Current" smerge-kill-current :help "Remove current (at point) version"]
+ ["Keep All" smerge-keep-all :help "Keep all three versions"]
+ "---"
+ ["More..." (popup-menu smerge-mode-menu) :help "Show full SMerge mode menu"]
+ ))
+
(defconst smerge-font-lock-keywords
'((smerge-find-conflict
(1 smerge-mine-face prepend t)
(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."
The function is called with no argument and with the match data set
according to `smerge-match-conflict'.")
+(defvar smerge-text-properties
+ `(help-echo "merge conflict: mouse-3 shows a menu"
+ ;; mouse-face highlight
+ keymap (keymap (down-mouse-3 . smerge-popup-context-menu))))
+
+(defun smerge-remove-props (&optional beg end)
+ (remove-text-properties
+ (or beg (match-beginning 0))
+ (or end (match-end 0))
+ smerge-text-properties))
+
+(defun smerge-popup-context-menu (event)
+ "Pop up the Smerge mode context menu under mouse."
+ (interactive "e")
+ (if (and smerge-mode
+ (save-excursion (posn-set-point (event-end event)) (smerge-check 1)))
+ (progn
+ (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)))))
+
(defun smerge-resolve ()
"Resolve the conflict at point intelligently.
This relies on mode-specific knowledge and thus only works in
some major modes. Uses `smerge-resolve-function' to do the actual work."
(interactive)
(smerge-match-conflict)
- (funcall smerge-resolve-function)
+ (smerge-remove-props)
+ (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 ()
(interactive)
(smerge-match-conflict)
(smerge-ensure-match 2)
- (replace-match (match-string 2) t t)
+ (smerge-remove-props)
+ (smerge-keep-n 2)
(smerge-auto-leave))
(defun smerge-keep-other ()
(interactive)
(smerge-match-conflict)
;;(smerge-ensure-match 3)
- (replace-match (match-string 3) t t)
+ (smerge-remove-props)
+ (smerge-keep-n 3)
(smerge-auto-leave))
(defun smerge-keep-mine ()
(interactive)
(smerge-match-conflict)
;;(smerge-ensure-match 1)
- (replace-match (match-string 1) t t)
+ (smerge-remove-props)
+ (smerge-keep-n 1)
(smerge-auto-leave))
(defun smerge-get-current ()
(smerge-match-conflict)
(let ((i (smerge-get-current)))
(if (<= i 0) (error "Not inside a version")
- (replace-match (match-string i) t t)
+ (smerge-remove-props)
+ (smerge-keep-n i)
(smerge-auto-leave))))
+(defun smerge-kill-current ()
+ "Remove the current (under the cursor) version."
+ (interactive)
+ (smerge-match-conflict)
+ (let ((i (smerge-get-current)))
+ (if (<= i 0) (error "Not inside a version")
+ (smerge-remove-props)
+ (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."
(interactive)
;; 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)
(setq mine-end (match-beginning 0))
(setq base-start (match-end 0)))
- ((string= filename (file-name-nondirectory
- (or buffer-file-name "")))
- ;; a 2-parts conflict
- (set (make-local-variable 'smerge-conflict-style) 'diff3-E))
-
- ((and (not base-start)
- (or (eq smerge-conflict-style 'diff3-A)
- (string-match "^[.0-9]+\\'" filename)))
- ;; a same-diff conflict
- (setq base-start mine-start)
- (setq base-end mine-end)
- (setq mine-start other-start)
- (setq mine-end other-end)))
-
+ ((string= filename (file-name-nondirectory
+ (or buffer-file-name "")))
+ ;; a 2-parts conflict
+ (set (make-local-variable 'smerge-conflict-style) 'diff3-E))
+
+ ((and (not base-start)
+ (or (eq smerge-conflict-style 'diff3-A)
+ (equal filename "ANCESTOR")
+ (string-match "\\`[.0-9]+\\'" filename)))
+ ;; a same-diff conflict
+ (setq base-start mine-start)
+ (setq base-end mine-end)
+ (setq mine-start other-start)
+ (setq mine-end other-end)))
+
+ (let ((inhibit-read-only t)
+ (inhibit-modification-hooks t)
+ (m (buffer-modified-p)))
+ (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