Hi,

Darcs seems to be doing something odd with command line arguments - I think
it's adding a space before each one, though I haven't specifically confirmed
that.

In the darcs defaults file I have the following line:
ALL diff-command "C:\\Program Files\\WinMerge\\WinMergeU.exe" -r %1 %2

When I do a darcs diff, it launches winmerge, but winmerge is interpreting
the "-r" as a folder name instead of a switch. Winmerge doesn't do this if I
pass the same arguments manually on the command line.

After a bit of playing around I discovered the same behaviour by manually
passing " -r" (there's a space at the front), so I'm guessing that's the
problem

This is on windows with the following version:
darcs compiled on Feb 16 2009, at 15:01:44

Context:

[TAG 2.2.1
Petr Rockai <me@mornfall.net>**20090214071133
 Ignore-this: f4a1d192bc93490e498eed18c1165d8d
]

Regards,
David

Attachments

• unnamed

Hi David,

Thanks for the bug report!  Could you please attach the output of darcs diff
--debug?

It may also help if you tried with Darcs 2.3, but I doubt anything has changed
that would affect this.

Sure, below is a log of creating a new repository and running a diff --debug
Also I don't feel like trying to build Darcs and can't see a prebuilt
windows binary for 2.3, so I'm avoiding it for the moment

------

C:\temp\Darcs\a>darcs init

C:\temp\Darcs\a>echo hi > a.txt

C:\temp\Darcs\a>darcs add a.txt

C:\temp\Darcs\a>darcs record
Darcs needs to know what name (conventionally an email address) to use as
the
patch author, e.g. 'Fred Bloggs <fred@bloggs.invalid>'.  If you provide one
now it will be stored in the file '_darcs/prefs/author' and used as a
default
in the future.  To change your preferred author address, simply delete or
edit
this file.

What is your email address? David
addfile ./a.txt
Shall I record this change? (1/2)  [ynWsfvplxdaqjk], or ? for help: y
hunk ./a.txt 1
+hi [_^M_][_$_]
Shall I record this change? (2/2)  [ynWsfvplxdaqjk], or ? for help: y
What is the patch name? Init
Do you want to add a long comment? [yn]n
Finished recording patch 'Init'

C:\temp\Darcs\a>echo hi again >> a.txt

C:\temp\Darcs\a>darcs diff --debug a.txt
Beginning identifying repository .
Done identifying repository .
Identified darcs-2 repo: C:/temp/Darcs/a
Reading hash file
0000000088-bef6a1b8c51feed04b97a37e06f0b70dfbf1edd0d5d85debdd2ed2d3ba5e8398
from pristine.hashed/
I'm doing copyFileUsingCache on
pristine.hashed/0000000088-bef6a1b8c51feed04b97a37e06f0b70dfbf1edd0d5d85debdd2ed2d3ba5e8398
Reading hash file
0000000005-004f1d2a97d7ac09d758198810e275185e51f95d9bc01143e9d70ab40fffa5b8
from pristine.hashed/
I'm doing copyFileUsingCache on
pristine.hashed/0000000005-004f1d2a97d7ac09d758198810e275185e51f95d9bc01143e9d70ab40fffa5b8
Beginning reading pristine
Reading hash file
0000000088-bef6a1b8c51feed04b97a37e06f0b70dfbf1edd0d5d85debdd2ed2d3ba5e8398
from pristine.hashed/
I'm doing copyFileUsingCache on
pristine.hashed/0000000088-bef6a1b8c51feed04b97a37e06f0b70dfbf1edd0d5d85debdd2ed2d3ba5e8398
Running command 'C:\Program Files\WinMerge\WinMergeU.exe -r old-a/a.txt
new-a/a.txt'
Disabling progress reports...
Reenabling progress reports.
Disabling progress reports...
Hit return to move on...
Reenabling progress reports.

On Fri, Sep 11, 2009 at 6:21 PM, Eric Kow <bugs@darcs.net> wrote:

>
> Eric Kow <kowey@darcs.net> added the comment:
>
> Hi David,
>
> Thanks for the bug report!  Could you please attach the output of darcs
> diff
> --debug?
>
> It may also help if you tried with Darcs 2.3, but I doubt anything has
> changed
> that would affect this.
>
> ----------
> assignedto:  -> dburburan
> nosy: +eivuokko, jaredj, kirby, kowey, wglozer
> status: unknown -> waiting-for
> topic: +Windows
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/issue1606>
> __________________________________
>

Attachments

• unnamed

Hi David,

Does --diff-opts '-r' do the trick?

Sorry for the late reply.  I didn't think of this until I reviewed a
documentation patch from Trent and understood darcs diff better :-)

Hi Eric,
Nope, turns out diff-opts doesn't work with diff-command. The help says:
--diff-command=COMMAND  specify diff command (ignores --diff-opts)

Cheers,
David

On Fri, Oct 9, 2009 at 3:01 AM, Eric Kow <bugs@darcs.net> wrote:

>
> Eric Kow <kowey@darcs.net> added the comment:
>
> Hi David,
>
> Does --diff-opts '-r' do the trick?
>
> Sorry for the late reply.  I didn't think of this until I reviewed a
> documentation patch from Trent and understood darcs diff better :-)
>
> ----------
> assignedto:  -> dburburan
> status: unknown -> waiting-for
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/issue1606>
> __________________________________
>

Attachments

• unnamed

David, oops!  I guess my revised understanding was imperfect :-)

David: one more thing which may help (just to simplify things) is to see what
happens when you put WinMerge in a location that does not have any spaces in its
path.  It's just to cut down on the number of variables involved.

Otherwise, I'm turning this over to the community.  We need somebody (preferably
with a Windows machine) to replicate and explain the cause of this.