PhpStorm 2018.2 Help

Local Changes Tab

View | Tool Windows | Version Control - Local Changes
Alt+9

The Local Changes tab lists all files that have been modified locally and have not yet been committed to the repository.

Use this tab to commit and revert changes, manage changelists, view differences, and clean up locked folders.

In this topic:

Toolbar

Item

Tooltip and Shortcut

Description

icons actions refresh svg

Refresh Ctrl+F5

Click this button to refresh the status of all files in your workspace, modified both through PhpStorm or through any other application.

icons actions refresh svg

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 PhpStorm or through other applications.

icons actions commit svg

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.

icons actions rollback svg

Revert
Ctrl+Alt+Z

Click this button to roll back the selected changes.

icons actions diff svg

Show Diff
Ctrl+D

Click this button to view the differences between your local version of the selected file and its latest version in the repository.

icons vcs changelist svg

Changelists

Click this icon to invoke a list of commands related to managing changelists:
  • New Changelist

  • Edit Changelist

  • Delete Changelist

  • Set Active Changelist

  • Move to Another Changelist

icons vcs shelveSilent svg

Shelve Silently
Ctrl+Alt+H

Click this button to shelve the selected file or changelist silently, without displaying the Shelve Changes dialog.

icons general gearPlain svg

Group By
Ctrl+P

Click this icon to choose how you want to group files: by directory, module or repository (if there's more than one root).

icons actions show svg

Ignored Files

Click this icon to invoke a list of commands related to ignored files:

icons actions previewDetails svg

Preview Diff

Click this button to have PhpStorm open or close the Preview Diff pane to compare the current file with the latest committed revision.

Changelists pane

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

Item

Shortcut

Description

icons actions commit svg Commit

Ctrl+Alt+K

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.

icons actions rollback svg 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.

icons actions diff svg Show Diff

Ctrl+D

Select this option to view the differences between your local copy and the latest version in the repository.

icons actions edit svg Jump to Source

F4

Select this option to open the selected file(s) in the editor.

icons general remove svg Delete

N/A

This option is only available if single files are selected, not a changelist.

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.

icons general add svg New Changelist

Alt+Insert

This option is only available if a changelist is selected.

Select this option to create a new changelist.

icons general remove svg Delete Changelist

N/A

This option is only available if a changelist is selected.

Select this option to delete the selected changelit.

icons actions setDefault svg Set Active Changelist

Ctrl+Space

Click this button to make the selected changelist active. The active changelist is highlighted.

icons actions edit svg Edit 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.

icons vcs patch svg Create Patch

N/A

Select this option to create a patch.

Copy as Patch to Clipboard

N/A

Select if you do not need to save a patch to a file and want, for example, to send it by email or through a messenger.

icons vcs Shelve svg 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.

icons actions diagramDiff svg Show Local Changes as UML

Ctrl+Shift+Alt+D

Use this action to show classes from the selected changelist in a UML Class diagram (for details see Viewing Changes as Diagram).

icons actions refresh svg 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:
  • Show History: select this option to view Local History of the selected file or folder.

  • Put Label: select this option to add a label to the current version of the selected file or folder.

<Specific version control system>

N/A

Select this option to invoke a popup menu with options specific to the version control system you are using.

Preview Diff Pane

This pane opens when you click the Preview Diff button icons actions previewDetails svg  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

icons actions previousOccurence svg/icons actions nextOccurence svg

Previous Difference / Next Difference Shift+F7 F7

Use these buttons to jump to the next/previous difference.

When the last/first difference is hit, 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.

icons actions back svg
icons actions forward svg

Compare Previous/Next File
Alt+LeftAlt+Right

Click these buttons to compare the local copy of the previous/next file with its update from the server.

icons actions edit svg

Jump to Source
F4

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

diffViewer 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

  • Edit code. Note that one can change text only in the right-hand part of the default viewer, or, in case of the unified viewer, in the lower ("after") line, i.e. in your local version of the file.

  • Perform the Apply/Append/Revert actions.

Whitespace

diffViewer whitespaces
Use 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 all differences are highlighted. This option is selected by default.

  • Trim whitespaces: ("\t", " "), if they appear in the end and in the beginning of a line.
    • If two lines differ in trailing whitespaces only, these lines are considered equal.

    • If two lines are different, such trailing whitespaces are not highlighted in the By word mode.

  • Ignore whitespaces: white spaces are not important, regardless of their location in the source code.

  • Ignore whitespaces and empty lines: the following entities are ignored:
    • all whitespaces (as in the 'Ignore whitespaces' option)

    • all added or removed lines consisting of whitespaces only

    • all changes consisting of splitting or joining lines without changes to non-whitespace parts.
      For example, changing a b c to a \n b c is not highlighted in this mode.

  • Ignore imports and formatting: changes within import statements and whitespaces are ignored (whitespaces within String literals are respected though).

Highlighting mode

diffViewer highlight
Select the way differences granularity is highlighted.
The available options are:
  • Highlight words: the modified words are highlighted

  • Highlight lines: the modified lines are highlighted

  • Highlight split changes: if this option is selected, big changes are split into smaller 'atomic' changes.
    For example, A \n B vs. A X \n B X will be treated as two changes instead of one.

  • 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.

icons actions collapseall svg

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.

icons actions synchronizeScrolling

Synchronize scrolling

Click this button to simultaneously scroll both differences panes; if this button is released, each of the panes can be scrolled independently.

icons general gearPlain svg

Editor settings

Click this button to invoke the list of available settings. Select or clear these 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.

icons general externalToolsSmall

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.

icon help

Help
F1

Click this button to show the corresponding help page.

N/A

Annotate

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.

You can configure the amount of information displayed in the annotations pane.

For more details on annotations, refer to Using annotations

The most useful shortcuts in the Diff Pane are the following:

Shortcut

Description

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.

Last modified: 10 October 2018

See Also