PhpStorm 6.0.1 Web Help

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

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.

Tip

You can also open the difference viewer without running PhpStorm. This is done through the following command: <path to PhpStorm executable file> diff <path_1> <path_2> where path_1 and path_2 are paths to the folders in question.

In this section:

Toolbar

ItemTooltip and shortcutDescriptionAvailable for
refresh Refresh
Ctrl+F5Ctrl+F5 		Click this button to refresh the contents of the differences viewer. All
arrow_right Show new on left side
 Press this toggle button to have PhpStorm show the items, that are present in the first of the compared directories or database objects and are missing in the second one. All
arrow_left Show new on right side Press this toggle button to have PhpStorm show the items, that are present in the second of the compared directories or database objects and are missing in the first one. All
equal Show difference Press this toggle button to have PhpStorm 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
not_equal Show equals Press this toggle button to have PhpStorm show items that are present in both folders or database objects but differ in contents, or timestamp, or size. 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.gif Synchronize Selected
EnterEnter 		Click this button to have PhpStorm 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+EnterCtrl+Enter 		Click this button to have PhpStorm 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 EnterEnter.

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
DataSource These read-only fields show the names of the data sources or tables being compared. Data sources

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, data source tables, or table fields   under the object specified in the Path or DataSource   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

Note

The differences pane only shows for   files, data source tables, or table fields   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.

ItemDescription
copy Click this button to place to the clipboard the fragment of code selected in the preview pane. If nothing is selected, the whole line at caret is copied.
find.png Click this button to initiate the find in text procedure in the differences viewer.
img or img
F7F7 or Shift+F7Shift+F7		Click 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.
icon_InsertReplace.gif or icon_InsertReplace2.gif Use these chevron buttons to apply differences between files.

See Also

Procedures:

Reference:

Web Resources: