GNU logs - #13405, boring messages

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#13405: 24.3; log-view-diff-changeset reports wrong results
Resent-From: Andy Moreton <andrewjmoreton@HIDDEN>
Original-Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 10 Jan 2013 16:04:01 +0000
Resent-Message-ID: <handler.13405.B.135783380318290 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 13405 <at> debbugs.gnu.org
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
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: list
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org

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

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.428 (Entity 5.428)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Andy Moreton <andrewjmoreton@HIDDEN>
Subject: bug#13405: Acknowledgement (24.3; log-view-diff-changeset reports
 wrong results)
Message-ID: <handler.13405.B.135783380318290.ack <at> debbugs.gnu.org>
References: <50EEE630.3000306@HIDDEN>
X-Gnu-PR-Message: ack 13405
X-Gnu-PR-Package: emacs
Reply-To: 13405 <at> debbugs.gnu.org
Date: Thu, 10 Jan 2013 16:04:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-gnu-emacs@HIDDEN

If you wish to submit further information on this problem, please
send it to 13405 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
13405: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D13405
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#13405: 24.3; log-view-diff-changeset reports wrong results
Resent-From: Stefan Monnier <monnier@HIDDEN>
Original-Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 11 Jan 2013 23:14:02 +0000
Resent-Message-ID: <handler.13405.B13405.13579460244087 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Andy Moreton <andrewjmoreton@HIDDEN>
Cc: 13405 <at> debbugs.gnu.org
From: Stefan Monnier <monnier@HIDDEN>
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
Precedence: list
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org

> 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

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#13405: 24.3; log-view-diff-changeset reports wrong results
Resent-From: Andy Moreton <andrewjmoreton@HIDDEN>
Original-Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 12 Jan 2013 14:23:02 +0000
Resent-Message-ID: <handler.13405.B13405.135800057929717 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Stefan Monnier <monnier@HIDDEN>
Cc: 13405 <at> debbugs.gnu.org
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
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
Precedence: list
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org

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

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

Received: (at control) by debbugs.gnu.org; 13 Nov 2013 19:21:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 13 14:21:44 2013
Received: from localhost ([127.0.0.1]:50506 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.80)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1Vgg0V-0006Zh-N3
	for submit <at> debbugs.gnu.org; Wed, 13 Nov 2013 14:21:44 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:44576 ident=Debian-exim)
 by debbugs.gnu.org with esmtp (Exim 4.80)
 (envelope-from <rgm@HIDDEN>) id 1Vgg0T-0006ZZ-Oq
 for control <at> debbugs.gnu.org; Wed, 13 Nov 2013 14:21:42 -0500
Received: from rgm by fencepost.gnu.org with local (Exim 4.71)
 (envelope-from <rgm@HIDDEN>) id 1Vgg0T-0005vG-CW
 for control <at> debbugs.gnu.org; Wed, 13 Nov 2013 14:21:41 -0500
Date: Wed, 13 Nov 2013 14:21:41 -0500
Message-Id: <E1Vgg0T-0005vG-CW@HIDDEN>
Subject: control message for bug 15883
To: <control <at> debbugs.gnu.org>
X-Mailer: mail (GNU Mailutils 2.1)
From: Glenn Morris <rgm@HIDDEN>
X-Spam-Score: -5.0 (-----)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.15
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>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -5.0 (-----)

merge 13405 15883

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.