PyCharm 4.5.3 Help

Differences Viewer for Folders and DB Objects

Project tool window | context menu of a folder | Compare Directory with
Project tool window | context menu of two selected folders | Compare Directories
Project tool window | context menu of a folder | Sync with Deployed to
Remote Host tool window | context menu of a folder | Sync with local
Tools | Deployment | Sync with local
Database tool window | context menu of two selected items | Compare

This window is displayed every time you explore differences between:

In this dialog box, explore the detected differences and synchronize the compared items.

In this section:

Toolbar

ItemTooltip and shortcutDescriptionAvailable for
arrowDown arrowUp F7
Shift+F7
Use these buttons to jump to the next/previous difference.

When the last/first difference is hit, PyCharm suggests to press F7/Shift+F7 once more and compare other files.

Version control
editJump to Source
F4
Click this button to open file in the editor's active tab. The caret will be placed in the same position as in the Differences Viewer. All
external_toolShow diff in external toolClick this button to invoke an external differences viewer, specified in the External Diff Tools page.

This button only appears on the toolbar, when the check box Use external diff tool is selected in the External Diff Tools page.

All
helpHelp
F1
Click this button to show reference page.All
refreshRefresh
F5
Click this button to refresh the contents of the differences viewer.All
arrow_right Show new files on left side Press this toggle button to have PyCharm show the items, that are present in the first of the compared directories or database objects and are missing in the second one. All
not_equalShow differencePress this toggle button to have PyCharm show items that are present in both folders or database objects but differ in contents, or timestamp, or size.All
equalShow equals Press this toggle button to have PyCharm show the items that are present in both directories or objects and have the same contents, or timestamp, or size, depending on the parameter for comparison specified in the Compare by drop-down list. All
arrow_leftShow new files on right sidePress this toggle button to have PyCharm show the items, that are present in the second of the compared directories or database objects and are missing in the first one.All
Compare by In this drop-down list, select the parameter to be used for comparison. The available options are:
  • Contents
  • Size
  • Time stamp
Local folders
Local-remote folders
debug_resume Synchronize Selected
Enter
Click this button to have PyCharm apply the specified action to the selected pair of items. Actions to be performed are shown in the * field. All
rerun.png Synchronize All
Ctrl+Enter
Click this button to have PyCharm apply the specified action to all the pairs of items in the list. Actions to be performed are shown in the * field. All
commonfilter.png Hide excluded files Click this button to suppress showing files excluded from synchronization. Local-remote folders
FilterType the filtering string (for example, file or table name). Use * wildcard to replace any number of arbitrary characters.

Note that filter applies on pressing Enter.

All
Path These fields show the paths to the folders being compared. To change a directory, click the Browse button browseButton and specify another directory in the dialog that opens. Local folders
Local-remote folders

List of items

The list shows the items from the compared objects that meet the comparison criterion specified in the Compare by drop-down list and the filtering criteria specified through the toolbar buttons.

Item Description Available for
Name These read-only fields show the names of  files   under the object specified in the  Path   fields. All
Size These read-only fields show the sizes of files under the folders being compared. Local folders
Local-remote folders
Date These read-only fields show the timestamps of files under the folders being compared. Local folders
Local-remote folders
* The icon in this field indicates the action that will be applied to the pair of items in the current line upon clicking the Synchronize Selected debug_resume.gif or Synchronize All rerun.png  toolbar button.

To change the currently selected action, click the icon.

IconAction
arrow_right Copy the item in the left side to the right side, possibly overwriting the contents of the corresponding target item, if it already exists.
arrow_left Copy the item in the right side to the left side, possibly overwriting the contents of the corresponding target item, if it already exists.
equal The items are treated identical with regard to the selected criterion of comparison. No action will be performed by default.
not_equal The items differ with regard to the selected criterion of comparison. No action will be performed by default. Explore the differences in the Differences Pane and change the intended action by clicking the icon.
close.png The item is present only in one of the folders and will be removed.
All

Differences pane

The differences pane is displayed only for files   with the same names, which exist on both sides. For the files and DB objects that exist on one side only, the contents of the selected file/DB object is displayed.

If the files have read-only status, they are not editable in the differences pane.

ItemTooltip and shortcutDescription
arrowDownarrowUpF7/Shift+F7Click this button to move to the 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.
HighlightSelect the way differences granularity is highlighted.
Possible options are:
  • By word: changed words are highlighted
  • By line: changed lines are highlighted
  • Do not highlight: if this option is selected, the differences are not highlighted at all. This option is intended for significantly modified files, where highlighting only introduces additional difficulties.
sync_scrolling Synchronize scrollingClick this button to simultaneously scroll both differences panes; if this button is released, each of the panes can be scrolled independently.
editJump to Source
F4
Click this button to open the file in the active pane in the editor. The caret will be placed in the same position as in the Differences Viewer.
cogwheel_blueEditor settingsClick this button to reveal the drop-down list of available check commands. Select or clear these check commands to show or hide line numbers, indentation guides, white spaces, and soft wraps.
icon_InsertReplaceicon_InsertReplace2
arrowRightDownarrowLeftDown
Replace, InsertUse these chevron buttons to apply differences between files.

Context menu

This menu appears on right-clicking an entry in the list of items. The commands listed below define actions to be taken for the selected entry and set the action icons in the * column.

ItemIconDescription
Set Copy to Right/Leftarrow_right
arrow_left
This command sets the specified icons in the * column to copy a file missing from one of the directories. If a file exists on one side, it will be copied; if it doesn't exist, then the file on the other side will not be deleted.
Set Deleteclose.pngThis command sets the specified icons in the * column to delete file.
Set Do NothingChoose this command to remove an action icon.
Set DefaultChoose this command to set the default action for the entry.
Warn When DeleteSelect this option to display a warning when trying to delete a file that is located only in one of the two directories during their merge.

See Also

Last modified: 5 August 2015