all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 14443@debbugs.gnu.org
Subject: bug#14443: 24.3.50; log-view-diff and log-view-diff-changeset broken in vc-bzr-change-log-mode and vc-annotate-mode (on w32)
Date: Thu, 23 May 2013 23:53:52 +0400	[thread overview]
Message-ID: <519E73D0.2090602@yandex.ru> (raw)
In-Reply-To: <83k3mpskp1.fsf@gnu.org>

On 23.05.2013 20:52, Eli Zaretskii wrote:
>> Date: Thu, 23 May 2013 20:46:07 +0400
>> From: Dmitry Gutov <dgutov@yandex.ru>
>> CC: 14443@debbugs.gnu.org, Eli Zaretskii <eliz@gnu.org>
>>
>> I'm not sure how to find out.
>
> You could put a breakpoint on call-process and examine its arguments,
> for example.

I've rummaged around the manual a bit, and still don't understand what 
the recommended workflow is.

Should I normally do `edebug-defun' before adding a breakpoint?

How do I display the value of a local variable? Even after breakpoint 
hits, using `edebug-eval-expression' with the variable name still gives 
me "variable is void".

How do I un-instrument a function? AFAICS, there are no commands like 
`edebug-cancel-', `-reset-' or `-remove-'.

Please point me at any relevant documentation.

>> `vc-do-command' receives the following arguments:
>>
>> buffer: *vc-diff* command: bzr file-or-list: nil flags: (diff
>> --diff-options -u -r 112671..112672)
>
> Why do you use --diff-options?  "bzr diff" works as if -u was
> specified anyway, and will use its internal emulation of Diff if you
> don't pass --diff-options.

`vc-bzr-diff' does that automatically because `diff-switches' is '-u' here.

If I remove that explicit setting from my config, it falls back to "-c", 
and that (when external diff program is present, of course) makes vc-bzr 
produce context diffs.
Curiously, vc-git still uses the unified format in that case.

Setting it to nil works as you expected.

>> After recent overhaul of my MinGW installation, a number of Unix
>> utilities became unavailable globally, including `diff'.
>
> That's probably related.  So restore your diff.exe, and things will
> work again.  They do for me, because my diff.exe is in perfect working
> order.

I've done that, works fine now. Sorry for the false alarm, I should have 
investigated it more myself first.

Using diff.exe from the GnuWin32 collection is recommended, right?





  reply	other threads:[~2013-05-23 19:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-22 22:22 bug#14443: 24.3.50; log-view-diff and log-view-diff-changeset broken in vc-bzr-change-log-mode and vc-annotate-mode (on w32) Dmitry Gutov
2013-05-23  7:25 ` Glenn Morris
2013-05-23 12:09   ` Dmitry Gutov
2013-05-23 16:09     ` Glenn Morris
2013-05-23 16:46       ` Dmitry Gutov
2013-05-23 16:52         ` Eli Zaretskii
2013-05-23 19:53           ` Dmitry Gutov [this message]
2013-05-23 20:17             ` Eli Zaretskii
2013-05-23 20:25               ` Dmitry Gutov
2013-05-23 16:59         ` Glenn Morris
2013-05-23 16:23   ` Eli Zaretskii

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

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

  git send-email \
    --in-reply-to=519E73D0.2090602@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=14443@debbugs.gnu.org \
    --cc=eliz@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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.