GNU bug report logs - #13405
24.3; log-view-diff-changeset reports wrong results

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: emacs; Reported by: Andy Moreton <andrewjmoreton@HIDDEN>; merged with #15883; dated Thu, 10 Jan 2013 16:04:01 UTC; Maintainer for emacs is bug-gnu-emacs@HIDDEN.
Merged 13405 15883. Request was from Glenn Morris <rgm@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 13405 <at> debbugs.gnu.org:


Received: (at 13405) by debbugs.gnu.org; 12 Jan 2013 14:22:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Jan 12 09:22:59 2013
Received: from localhost ([127.0.0.1]:56460 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1Tu1z8-0007jF-LF
	for submit <at> debbugs.gnu.org; Sat, 12 Jan 2013 09:22:59 -0500
Received: from mail-ea0-f169.google.com ([209.85.215.169]:57050)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1Tu1z5-0007j2-PO
	for 13405 <at> debbugs.gnu.org; Sat, 12 Jan 2013 09:22:56 -0500
Received: by mail-ea0-f169.google.com with SMTP id a12so1108140eaa.28
	for <13405 <at> debbugs.gnu.org>; Sat, 12 Jan 2013 06:22:37 -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:cc
	:subject:references:in-reply-to:content-type
	:content-transfer-encoding;
	bh=a9Jtaew7UeGoxejiXdyy15qgh4y2LbGnWZmtUCxJ0/0=;
	b=ec9JNlNhAM/5Nktrv/bqMM/QS1Xs8C35/cFz13s+oXsEWPVkoEZuQj91UYxMmGa3vd
	JPY6beeSSZCXPSNlvVASVOwLRFbrKHy00DR2ttkrk2kLCNbYSh1m9VYNuWXQLkcZSnYP
	myGsRQn+/btnVUZrSUsgEiw4X/oYut/JcsN0HhgsY+C4Fkl+qmSl8eve4xcfU9YBIGO7
	TcoL5Vtz8+rCMUMCyG8dAC/GTMDZGfg7GV04OkclQSstNpFSLOc6JyaH3t1XEsA+FTK7
	pZbMhxmpL8eI4qmwEl4IrYnyXSVqBMwx+ADqUv9NcF0urCOwic8oJW5pordqlO5mxXUE
	48mw==
X-Received: by 10.14.184.134 with SMTP id s6mr210235413eem.43.1358000557435;
	Sat, 12 Jan 2013 06:22:37 -0800 (PST)
Received: from [192.168.0.3] (82-69-64-228.dsl.in-addr.zen.co.uk.
	[82.69.64.228])
	by mx.google.com with ESMTPS id f6sm13037358eeo.7.2013.01.12.06.22.36
	(version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
	Sat, 12 Jan 2013 06:22:36 -0800 (PST)
Message-ID: <50F171A3.9050200@HIDDEN>
Date: Sat, 12 Jan 2013 14:22:27 +0000
From: Andy Moreton <andrewjmoreton@HIDDEN>
User-Agent: Mozilla/5.0 (Windows NT 5.1;
	rv:17.0) Gecko/20130107 Thunderbird/17.0.2
MIME-Version: 1.0
To: Stefan Monnier <monnier@HIDDEN>
Subject: Re: bug#13405: 24.3; log-view-diff-changeset reports wrong results
References: <50EEE630.3000306@HIDDEN>
	<jwv4nin2u3d.fsf-monnier+emacs@HIDDEN>
In-Reply-To: <jwv4nin2u3d.fsf-monnier+emacs@HIDDEN>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.1 (/)
X-Debbugs-Envelope-To: 13405
Cc: 13405 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: -0.7 (/)

On 11/01/2013 23:13, Stefan Monnier wrote:
>> 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 <something> -r 46769".  Is there a <something> that would
> give the right answer?  Ideally this <something> should be computable
> from "46769".

This can be done using revsets:
# hg diff -r46769^1 -r 46769 | wc -l
295

However that relies on having a new enough version of mercurial that 
supports the revsets syntax. The "hg diff -c" or "hg log -p" commands 
work with older mercurial versions that do not support revset syntax.

     AndyM
Information forwarded to bug-gnu-emacs@HIDDEN:
bug#13405; Package emacs. Full text available.

Message received at 13405 <at> debbugs.gnu.org:


Received: (at 13405) by debbugs.gnu.org; 11 Jan 2013 23:13:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 11 18:13:44 2013
Received: from localhost ([127.0.0.1]:55881 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1TtnnD-00013r-Gx
	for submit <at> debbugs.gnu.org; Fri, 11 Jan 2013 18:13:44 -0500
Received: from ironport2-out.teksavvy.com ([206.248.154.182]:10252)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <monnier@HIDDEN>) id 1TtnnB-00013f-QA
	for 13405 <at> 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"
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
Received: by pastel.home (Postfix, from userid 20848)
	id 9A9385943D; Fri, 11 Jan 2013 18:13:26 -0500 (EST)
From: Stefan Monnier <monnier@HIDDEN>
To: Andy Moreton <andrewjmoreton@HIDDEN>
Subject: Re: bug#13405: 24.3; log-view-diff-changeset reports wrong results
Message-ID: <jwv4nin2u3d.fsf-monnier+emacs@HIDDEN>
References: <50EEE630.3000306@HIDDEN>
Date: Fri, 11 Jan 2013 18:13:26 -0500
In-Reply-To: <50EEE630.3000306@HIDDEN> (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)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.8 (/)
X-Debbugs-Envelope-To: 13405
Cc: 13405 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: 0.8 (/)

> 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 <something> -r 46769".  Is there a <something> that would
give the right answer?  Ideally this <something> should be computable
from "46769".


        Stefan
Information forwarded to bug-gnu-emacs@HIDDEN:
bug#13405; Package emacs. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 10 Jan 2013 16:03:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 10 11:03:23 2013
Received: from localhost ([127.0.0.1]:54354 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1TtKbC-0004kw-6x
	for submit <at> debbugs.gnu.org; Thu, 10 Jan 2013 11:03:23 -0500
Received: from eggs.gnu.org ([208.118.235.92]:59329)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1TtKbA-0004kf-7J
	for submit <at> debbugs.gnu.org; Thu, 10 Jan 2013 11:03:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1TtKb0-0000nh-BG
	for submit <at> debbugs.gnu.org; Thu, 10 Jan 2013 11:03:13 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=unavailable version=3.3.2
Received: from lists.gnu.org ([208.118.235.17]:42140)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1TtKb0-0000nd-9H
	for submit <at> debbugs.gnu.org; Thu, 10 Jan 2013 11:03:10 -0500
Received: from eggs.gnu.org ([208.118.235.92]:42423)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1TtKax-00010q-9j
	for bug-gnu-emacs@HIDDEN; Thu, 10 Jan 2013 11:03:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1TtKaq-0000kL-Oc
	for bug-gnu-emacs@HIDDEN; Thu, 10 Jan 2013 11:03:06 -0500
Received: from mail-wi0-f176.google.com ([209.85.212.176]:33161)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andrewjmoreton@HIDDEN>) id 1TtKaq-0000kF-Hz
	for bug-gnu-emacs@HIDDEN; Thu, 10 Jan 2013 11:03:00 -0500
Received: by mail-wi0-f176.google.com with SMTP id hm6so1339700wib.15
	for <bug-gnu-emacs@HIDDEN>; 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)
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)
Message-ID: <50EEE630.3000306@HIDDEN>
Date: Thu, 10 Jan 2013 16:02:56 +0000
From: Andy Moreton <andrewjmoreton@HIDDEN>
User-Agent: Mozilla/5.0 (Windows NT 5.1;
	rv:17.0) Gecko/20130107 Thunderbird/17.0.2
MIME-Version: 1.0
To: bug-gnu-emacs@HIDDEN
Subject: 24.3; log-view-diff-changeset reports wrong results
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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-Received-From: 208.118.235.17
X-Spam-Score: -3.4 (---)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: -4.2 (----)

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
Acknowledgement sent to Andy Moreton <andrewjmoreton@HIDDEN>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs@HIDDEN. Full text available.
Report forwarded to bug-gnu-emacs@HIDDEN:
bug#13405; Package emacs. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Mon, 25 Nov 2019 12:00:02 UTC

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