DataSpell
 
2022.2
Shortcuts: Windows
Get DataSpell
You are viewing the documentation for an earlier version of DataSpell.
  1. Version control
  2. Manage files under version control

Manage files under version control

Last modified: 03 August 2022

Add files to Git

  1. Open the Commit tool window Alt+0.

  2. Put any files in the Unversioned Files changelist under version control by pressing Ctrl+Alt+A or selecting Add to VCS from the context menu. You can either add the entire changelist, or select separate files.

If you have enabled Git integration for your project, DataSpell suggests to add each newly created file under version control (you can change this behavior in the Settings/Preferences dialog Ctrl+Alt+S under Version Control | Confirmation). If you want certain files to always remain unversioned, you can configure Git to ignore them.

Check project files status

DataSpell allows you to check the status of your local working copy compared to the repository version of the project. It lets you see which files have been modified, which new files have been added to Git, and which files are not being tracked by Git.

Open the Commit tool window Alt+0.

Files with various statuses in the Commit tool window

´

  • The Changes changelist shows all files that have been modified since you last synchronized with the remote repository (highlighted in blue), and all new files that have been added to Git but have not been committed yet (highlighted in green).

  • The Unversioned Files changelist shows all files that have been added to your project, but that are not being tracked by Git.

tip

If you want ignored files to be also displayed in the Commit window , click Show ignored files button on the toolbar and select Show Ignored Files.

Track changes to a file in the editor

You can also track changes to a file as you modify it in the editor. All changes are highlighted with change markers that appear in the gutter next to the modified lines, and show the type of changes introduced since you last synchronized with the repository. When you commit changes to the repository, change markers disappear.

The changes you introduce to the text are color-coded:

  • marker for a newly added line line added.

  • marker for a modified line line changed.

  • marker for a deleted line line deleted.

tip

You can customize the default colors for line statuses on the Editor | Color Scheme | VCS page of the IDE settings Ctrl+Alt+S.

To disable VCS markers in the gutter, deselect the Highlight modified lines in gutter option on the Version Control | Confirmation page of the IDE settings Ctrl+Alt+S.

You can manage changes using a toolbar that appears when you 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 modified line marker

You can roll back changes by clicking the Revert icon and explore the differences between the current and the repository version of the current line by clicking the Show diff icon.

Instead of reverting the whole file, you can copy any part of the contents of this popup and paste it into the editor.

Delete files from the repository

If you delete a file that is under version control, it still exists in the repository until you've committed the changes. The deleted file is placed to the active changelist, and is highlighted with grey.