Review changes
This topic explains how to keep track of the changes that you and your teammates introduce to the source code.
Review project history
PhpStorm allows you to review all changes made to the project sources that match the specified filters.
For distributed version control systems, such as Git and Mercurial, you can view project history in the Log tab of the Version Control tool window Alt+9 (see Investigate changes in Git repository).
For centralized version control systems, such as Subversion, Perforce, and ClearCase, project history is available in the Repository tab of the Version Control tool window Alt+9.
Track changes to a file in the editor
As you modify a file that is under version control, all changes are highlighted in the editor with change markers that appear in the gutter next to the modified lines and show the type of changes introduced since the last synchronization with the repository. When you commit the modified file to the repository, the change markers disappear.
The changes you introduce to the text are color-coded:
line added.
line changed.
line deleted.
You can manage changes using the dedicated toolbar. To invoke it, hover the mouse cursor over a change marker and then click it. The toolbar is displayed together with a frame showing the previous contents of the modified line:
The actions in the toolbar let you navigate to the next or previous change, rollback a change, view the differences between the current and the repository version, copy the previous version of the modified line to Clipboard, or turn on highlighting differences in the code.
If you want to turn off highlighting changes uncheck the Highlight modified lines in gutter option on the Editor | General page of the IDE settings Ctrl+Alt+S.
Compare local changes with the repository version
Apart from navigating through your local changes within a file in the editor, you can review these changes compared to the base revision of the file.
To preview the diff, select a modified file in the Commit tool window and click 
on the toolbar.
The left pane shows affected code as it was in the base revision, and the right page shows affected code after you've made changes locally.
Use the toolbar buttons and controls to navigate between changes and configure the appearance of the Change Details pane or the Differences Viewer:
Item | Tooltip and Shortcut | Description |
|---|---|---|
| Previous Difference / Next Difference Shift+F7 F7 | Jump to the next or previous difference. When the last or the first difference is reached, PhpStorm suggests clicking the arrow buttons or pressing F7/Shift+F7 once more and comparing other files modified locally. This behavior depends 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 Commit tool window Alt+0. |
| Jump to Source F4 | Open the selected file in the editor. The caret is placed in the same position as in the Differences Viewer. |
| Compare Previous/Next File Alt+LeftAlt+Right | Compare the local copy of the previous or next file with its update from the server. |
| Go To Changed File Ctrl+N | Display all changed files in the current change set and navigate to them. This action is only available when you review changes to multiple files. |
Viewers | Select a viewer mode: side-by-side or unified. The side-by-side mode has two panels, the unified mode has one panel. You can edit code and perform the Apply, Append, Revert actions in both viewers. You can change text only in the right-hand part of the side-by-side viewer, or in the lower line in the unified viewer. You can edit only local versions of your files. You cannot edit files that have read-only status. | |
Whitespace | Define how the differences viewer should treat whitespaces.
| |
Highlighting mode | Select the way differences granularity is highlighted. The available options are:
| |
| Collapse unchanged fragments | Collapse all the unchanged fragments in both files. The amount of non-collapsible unchanged lines is configurable in the Diff & Merge settings page. To open the Diff & Merge page, open settings by pressing Ctrl+Alt+S and navigate to . |
| Synchronize scrolling | Click this button to scroll both differences panes simultaneously. If this button is released, each of the panes can be scrolled independently. |
| Settings | Open a list of available settings. These commands are also available from the context menu of the differences viewer gutter. |
| Show diff in external tool | Invoke an external differences viewer specified on the External Diff Tools settings page. This button is available only on the toolbar when the Use external diff tool option is enabled on the External Diff Tools settings page. |
| Help F1 | Open a browser and show the corresponding help page. |
Annotate with GitBlame | 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, 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 VCS annotations. | |
/
The most useful shortcuts are the following:
Shortcut | Description |
|---|---|
Ctrl+Shift+D | Use this keyboard shortcut to show the popup menu of the most commonly used diff commands. |
Ctrl+Shift+Tab | Use this keyboard shortcut to switch between the left and the right panes. |
Ctrl+Z/Ctrl+Shift+Z | Use this keyboard shortcut to undo/redo a merge operation. Conflicts will be kept in sync with the text. |
View changes history for a file or selection
PhpStorm allows you to review changes made to files or even fragments of source code. The Show History and the Show History for Selection commands are available from the main VCS menu and from the context menu of files.
The change history for a file is displayed in the dedicated History tab of the Version Control tool window Alt+9.
The change history for a selection of code is displayed in a separate window, in the form of the differences viewer.
View history for file
Open a file in the editor or select in the Project tool window and choose <VCS> | Show History from the context menu.
The History tab for the selected file appears in the Version Control tool window Alt+9, the name of the file is shown on the title bar of the tab.
You can use the toolbar buttons to compare the selected revision with the local version, compare classes from the selected revision, checkout the selected revision from your VCS, annotate the selected revision, and so on:
Item | Tooltip and Shortcut | Description |
|---|---|---|
| Refresh | Click this button to refresh the current information. |
| Show Diff Ctrl+D | Click this button to compare the selected revision of a file with its previous revision in the Differences Viewer. |
| Show All Affected Files Alt+Shift+A | Click this button to open the Paths Affected in Revision dialog where you can view all files that were modified in the selected revision. |
| Show All Branches | Click this button to display changes from branches other than the current one. |
| Presentation Settings | Click to choose the amount of information you want to see in the History view. You can also select the Show Commit Timestamp option if you want PhpStorm to show the commit timestamp instead of the time when a change was authored. |
| Configure Layout | Click to choose the type of info you want to see:
|
| Open in GitHub | Click this button to open the page that corresponds to the selected commit on GitHub. |
View history for selection
In the editor, select a fragment of the source code, or position the caret at the line whose history you want to track.
Choose <VCS> | Show History for Selection from the main menu or from the context menu of the selection.
The history for the selected fragment will open in a separate window. If nothing is selected the history will be displayed for the current line.
Check file status
PhpStorm allows you to check the status of project files relative to the repository. File status shows you which operations have been performed on the file since you last synchronized with the repository.
You can check the status of a file in any interface element (for example, the editor, or various tool windows) by the color used to highlight the filename.
You can customize the default colors for file statuses in Colors and Fonts settings page.
Color | File Status | Description |
|---|---|---|
| Added | The file in the active changelist is scheduled for addition to the repository. |
| Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in . |
| Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open prompting you to resolve the changelist conflict. This file status is available if all options are enabled in . |
| Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. |
| Deleted | The file is scheduled for deletion from the repository. |
| Deleted from file system | The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. |
| Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Show directories with changed descendants option is enabled in . |
| Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Show directories with changed descendants option is enabled in . |
| Hijacked | [Perforce, ClearCase, VSS] The file is modified without checkout. |
| Ignored | A file is intentionally untracked by VCS. |
| Merged | The file is merged by your VCS as a result of an update. |
| Merged with conflicts | During the last update, the file has been merged with conflicts. |
| Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. |
| Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. |
| Modified | The file has changed since the last synchronization. |
| Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in . |
| Obsolete | The file should no longer be in your working copy of the repository. |
| Renamed | Since the last update, the file has been renamed. |
| Switched | [SVN] The file is taken from a different branch than the whole project. |
| (Unknown) Unversioned | The file exists locally, but is not in the repository, and is not scheduled for addition. |
| Up to date | The file hasn't been changed. |
#0A7700
#0EAA00
#FF0000
#616161
#773895
#8AA4C8
#3264B4
#B28C00
#727238
#7503DC
#0032A0
#0047E4
#7C7C00
#007C7C
#08978F
#993300
None (default color)Color | File Status | Description |
|---|---|---|
| Added | The file in the active changelist is scheduled for addition to the repository. |
| Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in . |
| Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open prompting you to resolve the changelist conflict. This file status is available if all options are enabled in . |
| Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. |
| Deleted | The file is scheduled for deletion from the repository. |
| Deleted from file system | The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. |
| Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Show directories with changed descendants option is enabled in . |
| Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Show directories with changed descendants option is enabled in . |
| Hijacked | [Perforce, ClearCase, VSS] The file is modified without checkout. |
| Ignored | A file is intentionally untracked by VCS. |
| Merged | The file is merged by your VCS as a result of an update. |
| Merged with conflicts | During the last update, the file has been merged with conflicts. |
| Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. |
| Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. |
| Modified | The file has changed since the last synchronization. |
| Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in . |
| Obsolete | The file should no longer be in your working copy of the repository. |
| Renamed | Since the last update, the file has been renamed. |
| Switched | [SVN] The file is taken from a different branch than the whole project. |
| (Unknown) Unversioned | The file exists locally, but is not in the repository, and is not scheduled for addition. |
| Up to date | The file hasn't been changed. |
#629755
#D5756C
#0A7700
#6C6C6C
#6897BB
None (default color)
#848504
#9876AA
#3A8484
#D1675AColor | File Status | Description |
|---|---|---|
| Added | The file in the active changelist is scheduled for addition to the repository. |
| Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in . |
| Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open prompting you to resolve the changelist conflict. This file status is available if all options are enabled in . |
| Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. |
| Deleted | The file is scheduled for deletion from the repository. |
| Deleted from file system | The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. |
| Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Show directories with changed descendants option is enabled in . |
| Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Show directories with changed descendants option is enabled in . |
| Hijacked | [Perforce, ClearCase, VSS] The file is modified without checkout. |
| Ignored | A file is intentionally untracked by VCS. |
| Merged | The file is merged by your VCS as a result of an update. |
| Merged with conflicts | During the last update, the file has been merged with conflicts. |
| Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. |
| Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. |
| Modified | The file has changed since the last synchronization. |
| Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in . |
| Obsolete | The file should no longer be in your working copy of the repository. |
| Renamed | Since the last update, the file has been renamed. |
| Switched | [SVN] The file is taken from a different branch than the whole project. |
| (Unknown) Unversioned | The file exists locally, but is not in the repository, and is not scheduled for addition. |
| Up to date | The file hasn't been changed. |
#62CC47
#FF6666
#ED864A
#4FF0FF
#A9B837
#ED94FFVCS annotations
What are VCS annotations?
Annotation is a form of file presentation that shows detailed information for each line of code. In particular, for each line you can see the version from which this line originated, the user ID of the person who committed this line, and the commit date. The annotated view helps you find out who did what and when, and trace back the changes.
Annotating lines of code is available for ClearCase, Mercurial, Git, Perforce and Subversion.
The Annotate command is available from VCS-specific nodes of the Version Control menu, the context menu of the Editor gutter, file context menus, and the file history view.
When annotations are enabled, the gutter looks similar to the following example:
Annotations for lines modified in the current revision, are marked with bold type and an asterisk.
Enable annotations
Right-click the gutter in the editor or in the Differences Viewer and select Annotate from the context menu.
You can assign a custom shortcut to the Annotate command: go to the Keymap page of the IDE settings Ctrl+Alt+S and look for Version Control Systems | Git | Annotate.
Configure the amount of information shown in annotations
You can choose how much information you want to see in the annotations view.
Right-click the annotations gutter, choose View and select which type of information you want to see, including the revision from which this change originated, the date, the name of the author in different formats, and the commit number.
You can also set highlighting under Colors.
Configure annotation options
Right-click the annotations gutter and select Options from the context menu:
Ignore Whitespaces: whitespaces will be ignored (git
blame -w). This means that annotations will point to the previous meaningful commit.Detect Movements Within File: when a commit moves or copies lines within the same file, such change will be ignored (git
blame -M). This means that annotations will point to the previous meaningful commit.Detect Movements Across Files: when a commit moves or copies lines from other files that were modified in the same commit, such change will be ignored (git
blame -C). This means that annotations will point to the previous meaningful commit.Show Commit Timestamp: select this option if you want PhpStorm to show the commit timestamp in the Annotations view instead of the time when a change was authored.
Customize date format
Press Ctrl+Alt+S to open the IDE settings and select Appearance & Behavior | System Settings | Date Formats.
Click the Date Time Pattern field next to VCS Annotate and specify the date format that you want to use for VCS annotations. See patterns reference.
Annotate previous revisions
PhpStorm lets you annotate not only the current file revision, but also it's previous revisions. The following options are available from the context menu of the annotations gutter:
Annotate Revision: this option is useful if you want to check what a file looked like after a particular change was committed. To do this, right-click this change and select Annotate Revision from the context menu.
Annotate Previous Revision: this option is useful if you find yourself in a situation when the last change in a particular line is meaningless, for example if all that was changed is code formatting. In this case, you can check what the previous revision of the file looked like. To do this, right-click a change and select Annotate Previous Revision from the context menu.
You can also annotate a particular file from the file history view. In the History tab, select the file version you want to review, right-click the corresponding line and select from the context menu.
View the differences between revisions
To review the differences between the annotated version of a file and its previous version, position the caret at the annotation, right-click it and select Show Diff from the context menu. PhpStorm opens the Differences viewer for files:
You can also call the VCS Operations Popup Alt+` and select .
Navigate to log
If you are using Git for version control, you can also jump from the annotations view to the corresponding commit in the Log tab of the Version Control tool window Alt+9.
To do this, position the caret at the annotation, right-click it and select Select in Git log from the context menu. You can also use the Copy revision number command to located a revision in the log.
For projects hosted on https://github.com/, the Open on GitHub command is also available that takes you to the corresponding commit.