/usr/share/doc/gnat-gps/html/Visual-Comparison.html

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!-- Copyright (C) 2002-2010 AdaCore.

This document is free; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This document is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License along
with this program; if not, see http://www.gnu.org/licenses/.

A copy of the license is included in the section entitled
"GNU General Public License". -->
<!-- Created by GNU Texinfo 5.1, http://www.gnu.org/software/texinfo/ -->
<head>
<title>Using the GNAT Programming Studio: Visual Comparison</title>

<meta name="description" content="Using the GNAT Programming Studio: Visual Comparison">
<meta name="keywords" content="Using the GNAT Programming Studio: Visual Comparison">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="makeinfo">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="index.html#Top" rel="start" title="Top">
<link href="Index-table.html#Index-table" rel="index" title="Index table">
<link href="Tools.html#Tools" rel="up" title="Tools">
<link href="Code-Fixing.html#Code-Fixing" rel="next" title="Code Fixing">
<link href="Coding-Standard.html#Coding-Standard" rel="previous" title="Coding Standard">
<style type="text/css">
<!--
   

a.summary-letter {text-decoration: none}
blockquote.smallquotation {font-size: smaller}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
div.indentedblock {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
div.smalldisplay {margin-left: 3.2em}
div.smallexample {margin-left: 3.2em}
div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
div.smalllisp {margin-left: 3.2em}
kbd {font-style:oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
pre.smalldisplay {font-family: inherit; font-size: smaller}
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: inherit; font-size: smaller}
pre.smalllisp {font-size: smaller}
span.nocodebreak {white-space:nowrap}
span.nolinebreak {white-space:nowrap}
span.roman {font-family:serif; font-weight:normal}
span.sansserif {font-family:sans-serif; font-weight:normal}
ul.no-bullet {list-style: none}
pre.smallexample {background-color:rgb(240,240,240);
                     font-family: courier new,courier,fixed;
                     font-size: 14px;
                     margin: 0px 40px 0px 40px;
                     border-width: 1px 2px 2px 1px;
                     border-top-style: dotted;
                     border-left-style: dotted;
                     border-right-style: solid;
                     border-bottom-style: solid;
                     border-color: black;}
   code             {color:black;
                     font-family: courier new,courier,fixed;
                     font-size: 14px;}
   body             {font-family: arial,helvetica,sans-serif;
                     font-size: 16px;
                     max-width: 800px;
                     text-align: justify}
   samp             {font-family: courier new,courier,fixed;
                     font-size: 14px}
                    

-->
</style>


</head>

<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
<a name="Visual-Comparison"></a>
<div class="header">
<p>
Next: <a href="Code-Fixing.html#Code-Fixing" accesskey="n" rel="next">Code Fixing</a>, Previous: <a href="Coding-Standard.html#Coding-Standard" accesskey="p" rel="previous">Coding Standard</a>, Up: <a href="Tools.html#Tools" accesskey="u" rel="up">Tools</a> &nbsp; [<a href="Index-table.html#Index-table" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<a name="Visual-Comparison-1"></a>
<h3 class="section">13.3 Visual Comparison</h3>
<a name="index-visual-diff-1"></a>

<p>The visual comparison, available either from the VCS menus or from the Tools
menu, provide a way to display graphically differences between two or three
files, or two different versions of the same file.
</p>
<p>The 2-file comparison tool is based on the standard text command
<code>diff</code>, available on all Unix systems. Under Windows, a default
implementation is provided with GPS, called <code>gnudiff.exe</code>.
You may want to provide an alternate implementation by e.g. installing a
set of Unix tools such as cygwin (<a href="http://www.cygwin.com">http://www.cygwin.com</a>).
</p>
<p>The 3-file comparison tool is based on the text command <code>diff3</code>,
available on all Unix systems. Under Windows, this tool is not shipped
with GPS. It is available as part of cygwin, for example.
</p>
<p>When querying a visual comparison in GPS, in Side_By_Side mode, the user area
will show, side by side, editors for the files involved in the comparison.
The reference file is placed by default on the left side. When in Unified mode,
GPS will not open a new editor, but will show all the changes directly in the
original editor. Note that Unified mode is relevant only when comparing two
files: when comparing three files, the Side_By_Side mode is used.
</p>
<p>Color highlighting will be added to the file editors:
</p>
<dl compact="compact">
<dt><b>gray</b></dt>
<dd><p>This color is used for all the chunks on the reference (left) file. Only
the modified (right) file is displayed with different colors.
</p>
</dd>
<dt><b>yellow</b></dt>
<dd><p>This color is used to display lines that have been modified compared to the
reference file. When there are fine differences within one line, they are
shown in a brighter yellow.
</p>
</dd>
<dt><b>green</b></dt>
<dd><p>Used to display lines added compared to the reference file; in other words,
lines that are not present in the reference file.
</p>
</dd>
<dt><b>red</b></dt>
<dd><p>Used to display lines removed from the reference file; in other words,
lines that are present only in the reference file.
</p>
</dd>
</dl>

<p>These colors can be configured, see <a href="The-Preferences-Dialog.html#The-Preferences-Dialog">The Preferences Dialog</a>.
</p>
<p>As with all highlighted lines in GPS, the visual differences highlights are
visible in the Speed Column at the left of the editors.
</p>
<p>Blank lines are also added in the editors, in places that correspond to
existing lines in the other editors. The vertical and horizontal scrolling
are synchronized between all editors involved in a visual comparison.
</p>
<p>When a visual comparison is created, the Locations View is populated with the
entries for each chunk of differences, and can be used to navigate between
those.
</p>
<p>Closing one of the editors involved in a visual comparison removes the
highlighting, blank lines, and scrolling in the other editors.
</p>
<p>Editors involved in a visual comparison have a contextual menu
<code>Visual diff</code> that contains the following entries:
</p>
<dl compact="compact">
<dt><code>Recompute</code></dt>
<dd><p>Regenerates the visual comparison. This is useful, for example, when one of
the editors has been modified by hand while it was involved in a visual
comparison
</p>
</dd>
<dt><code>Hide</code></dt>
<dd><p>Removes the highlighting corresponding to the visual comparison from all
editors involved
</p>
</dd>
<dt><code>Close editors</code></dt>
<dd><p>Closes all editors involved in this visual comparison
</p>
</dd>
<dt><code>Use this editor as reference</code></dt>
<dd><p>Change the reference to this editor. (This is only visible when displaying a
visual comparison involving 3 files).
</p>
</dd>
</dl>


<a name="index-screen-shot-46"></a>
<img src="visual-diff.jpg" alt="visual-diff">

<hr>
<div class="header">
<p>
Next: <a href="Code-Fixing.html#Code-Fixing" accesskey="n" rel="next">Code Fixing</a>, Previous: <a href="Coding-Standard.html#Coding-Standard" accesskey="p" rel="previous">Coding Standard</a>, Up: <a href="Tools.html#Tools" accesskey="u" rel="up">Tools</a> &nbsp; [<a href="Index-table.html#Index-table" title="Index" rel="index">Index</a>]</p>
</div>



</body>
</html>
gnat-gps-doc 5.0-16 / usr / share / doc / gnat-gps / html / Visual-Comparison.html
