Transcript
WinCC OA Gedi Git IntegrationMariusz Suder
BE-ICS-FD
Agenda
• Version control in Gedi
• Gedi Git requirements
• Project View in 3.17
• Git functions in Gedi
• Issues and Proposals
• Summary
02/04/2019 3
Version control in Gedi
• Integrated in the Gedi’s Project View
• All functions accessible from the right-click
pop-up menu
• Available only for files and subdirectories of the
project directory
• Subprojects (eg. component installation directories)
not supported
• Git – 3rd VCS integrated in Gedi
• CVS and SVN available in 3.15 and 3.16
• SVN integration used by C&V team
02/04/2019 4
Requirements
• System requirements
• WinCC OA 3.17 – To be seen if can be backported
to 3.16
• Platform independent (Linux and Windows)
• Git/Git for Windows version 2.0 or higher
• Project requirements
• Git repository in the project directory
• versionControl = ”git” entry in the [ui] section of the
project config file
02/04/2019 5
Project View in 3.17
• New directoriesaccessible:data/ config/ dplist/
• Monitoring project directory files for modifications
• With Git functionalityactivated, font colour indicates file status• Blue – new (untracked)
• Green – staged
• Red - modified
02/04/2019 6
Gedi Git functions (1/2)
Following git actions are available for files and directories
At directory level add, reset and checkout commands applies to allfiles and subdirectories of thisdirectory.
02/04/2019 7
Gedi Git functions (2/2)
• Basically text-based
interface, git
command outputs
displayed in Text
Editor
• Configurable diff
viewer tool
• Only simple usage
covered – no
branching, merging,
rebasing, stashing
802/04/2019
Issues and Proposals (1/2)
• Complete set of git functions (merge, branch, etc.)"To limit complexity in OA we would recommend to use a real git
tool/bash to be used for those options"
• Dynamic list of git functions based on file status, less
common functions moved to submenu"Not yet achievable, requires enhancements in Project View right-
click menu, already on ToDo list"
• Changes made in external git tools are not reflected in
Project View"Possible feature request – monitor .git directory to detect file
status changes"
02/04/2019 9
Issues and Proposals (2/2)
• Git function that opens the window (log, diff, etc.) blocks
any other Git Gedi action until the window is closed
• Colour parent directories based on files statuses
• Commit & Push (SVN-style workflow)
• Missing GUI
• Dock modules to
display git staging view
and history view
• Eclipse and Egit plugin
could serve as
an example
02/04/2019 10
Summary
• Git Gedi integration in WinCC OA evaluated
• Suitable for versioning of modified files in the project
directory
• Not useful for component development
• Ongoing request to backport to 3.16
• Feature still in development phase
• Opportunity to provide our feedback
02/04/2019 11
02/04/2019 12
Questions?
Ideas?
top related