Re: [PATCH] Fix for vc-bzr-diff when vc-bzr-diff-switches is t

[Deniz Dogan]

2011/1/27 Glenn Morris <address@hidden>:
> Deniz Dogan wrote:
>
>> +  (let (args)
>> +    (unless (eq t vc-bzr-diff-switches) ;; t means "no switches"
>
> I think it's better to check for zero-length return from
> (vc-switches 'bzr 'diff).
>

How about this?

-- 
Deniz Dogan


# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   8qw1p28em01t5or7
# target_branch: bzr+ssh://address@hidden/emacs/trunk/
# testament_sha1: 8e019713af179638969ba99256119208c84fe0ca
# timestamp: 2011-01-27 03:51:25 +0100
# base_revision_id: address@hidden
#
# Begin patch
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog      2011-01-25 17:41:28 +0000
+++ lisp/ChangeLog      2011-01-27 02:50:53 +0000
@@ -1,3 +1,8 @@
+2011-01-27  Deniz Dogan  <address@hidden>
+
+       * vc/vc-bzr.el (vc-bzr-diff): Pass --diff-options only if using
+       diff switches.
+
 2011-01-25  Sam Steingold  <address@hidden>

        * vc/vc-svn.el (vc-svn-diff): Use `diff-command' instead of the

=== modified file 'lisp/vc/vc-bzr.el'
--- lisp/vc/vc-bzr.el   2011-01-25 04:08:28 +0000
+++ lisp/vc/vc-bzr.el   2011-01-27 02:50:53 +0000
@@ -674,18 +674,21 @@

 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
   "VC bzr backend for diff."
-  ;; `bzr diff' exits with code 1 if diff is non-empty.
-  (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
-        (if vc-disable-async-diff 1 'async) files
-         "--diff-options" (mapconcat 'identity
-                                     (vc-switches 'bzr 'diff)
-                                    " ")
-         ;; This `when' is just an optimization because bzr-1.2 is *much*
-         ;; faster when the revision argument is not given.
-         (when (or rev1 rev2)
-           (list "-r" (format "%s..%s"
-                              (or rev1 "revno:-1")
-                              (or rev2 ""))))))
+  (let ((switches (vc-switches 'bzr 'diff))
+        args)
+    (when (> (length switches) 0)
+      (setq args (list "--diff-options" (mapconcat 'identity switches " "))))
+    ;; This `when' is just an optimization because bzr-1.2 is *much*
+    ;; faster when the revision argument is not given.
+    (when (or rev1 rev2)
+      (setq args (append args (list "-r" (format "%s..%s"
+                                                 (or rev1 "revno:-1")
+                                                 (or rev2 ""))))))
+    ;; `bzr diff' exits with code 1 if diff is non-empty.
+    (apply #'vc-bzr-command "diff" (or buffer "*vc-diff*")
+           (if vc-disable-async-diff 1 'async) files
+           args)))
+


 ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with

# Begin bundle
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