bzrmerge.el trivia.

* admin/bzrmerge.el (bzrmerge-buffer): New constant.
(bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
(bzrmerge-missing): If nothing to do, return nil not (nil).
(bzrmerge-apply): Remove odd character from message.
(bzrmerge): Give status messages.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f7d60b08e4c7aadb2ad24820aefdc44d1ca93cdf..46dbaa0da2611d27f3190cf97d85ddb172f3b4a9 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,7 +1,15 @@
+2011-02-03  Glenn Morris  <rgm@gnu.org>
+
+       * bzrmerge.el (bzrmerge-buffer): New constant.
+       (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
+       (bzrmerge-missing): If nothing to do, return nil not (nil).
+       (bzrmerge-apply): Remove odd character from message.
+       (bzrmerge): Give status messages.
+
 2011-01-31  Eli Zaretskii  <eliz@gnu.org>
 
-       * admin.el (set-version): Remove lib-src/makefile.w32-in.  Add
-       nt/config.nt.
+       * admin.el (set-version): Remove lib-src/makefile.w32-in.
+       Add nt/config.nt.
 
 2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index e9fd0ea00f81af185bae9538e99a2235a5f1849e..350f3795c52b17567c18a84d0d2e9f509d076395 100644 (file)
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,4 +1,4 @@
-;;; bzrmerge.el --- 
+;;; bzrmerge.el --- help merge one Emacs bzr branch to another
 
 ;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
@@ -20,7 +20,7 @@
 
 ;;; Commentary:
 
-;; 
+;; Some usage notes are in admin/notes/bzr.
 
 ;;; Code:
 
@@ -32,10 +32,13 @@
   "Regexp matching logs of revisions that might be skipped.
 `bzrmerge-missing' will ask you if it should skip any matches.")
 
+(defconst bzrmerge-buffer "*bzrmerge*"
+  "Working buffer for bzrmerge.")
+
 (defun bzrmerge-merges ()
   "Return the list of already merged (not yet committed) revisions.
 The list returned is sorted by oldest-first."
-  (with-current-buffer (get-buffer-create "*bzrmerge*")
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
     (erase-buffer)
     ;; We generally want to make sure we start with a clean tree, but we also
     ;; want to allow restarts (i.e. with some part of FROM already merged but
@@ -99,7 +102,7 @@ MERGES is the revisions already merged but not yet committed.
 Asks about skipping revisions with logs matching `bzrmerge-skip-regexp'.
 The result is of the form (TOMERGE . TOSKIP) where TOMERGE and TOSKIP
 are both lists of revnos, in oldest-first order."
-  (with-current-buffer (get-buffer-create "*bzrmerge*")
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
     (erase-buffer)
     (call-process "bzr" nil t nil "missing" "--theirs-only"
                   (expand-file-name from))
@@ -133,7 +136,8 @@ are both lists of revnos, in oldest-first order."
                   (push revno skipped)
                 (push revno revnos)))))
         (delete-region (point) (point-max)))
-      (cons (nreverse revnos) (nreverse skipped)))))
+      (and (or revnos skipped)
+           (cons (nreverse revnos) (nreverse skipped))))))
 
 (defun bzrmerge-resolve (file)
   (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file))
@@ -216,7 +220,7 @@ Does not make other difference."
 
 (defun bzrmerge-apply (missing from)
   (setq from (expand-file-name from))
-  (with-current-buffer (get-buffer-create "*bzrmerge*")
+  (with-current-buffer (get-buffer-create bzrmerge-buffer)
     (erase-buffer)
     (when (equal (cdr bzrmerge-already-done) (list from missing))
       (setq missing (car bzrmerge-already-done)))
@@ -285,7 +289,7 @@ Does not make other difference."
                   ;; bzrmerge-add-metadata does not work when there
                   ;; are conflicts.
                   (display-warning 'bzrmerge "Resolve conflicts manually.
-¡BEWARE!  Important metadata is kept in this Emacs session!
+¡BEWARE!  Important metadata is kept in this Emacs session!
 Do not commit without re-running `M-x bzrmerge' first!"))
               (error "Resolve conflicts manually")))))
         (cons merge skip)))))
@@ -309,8 +313,11 @@ Do not commit without re-running `M-x bzrmerge' first!"))
     (let* ((merges (bzrmerge-merges))
            ;; OK, we have the status, now check the missing data.
            (missing (bzrmerge-missing from merges)))
-      (while missing
-        (setq missing (bzrmerge-apply missing from))))))
+      (if (not missing)
+          (message "Merging from %s...nothing to merge" from)
+        (while missing
+          (setq missing (bzrmerge-apply missing from)))
+        (message "Merging from %s...done" from)))))
 
 (provide 'bzrmerge)
 ;;; bzrmerge.el ends here