Mercurial > emacs
changeset 92537:7071cfe2789e
(vc-bzr-resolve-when-done, vc-bzr-find-file-hook): New functions.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 06 Mar 2008 22:08:21 +0000 |
| parents | 38f425cf30bc |
| children | 30ee025de4a3 |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Mar 06 21:43:06 2008 +0000 +++ b/lisp/ChangeLog Thu Mar 06 22:08:21 2008 +0000 @@ -1,5 +1,8 @@ 2008-03-06 Stefan Monnier <monnier@iro.umontreal.ca> + * 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 <lennart.borgman@gmail.com> (tiny change)
--- a/lisp/vc-bzr.el Thu Mar 06 21:43:06 2008 +0000 +++ b/lisp/vc-bzr.el Thu Mar 06 22:08:21 2008 +0000 @@ -232,6 +232,33 @@ (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))))