Shelve Changes dialog
Use this dialog to shelve the selected files or changelists.
Modified files pane
This section contains a list of files that have been modified since the last commit. All files in the list are selected by default. Deselect the files that you do not want to shelve.
Modified files pane toolbar
|Item||Tooltip and Shortcut||Description|
|Show Differences |
|Open the Differences dialog that highlights the differences between your local working copy of the selected file and its repository version.|
|Revert||Revert all changes made to the local working copy of the selected files.|
| Refresh Changes |
|Click this button to reload the Changed files tree view so it is up-to-date.|
|Group By||Choose how you want to group the modified files - by directory or module|
| ||Expand or collapse all nodes |
|Click these buttons to expand or collapse all nodes in the directory tree. These buttons are not available in flat view.|
From this list, select the changelist that contains the modified files to be shelved. The active changelist is selected by default.
The summary under the modified files pane shows statistics on the currently selected changelist, such as the number of modified, new and deleted files. This area also shows how many files of each type are shown, and how many of them will be shelved.
Commit Message pane
In this area, enter a string that will be used as the shelf name. When you unshelve your changes, a new changelist with the same name will be created in the Local Changes view . If you leave this field empty, the shelf name will be generated using the following pattern: <number of files in the shelf>, <date and time when the shelf was created>:
Before Submit / Before Commit section
Use the controls in this area to define which additional actions you want PhpStorm to perform before shelving the selected files.
These controls are available for the following version control systems:
|Reformat code||Perform code formatting according to the Project Code Style settings.|
|Rearrange code||Rearrange your code according to the arrangement rules preferences.|
|Optimize imports||Remove redundant import statements.|
|Perform code analysis||Run code inspection on the files you are about to commit/shelve.|
|Check TODO (<filter name>)||Review the TODO items matching the specified filter. Click Configure to choose an existing TODO filter, or open the TODO settings page and define a new filter to be applied.|
|Cleanup||Automatically apply the current inspection profile to the files you are going to commit/shelve.|
After Submit / After Commit section
Use the controls in this area to define which additional actions you want PhpStorm to perform after committing the selected files.
|Run tool||From this list, select the external tool that you want PhpStorm to launch after the selected changes have been committed. You can select a tool from the list, or click the Browse button and configure an external tool in the External Tools dialog that opens.||All VCSs|
|Upload files to|
The list is only available if the FTP/SFTP Connectivity plugin is enabled.
|Always use selected server or group of servers|
The checkbox is only available if the FTP/SFTP Connectivity plugin is enabled.
The Diff pane is hidden by default. To unfold it, click the arrow button next to the pane title.
In this pane you can explore the differences between the base repository version of the selected file, and the version you are about to commit.
Diff pane toolbar
|Item||Tooltip and Shortcut||Description|
|/||Previous Difference / Next Difference Shift+F7 F7|
Use these buttons to jump to the next/previous difference.
When the last/first difference is reached, PhpStorm suggests to click the arrow buttons F7/Shift+F7 once more and compare other files, depending on the Go to the next file after reaching last change option in the Differences Viewer settings.
This behavior is supported only when the Differences Viewer is invoked from the Version Control tool window Alt+9.
| Jump to Source |
|Click this button to open the selected file in the active pane in the editor. The caret will be placed in the same position as in the Differences Viewer.|
|Compare Previous/Next File |
Click these buttons to compare the local copy of the previous/next file with its update from the server.
Use this list to choose a viewer type. The side-by-side viewer has two panels; the unified viewer has one panel only.
Both types of viewers enable you to
Use this list to define how the differences viewer should treat whitespaces.
Select the way differences granularity is highlighted.
The available options are:
|Collapse unchanged fragments||Click this button to collapse all unchanged fragments in both files. The amount of non-collapsible unchanged lines is configurable in the Diff & Merge settings page.|
|Synchronize scrolling||Scroll both differences panes simultaneously. If this button is released, each pane can be scrolled independently.|
|Disable editing||Enable editing of the local copy of the selected file, which is disabled by default. When editing is enabled, you can make last-minute changes to the modified file before committing it.|
|Editor settings||Open a list of available options. Select or clear these options to show or hide line numbers, indentation guides, white spaces, and soft wraps.|
|Click this button to show the corresponding help page.|
Note that the options listed above are available for text files only. PhpStorm cannot compare binary files, so most commands will be unavailable for them.