[cvsnt] Question about the xdiff option

[Arthur Barrett]

David,

The xdiff command uses a "custom" api to call a diff function based on
the filename patter.  The actual xdiff runs on the server.  We haven't
done much with this yet but plan to in later revisions.  Basically it
transfers the role of doing user presented diffs from the client to the
server, minimising the number of things you need to install on the
client, and also allowing web based utilities such as ViewCVS to have a
consistent way of getting things such as "side by side" diffs.

Basically the xdiff API specifies that the xidff dll must be able to
support a basic text output comparison of two files, but other xdiff
specific options can also be passed.  Common "recommended" xdiff options
would be -html (for an HTML formatted "side by side" view), -c (context
diff) etc.

There should be sample source in the repo.

Regards,


Arthur Barrett

-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf
Of David Planella
Sent: 09 February 2006 08:32
To: cvsnt at cvsnt.org
Subject: [cvsnt] Question about the xdiff option


Hi,

After reading about the xdiff command in the manual, it is not clear to
me what its capabilities are or how the external diff tool can be
defined in the cvswrappers file. 

I'm running cvsnt on Windows and although I use WinCvs for version
control, I sometimes invoke cvs from the IDE I'm using at work. This IDE
is called Keil uVision3, and it allows development of C/C++ projects for
embedded microprocessors. The user interface is similar (so similar I'd
say is based on it) to the Visual C IDE of MS Visual Studio 6. Anyway,
the thing is that it allows me to run commands by invoking cvs from
within the IDE and see its output on a small output console. I'm not
using that for managing projects, merging or branching (for that I've
got WinCvs), but rather as a quick way of commiting single files,
checking its status, doing updates, etc.

The point is, that I've read about this xdiff feature, and the way I
understood its functionality, it would allow me to call an external diff
program -with graphical user interface, for example. Therefore, the next
thing I tried was to set up the cvswrappers file to point to kdiff3.exe,
the graphical diff tool I'm using for examining diffs in a more visual
way, but with no success. The syntax to add a reference to kdiff3 in
cvswrappers is not very clear to me... Therefore, my questions are:

1) Is it possible to get the xdiff command to use a graphical external
diff program?

2) If so, what is the syntax to specify the external diff tool in
cvswrappers in Windows (Let's say the xdiff tool is C:\Programs
\kdiff3.exe)?

Thanks.



_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt