emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Deniz Dogan
Subject: Re: [PATCH] Fix for vc-bzr-diff when vc-bzr-diff-switches is t
Date: Thu, 27 Jan 2011 10:50:49 +0100

Here is my third attempt given your comments.

I'm still unable to test this patch properly since I don't have the
diff tool, but looking at the commands that Emacs executes depending
on vc-bzr-diff-switches it looks fine.

-- 
Deniz Dogan



# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   wpy4g0ar18lokk25
# target_branch: bzr+ssh://address@hidden/emacs/trunk/
# testament_sha1: 2aad3701c56f1c2975786049462e411b2f4fc43e
# timestamp: 2011-01-27 10:47:25 +0100
# base_revision_id: address@hidden
#
# Begin patch
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog      2011-01-27 07:54:04 +0000
+++ lisp/ChangeLog      2011-01-27 09:46:56 +0000
@@ -1,3 +1,8 @@
+2011-01-27  Deniz Dogan  <address@hidden>
+
+       * vc/vc-bzr.el (vc-bzr-diff): Don't pass --diff-options unless
+       there are any diff switches.
+
 2011-01-27  Glenn Morris  <address@hidden>

        * msb.el (msb-after-load-hooks): Make it an obsolete alias.

=== 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 09:46:56 +0000
@@ -674,18 +674,23 @@

 (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
+          (append
+           ;; Only add --diff-options if there are any diff switches.
+           (unless (zerop (length switches))
+             (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)
+             (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
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ9oXhgAArt/gEuwAARa8///
XgSEAP////BQBate3Fm24Nw0dDm2ZrhJIQJ6jQYmmTEjCaDVPKbQgDJoyCUKYJqehiSjanqaGg0D
1ABoGT1B6gSJApPTIE1NNkTam1NGm0agANNAHqHMJgEwAmEwmmAAATJpoGElNKbTEmCZU3o1Mp4k
02kGj1AZAAE5SyROvpxqkvkgm/l9zF2WNGjNFnnwddBxY3CMVw4SU6kQpAlJ2aq5sdl0REMAD8Sd
PjnxYts5LF77xfxywL/wcSxsmfM9DTHXwXfhS/vcbivjk9cpSZz5sb4Hcb1bm00Ekczdl4I7hjA6
OMJ9qm7nnSD+feMV0wHjJPNyUrNPCLSHTk8wZtE99mX33dMM6BoVGl7WOXtCDhM4cx+aeGaYM3xu
7N0u1ruGb2/XOSb8qvZojq65mV625B5hw50wjKya3PLl/pkeXA1PR9gKJdjHfymFmZhvcGxKuSs9
EWBX0n3dvUB0Gi3JutcvYRuEWiKkfURajE8dFO41mEkqClmyRpvckniV2+aCMHvK/TdBrm/RREgJ
hctgFDGWtTHvxSyqy/sIdcuDrxR0Q9C6tpDnfAStRjRFHSOa+WMIoVTrCOtvkno1LrTqw1EDZXsU
StUTl1UQw3oNiNCrOt5kyzM5tg9tQvdkJyNkZb9WBC9JoWD56JAWVdAz6mRs344YUxlVrDUQ3CHp
hcnLlMAZhiRLQQWXCZx5L6Qw8VkXaYRUCCMCKIFF4GbY4yLRx0LsTHEDLTbuJvW45wjyOveI1paW
wkSA29DypHEyLliEzkh1ISKSAfvz2WHVNc1A7er5tOTT3ahS1zLHdRnqoJkpBSe3Sz70tpoDFlMc
ZIeSdq56WO45rMqRnC6M/aQnHOsLVukjBHAbBUJPeg1lYDlqX26YEemxTIYoUqS4GzdlLRMas0MJ
6rBzJBgV+SDPSSEZL1BvPa+Y867L+RPV5BqT7ejvIoIaMVWxsf5rdtYSDDTRHC9uzwkPMRxICrOZ
bcxeb4De3I7in126dcmMvoiUR5dtpt6kWETTWKCd8DPzAgtKUO97zX+2mixlXxf6MLQbxiF3LApk
4O/NFP3fpFnOYr5kmZGiB4+hqrNJP3QO4qInTZ72EcB8e/xn4pXQt6iN2jKXMU1W6d69OUQcCsg6
5jwuXRTPsJQrcIr4MES6LqIRjsRV4Cq9TqyuyK3b+HkSHl4HUpn4MOkiMjP59JEeHfOjUzfHjuRq
n4t4f040nLHWt2Vf+GIjdinSpwV3QvdmWL4xglwcojZkjvoRCMrAwwjxxLRw616OvTiRgPpIqCGa
Qg7eRxJLzLh3PNpyWKOQG94K6LkMc59s6Pqkvw4la42mmhOyF9nEmqhOT0vvZWiB0zmjp+Efk6Wo
3dBA9bRGCTlJWjRNvqfZMyGCbkyj4C5otA/jCfKwE+JM/NfU2wCE1a2oyApXcr0MIYH9qUUwLkxK
erBe2hO9tjONl2VBzA26PKOsD1CGURZiOS/pDAv2ZzrtFbi1Vd+5RWKDkQDfpZIQ9J9iJUdUScKX
OwWzIHDbcdCLgsBcwwQyqW3Sjo44f7M5nlEMgoBTNBSyH82CKumG8LEYIpDF6jVubiYxxYYGLHqi
Vh5vlgiSa3UBjRq02d0KWiaCJgMmjbJSTSyIv6YW2yJooq9Uwzccp6HSbWfPOGnysedpleEUrrhT
pW08eBg4rICcUhueqVaOYiz6RXyzYNCqHDrrvOSbkoMdoU1pM1sw4UYv/Dtc7OHwWBsocFrWIYMa
4vB2tNNiiCLcsaO6qOwup56vpeHxRrwnP1OPnng0CF9u1RSn3Sl4XpNwWSMgNiOyoXErWuLnOsAq
LLQWTgrPNEKe3/i7kinChIT7QvDA



reply via email to

[Prev in Thread] Current Thread [Next in Thread]