From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#4642: diff from log-view somtime diffs the wrong file Date: Mon, 05 Oct 2009 09:44:59 -0400 Message-ID: References: <200910051243.n95ChutU010935@godzilla.ics.uci.edu> Reply-To: Stefan Monnier , 4642@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1254751647 2806 80.91.229.12 (5 Oct 2009 14:07:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 5 Oct 2009 14:07:27 +0000 (UTC) Cc: 4642@emacsbugs.donarmstrong.com, bug-gnu-emacs To: Dan Nicolaescu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 05 16:07:22 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MuoDh-0007C2-9r for geb-bug-gnu-emacs@m.gmane.org; Mon, 05 Oct 2009 16:07:21 +0200 Original-Received: from localhost ([127.0.0.1]:44242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuoDh-0005aJ-98 for geb-bug-gnu-emacs@m.gmane.org; Mon, 05 Oct 2009 10:07:21 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuoDc-0005Y8-1m for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 10:07:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuoDX-0005Sm-I8 for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 10:07:15 -0400 Original-Received: from [199.232.76.173] (port=56772 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuoDX-0005SX-6v for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 10:07:11 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:60993) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MuoDW-0002oD-Jz for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 10:07:10 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n95E78Y0007196; Mon, 5 Oct 2009 07:07:08 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n95Dt6Ef004371; Mon, 5 Oct 2009 06:55:06 -0700 Resent-Date: Mon, 5 Oct 2009 06:55:06 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Mon, 05 Oct 2009 13:55:06 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 4642 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12547503082907 (code B ref -1); Mon, 05 Oct 2009 13:55:06 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 5 Oct 2009 13:45:08 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n95Dj5xt002814 for ; Mon, 5 Oct 2009 06:45:07 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Muns9-0001zu-E9 for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 09:45:05 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Muns4-0001vC-UN for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 09:45:05 -0400 Original-Received: from [199.232.76.173] (port=49209 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Muns4-0001uz-Iq for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 09:45:00 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:50576 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Muns4-0007YE-8D for bug-gnu-emacs@gnu.org; Mon, 05 Oct 2009 09:45:00 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApsEAHeVyUrO+IBv/2dsb2JhbACBUtA3hCoEgVKFVoJ1 X-IronPort-AV: E=Sophos;i="4.44,505,1249272000"; d="scan'208";a="47104284" Original-Received: from 206-248-128-111.dsl.teksavvy.com (HELO pastel.home) ([206.248.128.111]) by ironport2-out.pppoe.ca with ESMTP; 05 Oct 2009 09:44:59 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 6A12281F0; Mon, 5 Oct 2009 09:44:59 -0400 (EDT) In-Reply-To: <200910051243.n95ChutU010935@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Mon, 5 Oct 2009 05:43:57 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Mon, 05 Oct 2009 10:07:15 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:31700 Archived-At: > 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?