Local Changes Tab
The Local Changes tab lists all files that have been modified locally and have not yet been committed to the repository.
In this topic:
|Item||Tooltip and Shortcut||Description|
|Refresh Ctrl+F5|| Click this button to refresh the status of all files in your workspace, modified both through CLion or through any other application. |
If you are using Perforce as your version control system, only the status of files modified through CLion will be updated. This approach improves performance, as it does not require connecting to the server, but it does not let you get an update on the changes made outside CLion, for example through the p4v client application. If you want to get an update on all changes to your workspace, use the Force Refresh option.
|Force Refresh|| This button is only available if you are using Perforce as your version control system. |
Click this button to refresh the status of files in your workspace, both modified through CLion or through other applications.
|Commit Changes||Click this button to check in the selected change or changelist. You can also attach and detach Perforce jobs to/from changelists via the Commit Changes dialog.|
| Revert |
|Click this button to roll back the selected changes.|
|New Changelist |
|Click this button to create a new changelist.|
|Delete Changelist |
|Click this button to delete the selected changelist. Note that you cannot delete the default changelist.|
|Set Active Changelist||Click this button to make the selected changelist active. The active changelist is highlighted.|
| Move to Another Changelist |
|Click this button to move the selected file to another changelist.|
| Shelve Silently |
|Click this button to shelve the selected file or changelist silently, without displaying the Shelve Changes dialog.|
| Show Diff |
|Click this button to view the differences between your local version of the selected file and its latest version in the repository.|
| Ctrl+NumPad Plus |
|Click these buttons to expand or collapse all nodes.|
| Group by Directory |
|Click this button to display the changed files grouped by directories. If the button is released, the changed files are grouped by changelists.|
| Copy |
|Click this button to copy the path to the selected file to the clipboard.|
|Show Ignored Files||Click this button to show the Ignored files node with the list of existing files ignored by the VCS.|
|Configure Ignored Files||Click this button to configure the list of files that will be ignored by your version control system.|
|Preview Diff||Click this button to have CLion open or close the Preview Diff pane to compare the current file with the latest committed revision.|
|F1||Click this button to show the corresponding CLion help page.|
This pane shows all your changelists, and the files that have been modified in each changelist.
If new files have been added to your project that have not yet been checked-in to a version control system, the Unversioned Files node appears under which all such files are listed. If you have a large number of unversioned files (over 50), they are not displayed in the changelists pane. Instead, the Click to browse link appears. Click this link to open the Unversioned Files dialog to review the list of unversioned files. You can quickly delete unversioned files from the Changelists pane or the Unversioned Files dialog by pressing Delete, or add them to the VCS by pressing Ctrl+Alt+A.
Context menu of a selection
|Commit Changes||N/A||Select this option to check in the selected file or changelist. You can also attach and detach Perforce jobs to changelists via the Commit Changes dialog.|
|Revert||Ctrl+Alt+Z||Select this option to roll back the selected changes.|
|Move to Another Changelist||F6||Select this option to move the selected item to another changelist.|
|Show Diff||Ctrl+D||Select this option to view the differences between your local copy and the latest version in the repository.|
|Jump to Source||F4||Select this option to open the selected file(s) in the editor.|
|New Changelist||Alt+Insert|| This option is only available if a changelist is selected. |
Select this option to create a new changelist.
|Delete Changelist||N/A|| This option is only available if a changelist is selected. |
Select this option to delete the selected changelit.
|Delete||N/A||This option is only available if single files are selected, not a changelist.|
|Check Out||N/A||This option is only available if a file under the Modified without Checkout node is selected. Use this option to check out the selected file from the repository.|
|Add to VCS||N/A||This option is only available if a file under the Unversioned Files node is selected. Use this option to add the selected files to your version control system.|
|Ignore||N/A||This option is only available if a file under the Unversioned Files node is selected. Use this option to ignore the selected file if you want to leave it unversioned.|
|Create Patch||N/A||Select this option to create a patch.|
|Shelve Changes||N/A||Select this option to shelve the selected changes.|
|Shelve in Perforce||N/A|| This option is only available if you are using Perforce as a version control system. |
Select this option to shelve your changes in Perforce. You will be asked to select which files you want to shelve and provide a description. After you've shelved your changes, the corresponding changelist will appear. You can unshelve it any time from the changelist's context menu.
|Refresh||Ctrl+F5||Select this option to refresh the status of files in your workspace.|
|Local History||N/A||Select this option and choose one of the following from the popup menu:|
|<Specific version control system>||N/A||Select this option to invoke a popup menu with options specific for the version control system you are using.|
Preview Diff Pane
This pane opens when you click the Preview Diff button on the toolbar. In this pane you can examine the changes made to the selected file compared to its base revision.
The pane consists of two areas:
- The affected code as it was in the base revision.
- The affected code as it is after a change has been made.
|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 hit, CLion 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. |
These controls are only available if more than one file has been modified locally.
| 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.|
|Viewer type|| 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
|Whitespace||Use this drop-down list to define how the differences viewer should treat white spaces in the text. |
|Highlighting mode||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||Click this button to simultaneously scroll both differences panes; if this button is released, each of the panes can be scrolled independently.|
|Editor settings||Click this button to invoke the list of available settings. Select or clear this options to show or hide whitespaces, line numbers and indent guides, to use or disable the use of soft wraps, and to set the highlighting level. |
These commands are also available from the context menu of the differences viewer gutter.
|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.|
This option is only available from the context menu of the gutter.
Use this option to explore who introduced which changes to the repository version of the file in question, and when. The annotations view lets you see detailed information for each line of code, such as the version from which this line originated, the ID of the user who committed this line, and the commit date.
For more details on annotations, refer to Viewing Changes Information
The most useful shortcuts in the Diff Pane are the following:
|Ctrl+Shift+D||Use this keyboard shortcut to show the popup menu of the most commonly user diff commands.|
|Ctrl+Tab||Use this keyboard shortcut to switch between the left and the right panes.|
|Ctrl+Shift+Tab||Use this keyboard shortcut to select the position obtained by Ctrl+Tab in the opposite pane.|
|Ctrl+Z/Ctrl+Shift+Z||Use this keyboard shortcut to undo/redo a merge operation. Conflicts will be kept in sync with the text.|