Diff Utility

Introduction

The Diff utility in MPLAB X® compares two files and displays the results in textual and graphical views. The following will explain how to access the Diff Utility, How to view Diff utility results and other features offered by MPLAB X® Diff utility.


Accessing Diff Utility

To access the Diff utility to compare two files -

1

From the Project tree, double click on the filename that you want to compare with. This will open the file in the editor window.

2

In MPLAB X® IDE menu, go to Tools > Diff. This will open up a pop-up box with title 'Diff Filename To…'.

Tools-Diff.png
Click image to enlarge.

3

Select second file that you wish to compare with the first and Click 'Diff'.

By default, this will generate the graphical two-paned diff viewer that displays the two files side-by-side with the differences highlighted.
You can also select the Textual View mode by clicking on the Textual tab.

Graphical View

Diff%20-%20Graphical.png

Some of the highlights of this view are

  • The differences in the two files are highlighted with color code (Blue for actual differences, Green where blank spaces are not ignored and Pink where changes in inner white spaces are not ignored).
  • Total number of differences are indicated on the top of the page
  • The center arrows indicate locations of differences.

If you click on the center arrow, the file on right side instantly gets updated with the corresponding contents in the file from the left side.


Textual View

Diff%20-%20Textual.png

The textual view displays the differences in a text format. The textual format is useful when the Diff file is to be shared with other users. MPLAB X® can use the textual Diff file and modify a file with the Diff file instantly.


DIFF Viewer Menu

The Graphical and Textual Viewer also has additional menu as shown below.

Diff%20-%20Menu.png
Diff%20-%20Graphical%20-%20Menutest.gif

DIFF Viewer Options

Additional options in the DIFF view include the setting if the user wants to use the internal DIFF utility provided in the MPLAB X® or use external DIFF tool such as Windiff®.

Under Internal DIFF setting, user can also set the option to not use white spaces / changes within white spaces or case changes during DIFF. The diff results with these options selected are marked with color code as mentioned above.

The options menu can also be accessed within MPLAB X® menu by Tools > Options > DIFF tab.

Diff%20-%20Options.png
© 2016 Microchip Technology, Inc.
Information contained on this site regarding device applications and the like is provided only for your convenience and may be superseded by updates. It is your responsibility to ensure that your application meets with your specifications. MICROCHIP MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND WHETHER EXPRESS OR IMPLIED, WRITTEN OR ORAL, STATUTORY OR OTHERWISE, RELATED TO THE INFORMATION, INCLUDING BUT NOT LIMITED TO ITS CONDITION, QUALITY, PERFORMANCE, MERCHANTABILITY OR FITNESS FOR PURPOSE. Microchip disclaims all liability arising from this information and its use. Use of Microchip devices in life support and/or safety applications is entirely at the buyer's risk, and the buyer agrees to defend, indemnify and hold harmless Microchip from any and all damages, claims, suits, or expenses resulting from such use. No licenses are conveyed, implicitly or otherwise, under any Microchip intellectual property rights.