External diff still broken on Windows

[Darrell Gallion]

Darrell dgallion1 gmail

external diff still broken on
windows<http://marc.theaimsgroup.com/?l=mercurial&m=115773290917708&w=2>

C:\>hg.py ediff -r 164:163
making snapshot of 6 files from rev cf67b7a065a9
making snapshot of 31 files from rev f24ae92bce16
The filename, directory name, or volume label syntax is incorrect.


mercurial.ini
[extdiff]
cmd.ediff = "C:\Program Files\ExamDiff Pro\ExamDiff.exe"

A better fix, might be to take the quotes from mercrial.ini and not try to
figure out the os
One type of fix in extdiff.py

        if os.name == 'nt':
            cmdline = '"%s %s %s %s"' %(diffcmd, ' '.join(opts['option']),
                         util.shellquote(dir1), util.shellquote(dir2))
        else:
            cmdline = ('%s %s %s %s' %
                       (util.shellquote(diffcmd),
                        ' '.join(map(util.shellquote, diffopts)),
                        util.shellquote(dir1), util.shellquote(dir2)))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.selenic.com/pipermail/mercurial-devel/attachments/20061109/c3e93da3/attachment.html