GNU bug report logs - #4642
diff from log-view somtime diffs the wrong file

Previous Next

Full log

Message #8 received at submit <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Stefan Monnier <monnier <at> iro.umontreal.ca>
To: Dan Nicolaescu <dann <at> ics.uci.edu>
Cc: 4642 <at> debbugs.gnu.org, bug-gnu-emacs <bug-gnu-emacs <at> gnu.org>
Subject: Re: bug#4642: diff from log-view somtime diffs the wrong file
Date: Mon, 05 Oct 2009 09:44:59 -0400

> One way to fix this is to make log-view-diff not call vc-version-diff,
> but vc-diff-internal, like so:

That looks OK.  But we should also either fix vc-version-diff so it
doesn't ignore its `files' argument, or otherwise remove that argument
(which will be a good opportunity to go and fix the other callers).


        Stefan


> --- log-view.el.~1.60.~    2009-10-03 03:20:50.000000000 -0700
> +++ log-view.el            2009-10-04 19:20:58.000000000 -0700
> @@ -496,11 +496,12 @@ changeset that affected the currently co
>          (goto-char end)
>          (log-view-msg-next)
>          (setq to (log-view-current-tag))))
> -    (vc-version-diff
> -     (if log-view-per-file-logs
> -      (list (log-view-current-file))
> -       log-view-vc-fileset)
> -       to fr)))
> +    (vc-diff-internal
> +     t (list log-view-vc-backend
> +          (if log-view-per-file-logs
> +               (list (log-view-current-file))
> +                      log-view-vc-fileset))
> +     to fr)))
 
>  (declare-function vc-diff-internal "vc"
>                     (async vc-fileset rev1 rev2 &optional verbose))

> OK to check in?

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.