svn diff; vc-svn-diff in vc-svn.el

[Karl Chen <qu...@hkn.eecs.berkeley.edu>]

Hi,

The --extensions argument to svn diff doesn't seem to do anything.  (I
want to specify -b or -w).  Is it implemented at all?  I can work
around it by creating a helper script that passes the desired
arguments and then using --diff-cmd.  The parameter is misnamed since
it only allows you to give it a program (which must be a full path),
without arguments, and it doesn't work with any diff program than a
command-line GNU-diff-like program.  Its error message is very
undescriptive ("error 255" for all errors).

Also a typo in vc-svn.el prevents the vc-svn-diff function from being
used at all even though the diff switches are ignored by the function
and then possibly svn itself.

--- vc-svn.el   (revision 5495)
+++ vc-svn.el   (working copy)
@@ -280,11 +280,11 @@
 workfile contents as the newer version.
 This function returns a status of either 0 (no differences found), or
 1 (either non-empty diff or the diff is run asynchronously)."
-  (let* ((diff-switches-list (vc-diff-switches-list svn))
+  (let* ((diff-switches-list (vc-diff-switches-list 'svn))
          (status (vc-svn-run-status file))
          (local (elt status 1))



-- 
Karl Chen / quarl@quarl.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn diff; vc-svn-diff in vc-svn.el

[Karl Chen <qu...@hkn.eecs.berkeley.edu>]

It turns out Emacs 21.4 (in development) changed (from 21.2) the
vc-diff-switches-list list function so that you would pass 'svn
instead of svn.  So it's not an issue yet but when Emacs 21.4 is
released you'll need to add a wrapper that checks the Emacs version
(ugly).  Or you could (defvar svn 'svn) as a kludge.

Karl

>>>>> "kfogel" == Karl Fogel <kf...@newton.ch.collab.net> writes:

    kfogel> Karl Chen <qu...@hkn.eecs.berkeley.edu> writes:
    >> Also a typo in vc-svn.el prevents the vc-svn-diff function from
    >> being used at all even though the diff switches are ignored by
    >> the function and then possibly svn itself.
    >> 
    >> --- vc-svn.el   (revision 5495)
    >> +++ vc-svn.el   (working copy)
    >> @@ -280,11 +280,11 @@
    >> workfile contents as the newer version.
    >> This function returns a status of either 0 (no differences found), or
    >> 1 (either non-empty diff or the diff is run asynchronously)."
    >> -  (let* ((diff-switches-list (vc-diff-switches-list svn))
    >> +  (let* ((diff-switches-list (vc-diff-switches-list 'svn))
    >> (status (vc-svn-run-status file))
    >> (local (elt status 1))

    kfogel> The code works for me without this patch;
    kfogel> `vc-diff-switches-list' is a macro not a function.

    kfogel> What was the error you were getting?

-- 
Karl Chen / quarl@quarl.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn diff; vc-svn-diff in vc-svn.el

[Karl Fogel <kf...@newton.ch.collab.net>]

Karl Chen <qu...@hkn.eecs.berkeley.edu> writes:
> Also a typo in vc-svn.el prevents the vc-svn-diff function from being
> used at all even though the diff switches are ignored by the function
> and then possibly svn itself.
> 
> --- vc-svn.el   (revision 5495)
> +++ vc-svn.el   (working copy)
> @@ -280,11 +280,11 @@
>  workfile contents as the newer version.
>  This function returns a status of either 0 (no differences found), or
>  1 (either non-empty diff or the diff is run asynchronously)."
> -  (let* ((diff-switches-list (vc-diff-switches-list svn))
> +  (let* ((diff-switches-list (vc-diff-switches-list 'svn))
>           (status (vc-svn-run-status file))
>           (local (elt status 1))

The code works for me without this patch; `vc-diff-switches-list' is a
macro not a function.

What was the error you were getting?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: svn diff; vc-svn-diff in vc-svn.el

[Garrett Rooney <ro...@electricjellyfish.net>]

On Sunday, March 30, 2003, at 04:31 AM, Karl Chen wrote:

> Hi,
>
> The --extensions argument to svn diff doesn't seem to do anything.  (I
> want to specify -b or -w).  Is it implemented at all?

assuming you are using --diff-cmd or specifying a diff program in your 
config files, it should work.  the internal diff library doesn't 
understand any extensions, so if you just do 'svn diff -x -w' (or 
something similar), it won't work.  the next version of svn will error 
out when you try to do that, but the current release just silently 
ignores the extensions.

-garrett


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org