unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Andy Moreton <andrewjmoreton@gmail.com>
To: 13405@debbugs.gnu.org
Subject: bug#13405: 24.3; log-view-diff-changeset reports wrong results
Date: Thu, 10 Jan 2013 16:02:56 +0000	[thread overview]
Message-ID: <50EEE630.3000306@gmail.com> (raw)

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






             reply	other threads:[~2013-01-10 16:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-10 16:02 Andy Moreton [this message]
2013-01-11 23:13 ` bug#13405: 24.3; log-view-diff-changeset reports wrong results Stefan Monnier
2013-01-12 14:22   ` Andy Moreton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50EEE630.3000306@gmail.com \
    --to=andrewjmoreton@gmail.com \
    --cc=13405@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).