From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andy Moreton Newsgroups: gmane.emacs.bugs Subject: bug#13405: 24.3; log-view-diff-changeset reports wrong results Date: Thu, 10 Jan 2013 16:02:56 +0000 Message-ID: <50EEE630.3000306@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1357833870 11706 80.91.229.3 (10 Jan 2013 16:04:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 10 Jan 2013 16:04:30 +0000 (UTC) To: 13405@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jan 10 17:04:47 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TtKcU-0006ZP-G2 for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Jan 2013 17:04:42 +0100 Original-Received: from localhost ([::1]:33720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKcE-0001gb-He for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Jan 2013 11:04:26 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKbz-00018i-PH for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:04:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtKbo-0000vL-Ot for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:04:11 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKbo-0000vA-LU for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:04:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TtKbp-0004lm-KS for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:04:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andy Moreton Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 10 Jan 2013 16:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 13405 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.135783380318290 (code B ref -1); Thu, 10 Jan 2013 16:04:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Jan 2013 16:03:23 +0000 Original-Received: from localhost ([127.0.0.1]:54354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TtKbC-0004kw-6x for submit@debbugs.gnu.org; Thu, 10 Jan 2013 11:03:23 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:59329) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TtKbA-0004kf-7J for submit@debbugs.gnu.org; Thu, 10 Jan 2013 11:03:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtKb0-0000nh-BG for submit@debbugs.gnu.org; Thu, 10 Jan 2013 11:03:13 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:42140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKb0-0000nd-9H for submit@debbugs.gnu.org; Thu, 10 Jan 2013 11:03:10 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:42423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKax-00010q-9j for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:03:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtKaq-0000kL-Oc for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:03:06 -0500 Original-Received: from mail-wi0-f176.google.com ([209.85.212.176]:33161) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKaq-0000kF-Hz for bug-gnu-emacs@gnu.org; Thu, 10 Jan 2013 11:03:00 -0500 Original-Received: by mail-wi0-f176.google.com with SMTP id hm6so1339700wib.15 for ; Thu, 10 Jan 2013 08:02:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=deGhN1650aBwta2zPcb1VWq/s9lqY924/dZk60WJDqc=; b=ik+UQmmu8B3zH63kItJmgIvN3ADSldbTFX6N1yl8QuJO5yJMbs2d0c/tx1jhAVZERb iOqRdKIQjGlRm26Be7U2Adip6FKCUSv+JF2trTpN/MBiFYvVdzMkj03/dvOnUMz8CWdX wUDaUvXsmx7sTDy92aPhJaSjLI5xW/lz8SP0H1Gbi/BddicOr8hYZxmex/3i+29WSt2/ 6WBgfzvmF7jzTndhocmFCnckP0d5WN7xEQaoTAXTI8770B0EwvwX4UjTohvEh35olRaC glYYecj1DXSRb7WoejqU1OURuwRmK2EjLZvSYHHqyDOXcp4UXgizNx91Oy9cyePY0z2o HXbg== X-Received: by 10.180.19.99 with SMTP id d3mr10233089wie.4.1357833779106; Thu, 10 Jan 2013 08:02:59 -0800 (PST) Original-Received: from [10.17.20.82] (uk.solarflare.com. [193.34.186.16]) by mx.google.com with ESMTPS id l5sm2929645wia.10.2013.01.10.08.02.57 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jan 2013 08:02:57 -0800 (PST) User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:69569 Archived-At: Emacs trunk built from r111470 on Windows XP (with mingw gcc 4.7.2). Using vc support in emacs with a mercurial (hg) repository: 1) Annotate a file under hg version control. 2) Type "l" (vc-annotate-show-log-revision-at-line) in the annotate buffer to show the *vc-change-log* buffer containing the log entry for revision 46769. 3) In the *vc-change-log* buffer, type D (log-view-diff-changeset) to view the changeset for that single revision. Emacs runs "hg diff --git -r 46768 -r 46769", but this does not show the expected contents of the changeset, as the previous revision was on a different named branch. Instead this shows the (large) diff between the two branches. The line counts illustrate this: # hg diff -r 46768 -r 46769 | wc -l ## Diff between branches 102276 # hg diff -c 46769 | wc -l ## Changeset diff 295 # hg log -p -r 46769 | wc -l ## Changeset diff + hg metadata 302 The second and third commands give the expected output. Can log-view-diff-changeset be changed to deal with this case more gracefully ? AndyM