From b0a08954d512d8e70fdf3b49b7db281a98221c0a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 6 Mar 2008 22:08:21 +0000 Subject: [PATCH] (vc-bzr-resolve-when-done, vc-bzr-find-file-hook): New functions. --- lisp/ChangeLog | 3 +++ lisp/vc-bzr.el | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9dd876afbf..b415c11303 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-03-06 Stefan Monnier + * vc-bzr.el (vc-bzr-resolve-when-done, vc-bzr-find-file-hook): + New functions. + * info.el (Info-bookmark-make-cell): Don't use the info-node argument. 2008-03-06 Lennart Borgman (tiny change) diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index e0ce72dd31..e126296d77 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -232,6 +232,33 @@ If any error occurred in running `bzr status', then return nil." (unknown . nil) (unchanged . up-to-date))))))) +(defun vc-bzr-resolve-when-done () + "Call \"bzr resolve\" if the conflict markers have been removed." + (save-excursion + (goto-char (point-min)) + (unless (re-search-forward "^<<<<<<< " nil t) + (vc-bzr-command "resolve" nil 0 buffer-file-name) + ;; Remove the hook so that it is not called multiple times. + (remove-hook 'after-save-hook 'vc-bzr-resolve-when-done t)))) + +(defun vc-bzr-find-file-hook () + (when (and buffer-file-name + ;; FIXME: We should check that "bzr status" says "conflict". + (file-exists-p (concat buffer-file-name ".BASE")) + (file-exists-p (concat buffer-file-name ".OTHER")) + (file-exists-p (concat buffer-file-name ".THIS")) + ;; If "bzr status" says there's a conflict but there are no + ;; conflict markers, it's not clear what we should do. + (save-excursion + (goto-char (point-min)) + (re-search-forward "^<<<<<<< " nil t))) + ;; TODO: the merge algorithm used in `bzr merge' is nicely configurable, + ;; but the one in `bzr pull' isn't, so it would be good to provide an + ;; elisp function to remerge from the .BASE/OTHER/THIS files. + (smerge-start-session) + (add-hook 'after-save-hook 'vc-bzr-resolve-when-done nil t) + (message "There are unresolved conflicts in this file"))) + (defun vc-bzr-workfile-unchanged-p (file) (eq 'unchanged (car (vc-bzr-status file)))) -- 2.20.1