Shelve Changes Dialog
VCS | Shelve Changes
Use this dialog box to shelve the selected files or changelists.
This dialog consists of several areas:
- Modified files pane
- Commit Message pane
- Before Submit / Before Commit section
- After Submit / After Commit section
- Diff pane
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.
Tooltip and Shortcut
Click this button to open the Differences dialog box that highlights the differences between your local working copy of the selected file and its repository version.
Click this button to reload the Changed files tree view so it is up-to-date.
Move to Another Changelist
Click this button to add the selected file(s) to another changelist. The Move to Another Changelist dialog box opens where you can select an existing changelist or create a new one.
Click this button to revert all changes made to the local working copy of the selected files.
Jump to source
Click this button to open the source code of the selected file in the editor.
Group by Directory
Click this button to toggle between the flat view and the directory tree view.
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.
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 tab. 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>:
You can click to choose from the list of recent commit messages.
Before Submit / Before Commit section
Use the controls in this area to define which additional actions you want PyCharm Edu to perform before putting the selected files to a shelf.
These controls are available for the following version control systems:
Select this checkbox to perform code formatting according to the Project Code Style settings.
Select this checkbox to rearrange your code according to the arrangement rules preferences.
Select this checkbox to remove redundant import statements.
Perform code analysis
Select this checkbox to run code inspection on the files you are about to commit.
Check TODO (<filter name>)
Select this checkbox to review the TODO items matching the specified filter. Click the Configure link to choose an existing TODO filter, or open the TODO settings page and define a new filter to be applied.
Select this checkbox if you want to automatically apply the current inspection profile to the files you are going to commit.
Revert unchanged files
Select this checkbox to revert the files that have not been modified.
This option is only available for Perforce.
After Submit / After Commit section
Use the controls in this area to define which additional actions you want PyCharm Edu to perform after putting the selected files to a shelf.
Always use selected server
| Select this checkbox to always upload files to the selected server access configuration. |
The drop-down list and the checkbox are only available if the Remote Hosts Access 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 shelve.
Tooltip and Shortcut
Previous Difference / Next Difference Shift+F7 F7
Use these buttons to jump to the next/previous difference.
When the last/first difference is hit, PyCharm Edu 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.
Compare Previous/Next File
Click these buttons to compare the local copy of the previous/next file with its update from the server.
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.
Use this drop-down list to choose the desired 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 drop-down list to define how the differences viewer should treat white spaces in the text.
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.
Click this button to scroll both differences panes simultaneously. If this button is released, each pane can be scrolled independently.
Click this button to 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.
Click this button to open a drop-down list of available options. Select or clear these options to show or hide line numbers, indentation guides, white spaces, and soft wraps.
Show diff in external tool
Click this button to invoke an external differences viewer, specified in the External Diff Tools settings page.
This button only appears on the toolbar when the Use external diff tool option is enabled in the External Diff Tools settings page.
Click this button to show the corresponding help page.
Note that the options listed above are available for text files only. PyCharm Edu cannot compare binary files, so most commands will be unavailable for them.