When a source code repository is configured for the Adelia environment, additional options appear in the 4GL Editor repository and Object manager for the object types managed by the source import and export tool:
- show an icon in the management lists indicating the object synchronization status in relation to the repository and source control manager.
- add a specific filter to synchronization statuses (for instance, only showing the modified objects that need to be committed to the source control manager).
- add functions specific to the source code repository to the object context-sensitive menu (imports/exports, version comparison, object history, commit/revert to change).
Show list of objects
If the repository is connected, each element of a list of objects in the object manager or editor repository is accompanied by an icon, with one or two indicators showing its synchronization status. If the icon is displayed, the object exists in the source code repository (export to disk). If it is not displayed, the element only exists in the Adelia repository.
The icon is accompanied by two status indicators. The indicator in the top right corner shows the synchronization status between the version of the object in the Adelia repository and the one on the disk in the source code repository. There are three possible statuses:
- the object exists in the source code repository but not in the Adelia repository. It can be imported.
- the object exists in the Adelia repository and in the source code repository, the two versions are identical.
- the object exists in the Adelia repository and in the source code repository but the two versions are different.
If a source control manager is configured, the indicator in the bottom left corner shows the synchronization status between the disk version (source code repository) and the source control manager's current revision:
- the object is not known by the source control manager,
- the current version in the source code repository is identical to the current revision in the source control manager.
- the current version in the source code repository has been changed in relation to the current revision in the source control manager.
- the object is not known by the source control manager but was marked as needing to be included.
- the object is in conflict: an update from the source control tool conflicts with a local change*, or the object status is not managed by the Adelia implementation.
* Note: Adelia does not provide a tool for resolving conflicts. To do this, you need to use the source control manager's integrated tools. ↑ Top of page
Status filter
The status filter is used to filter the display of lists in relation to the synchronization status, either between the Adelia repository and the source code repository, or, if a source control manager is configured, between the source code repository and the source control manager.
The status filter is shown if you right-click on the right side of the header of the first column in the list. It is displayed in the form of a context-sensitive menu enabling the user to select which statuses to show.
Options "*" and "[]" are used to rapidly check/uncheck all the statuses.
When a filter is active, the column name is highlighted, prefixed with the ">" character. ↑ Top of page
Context-sensitive menu for lists of objects
A Source code repository sub-menu is added to the context-sensitive menu for list of objects managed by the import and export tools in the object manager and 4GL Editor repository. This menu provides access to import and export functions as well as certain source control manager functions if this is configured.
The menu options are:
Import
Imports the version of the object from the code source repository into the Adelia repository. This option is only available if the object does not exist in the Adelia repository or if the two versions are not identical.
Export
Exports the version of the object from the Adelia repository to the source code repository. This option is only available if the object only exists in the Adelia repository or if the two versions are not identical.
Compare with disk version
Compares the source of the version in the Adelia repository with that of the source code repository version. This option is only available if the two versions are not identical.
The following options are only shown if a source control manager is configured:
Compare with current version
Compares the current version of the Adelia repository with the latest version in the source control manager.
Compare with previous version
Compares the current version of the Adelia repository with the previous version in the source control manager.
Show log
Shows the history of the selected object.
Show Adelia repository log
Shows the history of the whole Adelia repository.
Update
Updates the selected objects to the latest revision in the source control manager. Only available if the source control manager is SVN.
Update Adelia repository
Updates all the objects in the Adelia repository to the latest revision in the source control manager. Only available if the source control manager is SVN.
Commit
Saves changes in progress concerning the selected objects in the source control manager.
Revert
Cancels the changes to the selected objects and goes back to the current revision in the source control manager.
Add
Marks the selected objects as needing to be added to the next commit. Only available for objects which do not exist in the source control manager.
Delete
Deletes objects from the Adelia repository and source code repository and marks them as needing to be deleted from the source control manager in the next commit.