PyCharm 2.7.2 Web Help

Project tool window | context menu of a file | Compare File with Editor

Project tool window | context menu of two selected folders | Compare Two Files

Project tool window | context menu of a file | Compare File with Editor

Project tool window | context menu of two selected folders | Compare Two Files

This dialog is displayed every time you explore differences between files (local history for folders, recent changes, version control, local files and their versions on a remote host, or just comparing files). So doing, you can compare files of any types, including binaries.

Tip

You can also open the difference viewer without running PyCharm. This is done through the following command:

<path to PyCharm executable file> diff <path_1> <path_2>

where path_1 and path_2 are paths to the files in question, which can be of various types, including jar.

The differences viewer provides a powerful editor that enables code completion, live templates etc.

ItemTooltip and ShortcutDescription
img Ctrl+C; Ctrl+InsertCtrl+C; Ctrl+Insert Click this button to copy the line at caret in the right pane to the Clipboard.
img Ctrl+F; Alt+F3Ctrl+F; Alt+F3 Click this button to initiate Finding text procedure and locate the specified string in the current file.
img or img F7F7 or Shift+F7Shift+F7Click this button to move to next / previous difference.
Ignore whitespaceUse this drop-down list to define how the differences viewer should treat white spaces in the text.
  • Do not ignore: white spaces are important, and the differences should be highlighted.
  • Leading and Trailing: Ignore the differences, if they appear in the end and in the beginning of a line.
  • All: white spaces are not important, regardless of their location in the source code.
comparePreviousFile.png Compare Previous File
Alt+LeftAlt+Left		Click this button to compare the local copy of the previous file with its update from the server.

Note

The button is available only when the Differences Viewer is invoked from the Update Project Info tab of the Version Control tool window or from the Apply Patch dialog box.

compareNextFile.png Compare
Next File
Alt+RightAlt+Right		Click this button to compare the local copy of the next file with its update from the server.

Note

The button is available only when the Differences Viewer is invoked from the Update Project Info tab of the Version Control tool window or from the Apply Patch dialog box.

LegendShows summary information about the encountered differences: number of differences found, and color map.

Tip

Color map for the Differences viewer is configurable in the Colors and Fonts dialog box.

icon_InsertReplace icon_InsertReplace2 Use these chevron buttons to apply differences between panes.
helpF1F1Click this button to show reference page.
2.7+viewModeClick this button to reveal the drop-down list of available options (show or hide line numbers, indentation guides, white spaces, or soft wraps).
2.7+Ctrl+Tab; Ctrl+Shift+TabCtrl+Tab; Ctrl+Shift+Tab Use this keyboard shortcut to switch between the panes of the Differences viewer.

See Also

Procedures:

Web Resources: