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#13405: 24.3; log-view-diff-changeset reports wrong results Date: Fri, 11 Jan 2013 18:13:26 -0500 Message-ID: References: <50EEE630.3000306@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1357946040 14493 80.91.229.3 (11 Jan 2013 23:14:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Jan 2013 23:14:00 +0000 (UTC) Cc: 13405@debbugs.gnu.org To: Andy Moreton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jan 12 00:14:17 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 1Ttnnk-0003Tf-MZ for geb-bug-gnu-emacs@m.gmane.org; Sat, 12 Jan 2013 00:14:16 +0100 Original-Received: from localhost ([::1]:59890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtnnU-00015W-I0 for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Jan 2013 18:14:00 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:46313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtnnQ-00013M-3d for bug-gnu-emacs@gnu.org; Fri, 11 Jan 2013 18:13:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtnnN-0005Yp-5h for bug-gnu-emacs@gnu.org; Fri, 11 Jan 2013 18:13:56 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtnnN-0005Yl-2n for bug-gnu-emacs@gnu.org; Fri, 11 Jan 2013 18:13:53 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TtnnW-00014Z-3R for bug-gnu-emacs@gnu.org; Fri, 11 Jan 2013 18:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 11 Jan 2013 23:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 13405 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 13405-submit@debbugs.gnu.org id=B13405.13579460244087 (code B ref 13405); Fri, 11 Jan 2013 23:14:02 +0000 Original-Received: (at 13405) by debbugs.gnu.org; 11 Jan 2013 23:13:44 +0000 Original-Received: from localhost ([127.0.0.1]:55881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TtnnD-00013r-Gx for submit@debbugs.gnu.org; Fri, 11 Jan 2013 18:13:44 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:10252) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TtnnB-00013f-QA for 13405@debbugs.gnu.org; Fri, 11 Jan 2013 18:13:42 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtkGAG6Zu09MCpYP/2dsb2JhbABEgXuyFoEIghUBAQQBViMFCwsOJhIUGA0kiBwFugmQRAOIQppxgViDBw X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="212336487" Original-Received: from 76-10-150-15.dsl.teksavvy.com (HELO pastel.home) ([76.10.150.15]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 11 Jan 2013 18:13:27 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 9A9385943D; Fri, 11 Jan 2013 18:13:26 -0500 (EST) In-Reply-To: <50EEE630.3000306@gmail.com> (Andy Moreton's message of "Thu, 10 Jan 2013 16:02:56 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) 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:69628 Archived-At: > 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 ? VC assumes you can get the changeset by running "hg diff -r -r 46769". Is there a that would give the right answer? Ideally this should be computable from "46769". Stefan