# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1204841301 0
# Node ID 7071cfe2789e6d1bcd93c511f340b43a280d7e65
# Parent  38f425cf30bcec519533814c4c2b3023a34b0954
(vc-bzr-resolve-when-done, vc-bzr-find-file-hook): New functions.

diff -r 38f425cf30bc -r 7071cfe2789e lisp/ChangeLog
--- 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)
diff -r 38f425cf30bc -r 7071cfe2789e lisp/vc-bzr.el
--- 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))))