Please change the Subject header to a concise description of your patch.
Please describe your patch between the LOG-START and LOG-END markers:
<<LOG-START>>
* lisp/bzr.el (bzr-init, bzr-init-repository, bzr-checkout)
  (bzr-pull, bzr-merge, bzr-update): Use `message', rather than both
  `message' and `format'.
  (bzr-add): Fix error message when adding file names with "%" in them.

<<LOG-END>>



[VERSION] dvc-dev-bzr

Bazaar (bzr) 0.16.0

Emacs  : GNU Emacs 22.0.98.1 (i686-pc-linux-gnu, GTK+ Version 2.10.11)
 of 2007-04-22 on hariken

-- 
       Michael Olson -- FSF Associate Member #652     |
 http://mwolson.org/ -- Jabber: mwolson_at_hcoop.net  |  /` |\ | | |
            Sysadmin -- Hobbies: Lisp, GP2X, HCoop    | |_] | \| |_|
Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |

Attachment: pgpxHraf1qj6f.pgp
Description: PGP signature

=== modified file 'lisp/bzr.el'
--- lisp/bzr.el	2007-05-07 19:17:23 +0000
+++ lisp/bzr.el	2007-05-24 00:18:50 +0000
@@ -72,7 +72,7 @@
   (dvc-run-dvc-sync 'bzr (list "init" dir)
                      :finished (dvc-capturing-lambda
                                    (output error status arguments)
-                                 (message (format "bzr init %s finished" dir)))))
+                                 (message "bzr init %s finished" dir))))
 
 (defun bzr-init-repository (&optional dir)
   "Run bzr init-repository.
@@ -89,7 +89,7 @@
   (dvc-run-dvc-sync 'bzr (list "init-repository" dir)
                      :finished (dvc-capturing-lambda
                                    (output error status arguments)
-                                 (message (format "bzr init-repository '%s' finished" dir))))
+                                 (message "bzr init-repository '%s' finished" dir)))
   dir)
 
 (defun bzr-checkout (branch-location to-location &optional lightweight revision)
@@ -112,9 +112,9 @@
                                branch-location to-location)
                     :finished (dvc-capturing-lambda
                                   (output error status arguments)
-                                (message (format "bzr checkout%s %s -> %s finished"
-                                                 (if lightweight " --lightweight" "")
-                                                 branch-location to-location))
+                                (message "bzr checkout%s %s -> %s finished"
+                                         (if lightweight " --lightweight" "")
+                                         branch-location to-location)
                                 (dired to-location))))
 
 ;;;###autoload
@@ -127,8 +127,8 @@
                      :finished
                      (dvc-capturing-lambda
                          (output error status arguments)
-                       (message (format "bzr pull finished => %s"
-                                        (concat (dvc-buffer-content error) (dvc-buffer-content output)))))))
+                       (message "bzr pull finished => %s"
+                                (concat (dvc-buffer-content error) (dvc-buffer-content output))))))
 
 ;;;###autoload
 (defun bzr-merge (&optional repo-path)
@@ -140,8 +140,8 @@
                      :finished
                      (dvc-capturing-lambda
                          (output error status arguments)
-                       (message (format "bzr merge finished => %s"
-                                        (concat (dvc-buffer-content error) (dvc-buffer-content output)))))))
+                       (message "bzr merge finished => %s"
+                                (concat (dvc-buffer-content error) (dvc-buffer-content output))))))
 
 (defvar bzr-merge-or-pull-from-url-rules nil
   "An alist that maps repository urls to working copies. This rule is used by
@@ -185,8 +185,8 @@
                      :finished
                      (dvc-capturing-lambda
                          (output error status arguments)
-                       (message (format "bzr update finished => %s"
-                                        (concat (dvc-buffer-content error) (dvc-buffer-content output)))))))
+                       (message "bzr update finished => %s"
+                                (concat (dvc-buffer-content error) (dvc-buffer-content output))))))
 
 
 ;; bzr-start-project implements the following idea:
@@ -494,11 +494,11 @@
 (defun bzr-add (file)
   "Adds FILE to the repository."
   (interactive "fAdd file or directory: ")
-  (message
-   (let ((default-directory (bzr-tree-root)))
-     (dvc-run-dvc-sync
-      'bzr (list "add" (file-relative-name file))
-      :finished 'dvc-output-and-error-buffer-handler))))
+  (message "%s"
+           (let ((default-directory (bzr-tree-root)))
+             (dvc-run-dvc-sync
+              'bzr (list "add" (file-relative-name file))
+              :finished 'dvc-output-and-error-buffer-handler))))
 
 (defun bzr-add-files (&rest files)
   "Run bzr add."

_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev

Reply via email to