Home

OpenInsight Git User Guide v1.0

1. Changed Compile Entities Clean Related Entities T EXAMPLES REPORT O4W PRODUCT EXAMPLES STPROC A MEW PROC EXAMPLES REPORT O4W PRODUCT EXAMPLES STPROC A MEW PROC t CA Chon LL MEN Figure 34 Pull changes into Openlnsight from Git Check Compile Entities Clean releated entities and Click the Go button and OpenInsight Git will pull these changes into OpenInsight and compile and clean the entities 37 Git Interface o File Edit Format View Help 51 05 18 APR 2014 L COMPILE EXAMPLES STPROC A_NEW_PROC 51 05 18 APR 2014 J WRITE EXAMPLES STPROC A_NEW_PROC 7 51 05 18 APR 2014 PI WRITE EXAMPLES REPORT O4AWw PRODUCT 0 50 18 APR 2014 USH WRITE EXAMPLES UINFO OAW ROBERT 90 18 R 2014 US WRITE EXAMPLES UINFO 04W 04Ww 0 50 18 A 2014 PUSH WRITE EXAMPLES UINFO O04W BILL 18 R 2014 usi JSH WRITE EXAMPLE5 5TPROCINS REGISTRY_METHOD_EQUATES PR 2014 PUS PUSI WRITE EXAMPLES STPROCINS OI DATACONV COMMON 2 2014 Pus PUSH WRITE EXAMPLES STPROCINS MP3 MP3QOCX 2014 5 USH WRITE EXAMPLES STPROCINS MP3_IMPULSEMP 3 2014 Pus PUSH WRITE EXAMPLES STPROCINS GOOGLE_KML_STYLES 2014 5 USH WRITE EXAMPLES STPROC X 2014 usi USH WRITE EXAMPLES STPROC ST_ENTRY 2014 Pu PUSH WRITE EXAMPLES STPROC REDUCETEST 2014 usi JSH WRITE EXAMPLES STPROC PROD PIC ENTRY 2014 Pus us WRITE EXAMPLES STPROC PROD ENTRY EVENTS 2 2014 Pus USE WRITE EXAMPLES STPROC PROD ENTRY t 2014 5 USF WRITE EXAMPLES STPROC PRINT_INVOICE 2014
2. Param6 Param7 Params VES EA P 3 4 zs 3 E ea ae lt 4 18 AP 20071024 SINSERT PS_EQUATES DECLARE SUBROUTINE FORWARD EVENT SET PROPERTY UTILITY SEND EVENT DECLARE FUNCTION SET PROPERTY GET PROPERTY UNASSIGNED POPUP SHELLEXECUTE DIALOG BOX REPOSITORY EQU FALSES TO 0 EQU FIX_SUFFIX TO FIX EQU TAB PREFIX TO PAGE EQU TAB SUFFIX TO _TAB EQU TRUES TO if unassigned Parami if unassigned Param2 if unassigned Param3 if unassigned Param4 if unassigned Param5 if unassigned Param6 if unassigned Param7 if unassigned Params ReturnResult Window CtrlEntId i F Ctrl CtrlEntId 1 B begin case Editor Info Line 2 of 411 Co 1 Size 12053 Figure 38 Update to code in Openlnsight Now go back to Windows Explorer and navigate to C Revsoft Git examples oirepository STPROC and edit the CUST ENTRY txt file in Notepad You will see your newly added line near the top Macro Recording Off 40 Y CUSTENTRYbt Notepad gt gt File Edit Format View Help Function CUST_ENTRY Ctr lEntId Event Paraml Param 2 Param3 Param4 Param5 Param6 Param7 Param amp 18 April 2014 Added this line in openinsight 200 1024 INSERT P5 EQUATES DECLARE SUBROUTINE FORWARD EVENT SET PROPERTY UTILITY SEND EVENT DECLARE FUNCTION SET_PROPERTY GET_PROPERTY UNASSIGNED POPUP SHELLEXECUTE DIALOG_BOX REPOSITORY EQU FALSES TO 0 EQU FIX SUFFIX TO FIX EQU TAB PREFIX
3. rT ed eAiglje EIOP 0 530014 Figure 25 Selecting Git Commit from the System Editor Git Menu 20 The Commit window will appear again and look like this Subroutine NEW PROC PARAM1 1 2 B Return 4 nn mM J E Commit message v Commit templates Options Amend Commit QuickTim Ln 1 Col 1 Player Size 58 eee Seer OE I l mee aa yy D ZL a e U 3b lcge EN _ m S PCM JO son _ Figure 26 The Git Commit window 30 As you can see Git knows that there is a new file called A_NEW_PROC txt We will now stage the items and commit to the local repository on Ekim After clicking the Commit button these changes are now committed to the Git repository The next step from the Charisma workstation is to pull these changes from the local Git repository on Ekim into the local Git repository on Charisma on is System Editor s m lt 4 Commit to master C Revsoft GiT examples 2 E Working dir changes diff git a oirepository STPROC NEW PROC txt b oirepos f 1 new file mode 100644 index OOO0000 8c2e46da dev null 0 0 1 5 RA 5ubroutine NEW PROC PARAMI A 1 B 2 C B Return Mo newline at end of file Unstage D Stage g sysrepos STPROC A NEW PROC b amp j mg cirepository STPROC A N
4. 0 tedka OpenInsight Git Interface Pull and Push OpenInsight entities to an external Git repository Git Repository C lRevsoft GiThexamples Operation p N Citeri selection Twpe Changed Execute 5 4 Compile Entities 7 Clean Related Entities Clear Select m PP ESAMPLES STPROC CUST ENTRY P EXAMPLES STPROC FCUST_EMNTR Y HT t 4 4 k oompare Properties Delete All Mone Clear None Hep catau Settings Go dose Figure 52 Openlnsight Git Pull changes All Git entities that are different from their OpenInsight repository versions will be listed in the left listbox Remember that this only means that they are different In normal use this usually means that the Git copy has been updated and you need to pull this update into OpenInsight However there may be times when your OpenInsight copy is more up to date than the Git copy or you do not wish to pull in the copy from Git In any case you can select items in the left listbox and then click the Compare button to compare the OpenInsight version and the Git version Select the entities you wish to pull by moving them into the right listbox Once you have selected all the entities you wish to pull click the Go button This will pull the selected entities into OpenInsight 54 Note Please ensure that you do not have any entities you wish to pull open in the e
5. GIT 55H and SYN _SSH environment variables will be adjusted to point to the following executable http T msysait qaoglecade com Figure 4 Git options screen 4 Git Setup Configuring the line ending conversions How should Git treat line endings in text files 9 Checkout Windows style commit Unix style line endings Git will convert LF to CRLF when checking out text files When committing text files CRLF will be converted to LF For cross platform projects this is the recommended setting on Windows core autecrlF is set to true as is commit Unix style line endings Git will not perform any conversion when checking out text files When committing text files CRLF will be converted to LF For cross platform project this is the recommended setting on Unix core autoclf is set to input as is commit as is Git will not perform any conversions when checking out or committing text files Choosing this option is not recommended for cross platform projects core autoclf is set to false http msysgit qaoglecade cam Figure 5 Git options screen 5 Initializing a Git Repository The next step is to initialize a Git repository To do this we use Git Extensions which has been added to Windows Explorer context menu Open Windows Explorer and navigate to the directory where you wish to create your Git repository The directory can be anywhere on your local hard drive In the illustration below we will
6. Ol repository types to include Leave blank to include all Ol repository types DBCOLUMN to exclude DBTABLE only works if inlude is blank Figure 11 Git configuration settings Git Interface Settings Window The Git Interface Settings window is used to control how OpenInsight and Git interact The settings for the current OpenInsight application are automatically loaded These settings are stored in the SYSENV table with the key of CFG_GIT applId Note Openlnsight Git will only push entities that are flagged as publishable in the OpenInsight repository If you want to keep some source in your OpenInsight system but not push it out to Git then untick the publishable flag General Tab Git Repository Locations Select the directory where your Git repository is located You can enter multiple locations if you wish When you push or pull your changes you can select the location of the Git Repository you want to utilize Enter in the path to the directory you created earlier that holds your empty Git repository C Revsoft Git examples 14 NOTE The first location is used to automatically push changes from OpenInsight to the Git repository via the Openlnsight repository hooks Git Repository Directory Name Enter in the name you want to use for the directory in Git that stores your Openlnsight source If this is blank then the default name of oirepository is used The following rep
7. Pull updates from your local Git repository into OpenInsight Pushing updates from Openlnsight to Git From OpenInsight v10 0 and above OpenInsight Git is fully integrated into the OpenInsight repository Whenever you add modify or delete an OpenInsight entity the update is automatically pushed to your local Git working directory Git tracks changes or deltas only If you save an entity without making any changes Git will not recognize any changes and Git will ignore the save From OpenInsight v10 0 and above updates are automatically pushed to Git Therefore there is usually no need to perform a manual Push of updates to Git However there are some scenarios where you must perform a manual Push 1 When you first start using Git for your source code management 2 If your local Git repository becomes corrupted 3 If you think that something has been missed by the automatic repository processing 45 To perform a manual Push from OpenInsight to Git either 1 From the Application Manager Application Tools and select the OI Manual Push Pull operation or 2 Select the OI Manual Push Pull menu option from the Git menu in the System Editor d Git Commit qma Git Diff 4 GitGUI Git History a Git Pull d Git Push Ol Manual Push Pull OI Pull Changed n A Recompile Figure 43 System Editor OIGit menu OI Manual PushPull 46 This will open the OpenInsight Git window with the default Push operat
8. REGCREATEKEYEX Null Record Missing Source 2014 PUSH EXAMPLES STPROC REGQUERYVALUEEX Null Record Missing Source 2014 SH Gi EXAMPLES STPROC REGSETVALUEEX NUT Record Missing Source R 2014 PUSI EXAMPLES STPROC RGB Null Record Missing Source t 2014 PUSH i EXAMPLES STPROC SEND EVENT Null Record Missing Source t 2014 USH EXAMPLES STPROC SEND MESSAGE Null Record Missing Source 2014 PUSH E EXAMPLES STPROC SET PRINTER Null Record Missing Source 2014 SH EXAMPLES STPROC SET PROPERTY Null Record Missing Source 2014 USH EXAMPLES STPROC SET STATUS Null Record Missing source 2014 PUSH 1 EXAMPLES STPROC XLATE Null Record Missing Source Figure 17 Push errors log OpenInsight Git maintains an errors log and a process log in the Nogs directory beneath OpenInsight The error log displays any errors that occur during the last push or pull process The process log maintains a list of the last 1000 successful push or pull processes From the error log above you can see that all these errors occurred because OpenInsight Git found a repository record for some source but failed to read the source code This usually means that you have invalid repository records and they need to be cleaned up 21 Now if you look at your C Revsoft Git examples directory in Windows Explorer you should see something like this m e boe s A a EN e W o OGO gt Computer LocalDisk C Revsoft Git
9. eee eene eee e eoo oone 18 COMMITTING CHANGES TO THE GIT REPOSITORY c eee eee eee e eee eee eee eee e eee onnne 22 MOVING CHANGES BETWEEN MULTIPLE GIT REPOSITORIES e eee eee eee eee u n 26 PULLING CHANGES FROM ONE GIT REPOSITORY INTO ANOTHER GIT REPOSITORY31 PULLING CHANGES FROM GIT INTO OPENINSIGHT ee eee eee eee ee eee eee eene eere ee oeee 34 OPENINSIGHT GIT AUTOMATIC PUSH TO GIT REPOSITORY cccccccccccccccccees 39 THE SEVEN STEPS TO USING OPENINSIGHT GIT ee ee ee ee e ee eee ee eee e eee eee eee e ee oPeoe 45 PUSHING UPDATES FROM OPENINSIGHT TO GIT c sscscccscecceccsccsccececcsccsccsceececceccscecescesssccscsecescescscescescessesssceeees 45 PUSES CECO DE PR rU 47 HOW TO COMMIT CHANGES TO YOUR LOCAL GIT REPOSITORY ccccccecececcacececececececcscscscecececececesecesesosoaoaoaoaaenane 48 PULLING UPDATES FROM A REMOTE GIT REPOSITORY scscceccscecceccecceccscesceccsccecescescsscecescesceccssescescscesesseecescesens 50 MERGE UPDATES FROM REMOTE REPOSITORY WITH YOUR LOCAL REPOSITORY ceccscceccecceccescesccsccsccuscescescesceecs 51 RESOEVING CONF ICES 5622 ad N tms No al P SAA NASA teehee AE A AAR AIA in cn aL Mt es ote Dla 52 PUSH UPDATES TO REMOTE REPOSITORIES ecececcecececcscececcscecesoscesesoesesosoesesoesesesoesesosoesesossesesoesesesoesesoaoesenanss 52 PULLING U
10. examples gt v 44 Search examples p File Edit View Tools Help Organize v a Open Include in library Share with Burn New folder a Fil R Favoddiss Name Date modified Type Size i git 4 18 2014 10 04 AM File folder BE Desktop Jo ssysrepos 4 18 2014 10 10 AM File folder H Libraries L eirepository 4 18 2014 10 10 AM File folder Documents RU Music i Pictures E Videos A Robert Catalano j Computer Ry Local Disk C ca RECOVERY D e DVD RW Drive E amp AREV ardelis winwinsol int F C documents ardelis winwinsol int C OI ardelis winwinsol int J G arev32 ardelis oi K C examples EKIM C_on_Ekim Revsoft amp anniestemplate niobe Q C home devserver T CG soft devserver winwinsol int U amp data devserver winwinsol int V C install devserver winwinsol int W C temp ardelis shared files X hi Network Eid Control Panel Recycle Bin VM Shortcuts ape git State BB Shared Shared with All domain users d File folder Date modified 4 18 2014 10 04 AM Figure 18 Git repository after your first push Two new directories have been created The sysrepos directory contains partial OpenInsight repository records These are required when pushing and pulling some types of OpenInsight repository items such as external files The oirepository directory contains the source for the repository types that you
11. oirepository STPROC CUST ENTRY txt 1 5 1 5 GG function CUST ENTRY CtrlEntId Event Parami Param oirepository STPROC CUST ENTRY txt 20071024 SINSERT PS EQUATES ilo Tm k Ei Commit message E Commit templates Options 7 Reset all changes E Amend Commit Figure 40 Committing new changes to Git Git knows that the CUST_ENTRY procedure has changed Move this file into the staging area and enter a commit comment such as I updated this with a new comment Then hit the Commit button You now have two snapshots of the source code for CUST ENTRY That is versions when 1 You first pushed out the source code from OpenInsight and committed the changes and 2 When you edited the program in the System Editor and committed the changes To see a history of changes for this file in Git navigate to the C Revsoft Git examples oirepository S TPROC directory and right click on the CUST ENTRY txt file Then from the context menu select Git Extensions and then File History 42 _ M a H P beum x X ee at uM SE KD Q d Computer gt Local Disk C gt Revsoft gt Git examples oirepository STPROC v 4 SearchSTPROC p dr Favorites Name Date modified Type Size __ ALNEW_PROC tt 4 18 2014 2 24PM Text Document 1 KB i BE Desktop BILLTEST txt 4 18 2014 2 24PM Text Document 1 KB Libraries BOB_FORM_EVENTS tt 4 18 2014 2 24PM Text Doc
12. 1 Viewing the history of a file in Git _ er 43 This will open the Git Extensions history window VM File History oirepository STPROC CUST_ENTRY txt C Revsoft Git examples b master MET ELS eee ee Robert Catalano 5 minutes ago My first commit Robert Catalano View V Blame i function CUST ENTRY CtrlEntId Event Paraml Param2 Param3 Param4 Params Param6 Param Param 18 April 2014 Added this line in OpenInsight 20071024 SINSERT PS EQUATES DECLARE SUBROUTINE FORWARD EVENT SET PROPERTY UTILITY SEND EVENT DECLARE FUNCTION SET PROPERTY GET PROPERTY UNASSIGNED POPUP SHELLEXECUTE DIALOG BOX REPOSITORY EQU FALSES TO EQU FIX SUFFIX TO FIX EQU TAB PREFIXS TO PAGE EQU TAB SUFFIXS TO TAB EQU TRUES TO 1 if unassigned Param if unassigned Param if unassigned Params if unassigned Param4 if unassigned Params if unassigned Params it unassigned Param if unassigned Param Returnkesult Window CtrlEntId 1 F Ctrl CtrlEntId 1 B Figure 42 Git Extensions file history window You can see that there have been three commits for this file You can view the source code as it was at each commit and you can even compare the changes between each commit This is one of the powerful features of Git It lets you view previous versions of a procedure and compare them to see what changed between each version who made the change and when the change occurred Wo
13. 44 oirepository STPROCINS MP3 MP3OCX txt create mode 100644 oirepository STPROCINS OI DATACONV COMMON txt create mode 100644 oirepository STPROCIMS REGISTRY METHOD EQUATES txt create mode 100644 oirepository UINFO O4W BILL txt create mode 100644 otrepository UINFO O4W O4W tt create mode 100644 oirepository UINFO O4W ROBERT txt Mane 7 Keep dialog open Figure 22 Commit process window Moving changes between multiple Git repositories In a multi developer environment you would then send your changes to a remote central Git repository and receive any new changes down to your local Git repository For the purpose of demonstrating the OpenInsight push pull process we are going to simulate receiving changes from another copy of OpenInsight In the example below the same Git environment has been set up on another workstation which we will Remote Desktop into The system we have been working on is called Charisma and the system on the Remote Desktop is called Ekim The flow of events are as follows e Create a new program on workstation Ekim in the EXAMPLES application e Commit the new changes to Ekim s local Git repository e From the Charisma workstation in the EXAMPLES application pull the Git repository changes from Ekim into the Charisma s local Git repository e Pull the changes from Charisma s local Git repository into the EXAMPLES application on Charisma 26 MK ekim Remote Desktop Connection Appli
14. 6 INITIALTZING GIT REPOSITORY 55iiinteieeictec eqeeueeese EEEE EEEE E Ea 9 TB IAM ELE S M 12 GE DIETING STARTED 5 oniieeceieesveteeaescoeuv ek edes eae eese epa eeu due cune ade sepu e e pae Yu ae ux va e Ee vete ENTER r eS eara IEEE 13 SETTING UP OPENINSIGHT GIT iiieeiis eesbeettecststiveukeeUbuueka siue eR e ve En Leu u Ee Vau eee Eck exa Pra kun echo ee bend 13 GIT INTERFACE SETTINGS WINDOW 5 eesseeckteese xv eeeubeVeeekstuveuscestiuesaerkbeesvbe ntes eoa dason eaea dais 14 GENERAL SEA Bronsa E meet 202215 NAO Lope qeu Dn 2125 EOE E TA EEE 002 i Lane MR 14 GURPS OIV LOC Hm Ra 14 GU Repository DIT ecto N OME asics as oath itam cece pis aa o a ved ES a ted cef 15 OPITeDOSMODV IVDOSCIOAHCUINdGS eoo Rs oot licae ed etti deed e da M CASAT Iu cM E PUN S 15 OLT POSSUO AY PES TO CHIU Z ei UE ua ee ocd qe m uso O EC eM E MMC 15 GIT INTERFACE TA Boote oe tue NI Ra n Casdm qu ime Es Eau bcc N eee TD 16 77 m Q 16 CONU RA MA vat YE II EA 16 Ro c 16 DUAE rro E TT 16 IB NEA TL e n 16 DUM ec PE A 16 PUSH YOUR SOURCE CODE TO YOUR GIT REPOSITORY e eee e eee eee
15. 7 Size 58 Macro Recording Off Figure 37 Updated source code in System Editor Openlnsight Git automatic push to Git repository Any changes you save in OpenInsight will automatically be pushed out to Git For example when you save a stored procedure in the System Editor the updated source code will be automatically pushed to your Git repository This automatic push will occur for all repository entities when using their default editing tool It will not work if you update an entity by bypassing the repository function For example if you edit a procedure in the System Editor by opening a record in the SYSPROCS table making changes then saving the changes Tthis method bypasses the REPOSITORY function and also the automatic push to Git So let s see how this automatic push works Open the System Editor and open the procedure CUST ENTRY Insert a new line at line 2 like this 18 April 2014 Added this line in OpenInsight Then either Save or Save and Compile the change You will not see any difference in OpenInsight but your changes have been automatically pushed to Git Automatically pushing the changes for you makes working with Git much easier 39 id Stem tor V i File Edit View Search Macros Utilities Options Git Window Help v s 3 lja AN lt e E SYSPROCS CUST_ENTRY ais sisi E oE x function CUST ENTITRY CtrlEntId Event Param1 Param2 Param3 Param4 Params
16. Application Development Programmer s Reference Manual Figure 19 Committing changes to Git Recompile 23 The Git Extensions commit window will display Mx Commit to master c Revsoft Git examples Z gt E Working dir changes SPUBLIC sysrepos FORM O4W CUSTOMERS txt gt PUBLIC sysrepos FORM O4W CUSTOMERSI txt O4WINQUIRY EXAMPLES CUSTOMERS h sysrepos GRAPH O4W SALES txt i F sysrepos MENU O4W EXAMPLES MENU txt F sysrepos OCX MP3 OCX txt sysrepos OIEVENT CLICK TESTVS BUTTON 1 txt sysrepos OIREPORT OIBRW REPORTS txt sysrepos OIREPORT RBLAYOUT AGE_REPORT txt sysrepos OIREPORT RBLAYOUT CUSTOMER_PHONE_LISTING txt sysrepos OIREPORT RELAYOUT PRODUCT_GIT txt sysrepos OIREPORT RDLAYOUT AGED_INVOICES RPT txt h sysrepos OIWIN BILL1 txt sysrepos OIWIN BILL2 txt 1 te LI a fA ATTRA CAPR A n r m T E Commit message Commit templates Options 7 T Commit amp push MS Reset all changes E Amend Commit Figure 20 Git Extensions Commit window Most Git clients will have a similar commit window The upper left is your Working Directory and contains a list of all the files that have changed since your last commit As you can see each of these has the green plus icon which means that these are new files Changes will have a pencil icon P and deletes will have a red minus sign The uppe
17. EW _PROC te 4 Tm h QT Commit amp push Commit of A NEW PROC e Reset all changes Amend Commit QuickTirm Player is Size 58 x r al VC 18 powog D Figure 27 Staging and committing items on Ekim Pulling changes from one Git repository into another Git repository To pull changes from the Git repository on Ekim into the Git repository on Charisma choose Git from the Application Manager on Charisma then Git Pull 31 File Entity Bb as Application Tools Wh Database Manager H Client Server Workspace e XML Workspace h BA Repor Builder Banded Report Writer User Interface Workspace System Editor Tools View Development Window Help es s 2 D Form Designer Table Builder O4W Arev32 H Git Commit i Git Diff 4 GitGUI T ice Git Histo 4 a Windows Cananen E Git Py 3 Git Pull dk Git Push S OI Manual Push Pull OI Pull Changed Recompile ane OpenInsight Help Guide to Application Development Programmer s Reference Manual Figure 28 Choosing the Git Pull menu Settings 32 M Pull c Revsoft Git examples Hide help Pull from Hover to see scenario when fast forward is possible Remote Cane cin Bn merge commit E Url L REMOTE Branch other m i Local branch master remote rep
18. LES OTWIN CUST ENTRY EXAMPLES OIWIN CUST ENTRY QBF EXAMPLES OIWIN CUST ENTRY QBF EXAMPLES OTWIN EXAMPLES MAIN EXAMPLES OTWIN EXAMPLES MAIN FY AMDI EG COTMTN SEY AMDI FS MATN EY AMDI EG CYTMITNI SEY AMDI FS MATN 4 n h 4 Hr Compare Properties Delete All ESO Figure 44 OpenInsight Git Manual Push Pull Window The default Git repository for the current OpenInsight application will be automatically selected See Setting Up OpenInsight Git for further details about maintaining the available Git repositories Push Selection type There are 5 options for Push selection types a All Selects all publishable OpenInsight source entities b Changed Finds publishable entities in OpenInsight that are either different to the entity in the local Git repository or do not exist in the local Git repository 47 c Current preselects the procedure or insert currently being edited include any functions subroutines or inserts that it may use d Custom Enables the Selection Criteria group box so you can select the types of entities you wish to push based on last update date and or last update user e Since ddmmyyyy hh mm Changes since the last manual push date time The selection is based on the last update date and time for an entity The last manual push date and time are stored in the OpenInsight Git settings for the current application Entitie
19. LITY SE 8 DECLARE FUNCTION SET PE Settings SIGNED POI 9 EQU FALSES TO O L 10 EQU FIX SUFFIX TO FIX TF EQU TAB PREFIXS TO PAGE l2 EQU TAB SUFFIX TO FAB 13 EQU TRUES TO 1 14 Figure 54 System Editor Git menu options Git Commit This menu option displays the Git Commit window for your chosen Git UI The menu option also displays the number of uncommitted updates in your working directory If there are no uncommitted updates this this menu option will be disabled See How to commit updates to your local Git repository for more information Git Diff The Diff menu option opens the Git UI Diff window The Diff window lists each commit to your local Git repository including commits from other users that you pulled from the central Git repository For each commit Git Diff will list the entities that were updated in that commit You can double click on an entity to view its complete history See the Using Git Diff Window for more information Git History The Git History option opens the Git File History window for the current procedure or insert you are editing in the SRP Editor The File History window displays the complete history of an entity including all updates and who changed them See Viewing Entity History for more information Git Pull The Git Pull option opens the Git Pull window Use this window to pull updates from an external Git Repository into your local Git repository See Pu
20. MPLES GRAPH O4W SALES EXAMPLES GRAPH O4W SALES h EXAMPLES MENU O4W EXAMPLES MENU EXAMPLES MENU O4W EXAMPLES MENU EXAMPLES OCX MP3 OCX EXAMPLES OCX MP3 OCX EXAMPLES OIEVENT CLICK TESTVS BUTTON 1 EXAMPLES OIEVENT CLICK TESTVS BUTTON 1 EXAMPLES OIREPORT OIBRW REPORTS 4 EXAMPLES OIREPORT OIBRW REPORTS EXAMPLES OIREPORT RBLAYOUT AGE REPORT EXAMPLES OIREPORT RBLAYOUT AGE REPORT EXAMPLES OIREPORT RBLAYOUT CUSTOMER PHONE 4 EXAMPLES OIREPORT RBLAYOUT CUSTOMER PHONE EXAMPLES OIREPORT RBLAYOUT PRODUCT_GIT EXAMPLES OIREPORT RBLAYOUT PRODUCT_GIT EXAMPLES OIREPORT RDLAYOUT AGED_INVOICES RE a EXAMPLES OIREPORT RDLAYOUT AGED INVOICES RI EXAMPLES OTWIN BILL 1 EXAMPLES OTWIN BILL1 EXAMPLES OIWIN BILL2 EXAMPLES OIWIN BILL2 EXAMPLES OTWIN BOB FORM EXAMPLES OTWIN BOB FORM EXAMPLES OIWIN CUSTOMER REPORT EXAMPLES OIWIN CUSTOMER REPORT EXAMPLES OIWIN CUST ENTRY EXAMPLES OIWIN CUST ENTRY EXAMPLES OTWIN CUST ENTRY QBF EXAMPLES OIWIN CUST ENTRY QBF EXAMPLES OIWIN EXAMPLES MAIN EXAMPLES OIWIN EXAMPLES MAIN L EY AMPI FS OTWWTN FEYAMPI FS MATN L EY AMDI FSSOTWTN EY AMPI FS MATN 4 T j m a _ 9 T Figure 15 Pushing all items to Git When pushing to Git the green plus icon means that the item does not currently exist in the Git repository Since this is your first push from OpenI
21. OpenlInsight Git User Guide Version 1 0 REVELATION A Division of Revelation Technologies Inc COPYRIGHT NOTICE 1996 2015 Revelation Technologies Inc All rights reserved No part of this publication may be reproduced by any means be it transmitted transcribed photocopied stored in a retrieval system or translated into any language in any form without the written permission of Revelation Technologies Inc SOFTWARE COPYRIGHT NOTICE Your license agreement with Revelation Technologies Inc authorizes the conditions under which copies of the software can be made and the restrictions imposed on the computer system s on which they may be used Any unauthorized duplication or use of any software product produced by Revelation Technologies Inc in whole or in part in any manner in print or an electronic storage and retrieval system is strictly forbidden TRADEMARK NOTICE Openlnsight is a registered trademark of Revelation Technologies Inc Windows Vista Business Windows 7 Windows 8 Windows Server 2003 Windows Server 2008 Windows Server 2012 and above are registered trademarks of Microsoft Inc Part No 214 968 Printed in the United States of America Table of Contents INTRODUC TION it eec a uu EN eR SOGRE SAR CANNE NAAR Eo PROC EIE TEC e VEU TG Ie PESE Sep R US 5 WHAT YOU WILL NEED TO USE OPENINSIGHT GIT ee eee eee e e eee eene ee eee eene eee eee eeSe 5 INSTALLEING GILL
22. PDATES FROM GIT INTO OPENINSIGEHLDT eR b EIE E EE e a ER ENS 53 RECOMPILING PROCEDURES AND WINDOWS ee ee ee ee eee eoe e o eee ee eee eee e eee ee ette esee ees aaae 55 SYSTEM EDITOR OPENINSIGHT GIT MENU e eee eee ee eee eee o eee e ee eere tees ee eene tees esee eaae 57 ENEO DIL E E A E N 1A aliases 2 1290 V A E EE A 57 CUD ar E 240 27 E O E A E T D EN PR E DE ER P 97 CUE TALS OLY M M Er 57 GFU teat A EE E hata hl oa hee E E 57 SUC E seg A dee a cacao A A A NE A AITA OIS A A T E eI 58 IB anual MIRA e ndadivaseudix A 58 OP PU CHOI CCG PRA EEN AR EREE EEO EE E OORE E 200229 1 we 01 P 97 58 TRC COT IES A P S 58 wo LACE D E92 58 Introduction Openlnsight Git is an interface from OpenInsight to the Git source code management system It is included in Openlnsight 10 0 and above Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency You can read more about Git on its web site at http www git scm com For many source code management is a black art reserved for large corporations who have hundreds of developers You may think that source code management systems are complicated involve many steps that have nothin
23. PUS PUSH WRITE EXAMPLES STPROC ORDER_ENTRY_EVENTS 2014 5 5H WRITE EXAMPLES STPROC ORDERS REPORTS WIZARD 2014 USH WRITE EXAMPLES STPROC OI DATACONV KML EXAMPLE 2014 PUSH WRITE EXAMPLES STPROC OI DATACONV KML 2014 JSH WRITE EXAMPLES STPROC OI DATACONV 2014 USH WRITE EXAMPLES STPROC OIPI 5EAM EXAMPLEI Figure 36 Log file Note THIS IS IMPORTANT pulling changes into OpenInsight from Git will completely replace the source code in OpenlInsight Note When you pull items in from Git if the item can be compiled like a stored procedure or an OpenInsight window then OpenInsight Git will compile the item to ensure that the source and object versions of the item are in sync If you pull an insert in from Git then all procedures that use that insert will be recompiled You can now close the OpenInsight Git window Open your editor and edit the A NEW PROC procedure You will see the that new stored procedure we created on Ekim has been added as a new stored procedure on Charisma 38 ig System Editor i FE me x File Edit View Search Macros Utilities Options Git Window Help v 8 ES lj Lal e E 2121 rind tabes v Find insert V SYSPROCS A NEW PROC 8 SYSPROCS A NEW PROC Subroutine A NEW PROC PARAM1 A 1 B 2 C A B Return A Compilation Status Record Information S Find Text 2 Replace Text Favorites List Editor Info Status line 5 of 5 Col
24. TO PAGE EQU TAB SUFFIX TO TAB EQU TRUES TO 1 unassigned Paraml then Parami unassigned Param2 then Param2 unassigned Param3 then Param3 unassigned Param4 then Param4 unassigned Param5 then Param5 unassigned Param6 then Param unassigned Param then Param unassigned Param8 then Param amp Tr TE ReturnResult window CtrlEntrid 1 F ctr ctrlEentid 1 B begin case Case Ctr BUTTON 3 FIX gosub BUTTON 3 FIX case ctrl BUTTON 5 gosub BUTTON 5 case Ctr CUST ENTRY gosub CUST ENTRY Case Ctr EMAIL BTN gosub EMAIL BTN case Ctr INVOICES gosub INVOICES Case Ctr STATE gosub STATE case Ctr TABCONTROL 1 gosub TABCONTROL 1 case call msg amp window window ctr end case T Was not r ecogni 5 ed TE return ReturnResult Figure 39 Change automatically pushed to Git It does not matter how many times you save changes in OpenInsight Git will only remember the source code as of the last save you made in OpenInsight To get Git to snapshot the code as at a particular time you need to commit your changes to Git From the System Editor Git menu select Git Commit The commit window will look like this 4 Commit to master c Revsoft Git examples gt gt gt gt r F E Working dir changes L diff git a oirepository STPROC CUST ENTRY txt b oirepos index 8a66791 482eld6 100644 a oirepository STPROC CUST _ ENTRY txt T b
25. You can change this to push to any other remote repository using the Manage button 2 Push Branches should be set to master and master 3 Click the Push button to push your changes to the remote Git repository You will be notified if there any conflicts Conflicts will need to be resolved before you make any further changes to your Git repository Once the Push operation is complete and any conflicts are resolved the remote Git repository master branch will contain the latest version of the source code including any changes you made in your local copy of OpenInsight and push and committed to your local Git repository Pulling updates from Git into Openlnsight Pulling updates in from your local Git repository is the final step in the seven step process The easiest way to do this is to select the OI Pull Updates menu option from the System Editor or open the OpenInsight Git menu from Application Manager Application Tools and select the pull operation Pull Changed Selection Type Git Commit Git Diff Git GUI Git History Git Pull Git Push Ee OI Manual Push Pull OI Pull Changed s Recompile Settings Figure 51 OI Git menu OI Pull Changed 53 This will open the standard OpenInsight Git window with the Pull operation and Changed Selection Types options preselected It will also examine your local Git repository and identify and updates that need to be pulled into Openlnsight A Openinsight Git Interface 10
26. am Files x86 GitExtensions gitEx crd viewdiff Figure 12 Git Interface settings Click the Save button to save your changes and then the Close button to close the settings window You will be returned to the OpenInsight Application Manager 17 Push your source code to your Git Repository Now you are ready to push your OpenInsight source out to your Git Repository Your OpenInsight Git window should look something like the following File Entity Application Tools Tools View Development Window Help Blu AL WA Database Manager m E 3 A D H Client Server Workspace jen XML Workspace B TJ Lotus Not 4 Da Report Builder a Doun B Banded Report Writer d Multi4 m 2 Tools a TJ Openinsic Bj System Editor 4 Datab mA Form Designer User Interface Workspace Miscel x id B Table Builder il Repo OAW d Sept 32 Arev32 4 User I P OW E LTO E General 4 Git Git Commit Datab ry und 7 Launch Application Entry Point p Git Diff 4 Miscel Advanced kH 4 Git GUI Multec Components TE lE Git Histor 3 Windows Components m GitPull db Git Push OI Manual Push Pull N 3 3 Sle cle P zl v il OI Pull Changed ij Recompile Openinsight Help Guide to Application Development Settings Programmer s Reference Manual Figure 13 Selecting OI Manual Push Pull 18 OpenInsight Git Interface Pull and Push OpenInsight entities to an external Git
27. arty Git clients bundle in basic Git as part of their installation process Below are a few tips to follow during the basic Git installation Please note that your install process may look slightly different to the screen shots below but the basic settings are the same Tip Git Extensions starts a main installation program which then starts individual installation programs for Git and its default difference software KDiff Sometimes these individual installation program windows appear behind the main Git Extensions installation window You many need to Alt Tab to see the individual installation window and continue the installation process Select Components Which components should be installed Select the components you want to install dear the components you do not want to install Click Next when you are ready to continue um TITAN fl In the Quick Launch B V On the Desktop E Windows Explorer integration 1 017 KB C Simple context menu Registry based i M Git Bash Here V 7 Git GUI Here D Advanced context menu git cheetah plugin Assodate git configuration files with the default text editor Assodate sh files to be run with Bash Current selection requires atleast 76 5 MB of disk space m m http msysgit qaoglecade cam Figure 1 Git options Screen 1 Select Start Menu Folder Where should Setup place the program s shortcuts Setup will create the program s shortcuts in
28. cation EXAMPLES General Git Interface Git Repository Locations Directory Last Pull Last Push C Revsoft GiT examples 07 APR 2014 00 00 27 FEB 2014 17 01 Git Repository Directory Name oirepository OI repository types to include Contre Leawe blank to Ey include all Ol repository types DBCOLUMN to exclude DBTABLE only works if inlude is blank Guide to Application Development Programmer s Reference Manual Native Tables WORKS Subscribers Revelation com Saved CFG GIT EXAMPLES EXAMPLES View Selected Types Inherit Entity Yes Flags No QuickTime Dynamic on Remote FBReader Player C Desktop V 7 IUE S meen NOT 1 Figure 23 Git settings on another workstation Using the System Editor we will create a new stored procedure called A_NEW_PROC on Ekim 27 if System Editor so e File Edit View Search Macros Utilities Options Git Window Help Subroutine A NEW PROC PARAM1 Save Stored Procedure 1 B 2 C A B Stored Procedure Name ESENE amp NEW PROC amp RTI EDITOR SP SAVE BILLTEST BOB FORM EVENTS CREATE DIALOG CUSTOMER REPORT EVENTS CUST ENTRY DEBUGGER EXAMPLE DECLARE FCNS DELAY DELETE ROW EXAMPLES MAIN FORMATMESSAGE GET DEFAULT GET INV NOS GET NEXT ID GET PRINTER GET PROPERTY GITTEST GITTESTO2112014 GITTEST2 GITTEST BILL1 GITTEST R1 GIT TESTO3312014 INET INVOICE RPT IMET TRACE EX ed Enter the
29. create a new Git repository in the C Revsoft Git directory These screen shots are for the Git Extensions client Basic Git and other third party clients offer similar Windows Explorer options SO GO m gt Computer Local Disk C Revsoft Git File Edit View Tools Help Organize v Include in library v Favorites RE Desktop 3a Libraries Documents a Music e Pictures E Videos R Robert Catalano jR Computer Ry Local Disk C ca RECOVERY D e DVD RW Drive E amp AREV ardelis winwinsol int F C documents ardelis winwinsol int C OI ardelis winwinsol int J G arev32 ardelis oi K GA examples EKIM C_on_Ekim Revsoft C anniestemplate niobe Q C home devserver T CG soft devserver winwinsol int U C data devserver winwinsol int V C install devserver winwinsol int W C temp ardelis shared files X Cka Network E Control Panel E Recycle Bin d VM Shortcuts O items State Shared Share with v Name Figure 6 Creating a new Git repository from Windows Explorer New folder Date modified Type This folder is empty View Sort by Group by Refresh Customize this folder Paste Paste shortcut Undo Delete Git Init Here Git Gui Git Bash GitExt Clone GitExt Create new repository Git Extensions Share with Shared Folder Synchronization New Properties R
30. ditor or some other OpenInsight development tool These entities will be locked and thus will not be available for update The icons next to each entity in the list have the following means during a Pull operation Does not exist in your Openlnsight repository so it will be added This Openlnsight entity has been deleted from the Git repository so it will be removed from your Openlnsight repository including any debug and executable versions Exists in both Git and Openlnsight repositories but the source in Git does not match the source in OpenlInsight You can use the compare button to compare these two versions The file in Git is identical to the source in Openlnsight These items are ignored during a manual pull Any OpenInsight windows stored procedures and inserts pulled in will trigger a recompilation In the case of inserts all stored procedures in your OpenInsight repository that use the insert regardless of where they have been updated or not will be recompiled If a stored procedure in an inherited application uses the insert it will be flagged as requiring recompilation The next time you login to that application you can select the Recompile menu option from the OI Git Menu If a recompilation fails the item will be flagged as requiring recompilation You can then perform a manual recompilation at a later time Note Any OpenInsight procedures that are currently running in the program stack cannot be recompiled In
31. e subject Most of you will only use a fraction of the features that Git or any SCM offers And that is ok The important thing is to start using an SCM as soon as possible From a one man developer to a team of tens or hundreds of developers using an SCM should become part of your daily work routine What you will need to use Openlnsight Git The following software is required to use OpenInsight Git e Openinsight v10 0 or above e Git Client Software See below for details OpenInsight v10 0 introduces a feature that enables OpenInsight Git to fully integrate into the OpenInsight repository Any change saved in an OpenInsight development tool such as the Editor the Form Designer BRW or O4W will automatically be pushed to the local Git repository making the source management process much easier Installing Git Git comes with built in GUI tools git gui gitk but there are several third party tools for users looking for a specific experience You can download Git from the following website http git scm com downloads A list of third party Git clients is available here http git scm com downloads guis A popular Git client is Git Extensions We recommend using Git Extensions with OpenInsight Git You can download Git Extensions from http sourceforge net projects gitextensions Whether you install the standard Git client or choose a third party Git client you still need to install the basic Git software Most third p
32. evelation Software Inc Revelation Software Ltd 99 Kinderkamack Road Ste 109 Boundary House Westwood NJ 07675 Boston Road U S A London W7 2QE Toll Free 800 262 4747 U K Phone 201 594 1422 Phone 44 O 208 912 1000 Fax 201 722 9815 Fax 44 0 208 912 1001 www revelation com info revsoft co uk Revelation Software is a division of Revelation Technologies Inc BrightIdeas New Zealand 44 Cockle Bay Rd Howick Auckland 2014 New Zealand Phone 464 9 534 9134 info revelation asia Part No 214 967 59
33. g to do with writing code and generally get in the way of being productive And for the most part you would be right Openlnsight Git has been designed to be as painless and transparent as possible There are rules that you will need to follow but for the most part there are many benefits to using source code management software For example Backup of your source code Version control Change control P ai on Collaboration with developers remote to your location OpenInsight Git was originally designed to integrate OpenInsight s development tools with the Git source code management software SCM However there is no reason why OpenInsight Git can t work with other SCM s like Subversion or Mercurial OpenInsight Git s philosophy is simple It mirrors your OpenInsight source code stored procedures windows messages help etc as text files in Windows directories From there your chosen source code management system does the rest This manual consists of a quick start guide and a more detailed user manual The quick start guide is designed to get you up and running in the shortest amount of time using the EXAMPLES application The chapter The Seven Steps to Using OpenInsight Git goes into more details about each step It is not this guide s intention to teach you all the ins and outs of Git or of any other SCM Git comes with many levels of documentation We highly recommend a book called Pro Git which is the de facto bible on th
34. he DBTABLE and DBCOLUMN types are excluded Revelation Software recommends that the following OI repository types be excluded DBCOLUMN DBTABLE 15 Git Interface Tab Contains the default settings are for the Git Extensions client installed in the default location You will need to change these settings if you are using some other Git client or some other source management software Gui Enter the path and filename to start your installed Git client UI Commit Enter the path and filename plus the command to initiate a commit Pull Enter the path and filename plus the command to initiate a pull from a remote Git repository Push Enter the path and filename plus the command to initiate a Push to a remote Git Repository File History Enter the path and filename plus command to open the File History tool for your chosen SCM tool Diff Tool Enter the path and filename plus the command to open the Diff tool for your chosen SCM tool 16 Application EXAMPLES Git Path C Program Files x86 git bin git exe Gui C Program Files x86 GitExtensions gitEx cmd openrepa Commit C Program Files x86 GitExtensions gitEx cmd commit Pull C Program Files x86 GitExtensions gitEx cmd pull Push C Program Files x86 GitExtensions gitEx cmd push File History C Program Files x86 GitExtensions gitEx cmd filehistory Diff Took C Progr
35. ight click on the folder which will contain the Git repository and select GitExt Create new repository The following screen will appear vl Initialize new repository eri Directory CARevsoftiGmtiexamples Repository type Personal repository Central repository no working dir bare shared all Figure 7 Create a new repository In the above example Git will create a new directory examples in the C Revsoft Git directory and will initialize an empty Git repository Please ensure that you select Personal repository as the reposito e After you click the Initialize button your C Revsoft Git examples directory will display the following message Initialize new repository mm Initialized empty Git repository in C Revsoft Git examples qit Figure 8 Git repository initialization message 10 w w oo alan Snr gt m gt Local Disk C Re C Revsoft Git examples gt ary rer examples E File Edi View Tools Help Organize v Include in library Share with v Burn sk Favorites Date modified Type 4 18 2014 10 04 AM File folder EE Desktop Libraries Documents RU Music is Pictures E Videos Robert Catalano j Computer Sa Local Disk C ca RECOVERY D lt DVD RW Drive E C AREV ardelis winwinsol int F G2 documents ardelis winwinsol int E amp OI ardelis winwinsol int J G arev32 ardelis oi K GP examples N EKIM C_on_Ek
36. igure 45 Git Commit menu option The Git Commit menu will only be enabled when there are uncommitted changes in your local Git working directory The number of uncommitted changes will be displayed inside the square brackets Choose this menu option when you are ready to commit the changes to your local Git repository This will open the Git Commit window 48 The example window below is from the Git Extensions UI Most Git UI tools will follow the same pattern M Commit to master c Revsoft Git examples T E E Working dir changes 1 diff git a oirepository STPROC CUST ENTRY txt b oirepos f index 482eld6 85d7217 100644 j Fd cirepository STPROC CUST ENTRY txt a oirepository STPROC CUST ENIRY txt b oirepository STPROC CUST ENTRY tmt Ge 1 5 41 6 Gg function CUST ENIRY CtrlEntId Event Paraml Param2 18 April 2014 Added this line in OpenInsight 21 April 2014 Added this line in OpenInsight 20071024 SINSERT PS EQUATES Stage g E Commit message Commit templates Options Commit amp push Git updates for use with GitExtensions Reset all changes E Amend Commit Figure 46 Git Extensions Commit Window 1 The upper left box contains a list of unstaged changes to your local Git repository most commonly referred to as your working directory You must stage the changes you wish to commit 2 The lower left box contains a list of the changes you have staged a
37. im Revsoft amp anniestemplate niobe Q amp home devserver T soft devserver winwinsol int U amp data devserver winwinsol int V C install devserver winwinsol int W temp ardelis shared files X Cia Network Eid Control Panel E Recycle Bin VM Shortcuts A 1 item State 2B Shared Figure 9 Empty Git repository The git directory is maintained by the Git software and contains the Git database files You do not need to edit or change any files in this directory All configuration settings are handled by your chosen Git client software You now have an empty Git repository ready for use 11 Git Terms Below is a list of the most common Git terms you need to know Term Description Working Directory A view of your local Git repository which contains a list of uncommitted changes to files A view of your local Git repository which contains a list of files that have been committed locally or pulled from a remote Git repository The name for the repository that the current local Git repository was cloned from Downloads changes from a remote Git repository to your local Git repository Merges changes from a pull into your local Master branch Some Git UI tools perform a Pull and Merge in one operation Uploads committed changes from your local master branch to a remote repository Displays the difference between versions of a file or lists all the changes for a particular commit Com
38. ion and a selection type of Current E OpenInsight Git Interface 10 0 OpenInsight Git Interface Pull and Push OpenInsight entities to an external Git repository Git Repository c Revsoft sit examples zl Operation Push Selection Criteria selection Type Execute 4 Compile Entities 57 Clean Related Entities EXAMPLES FORM O4W CUSTOMERS EXAMPLES FORM OAW CUSTOMERS EXAMPLES FORM 04W CUSTOMERS 1 a EXAMPLES FORM O4W CUSTOMERS 1 EXAMPLES GRAPH O4W SALES EXAMPLES GRAPH O4W 5ALES EXAMPLES MENU O4VWW EXAMPLES_MENLU FT EXAMPLES MENU O4W EXAMPLES MENU EXAMPLES OCX MP3 OCX EXAMPLES OCX MP3 OCX EXAMPLES OIEVENT CLICK TESTVS BUTTON 1 EXAMPLES OIEVENT CLICK TESTVS BUTTON 1 EXAMPLES OIREPORT OIBRW REPORTS EXAMPLES OIREPORT OIBRW REPORTS EXAMPLES OIREPORT RBLAYOUT AGE REPORT EXAMPLES OIREPORT RBLAYOUT AGE REPORT EXAMPLES OIREPORT RBLAYOUT CUSTOMER PHONE a EXAMPLES OIREPORT RBLAYOUT CUSTOMER PHONE EXAMPLES OIREPORT RBLAYOUT PRODUCT GIT EXAMPLES OIREPORT RBLAYOUT PRODUCT GIT EXAMPLES OIREPORT RDLAYOLT AGED INVOICES RI EXAMPLES OIREPORT RDLAYOUT AGED INVOICES RE EXAMPLES OTIWIN BILL 1 EXAMPLES OTWIN BILL 1 EXAMPLES OTIWIN BILL2 EXAMPLES OTWIN BILL2 EXAMPLES OTWIN BOB FORM EXAMPLES OTWIN BOB FORM EXAMPLES OIWIN CUSTOMER REPORT EXAMPLES OIWIN CUSTOMER REPORT EXAMPLES OTWIN CUST ENTRY EXAMP
39. l from any other remote repository using the Manage button 50 2 Select the Merge remote branch into current branch option which is the default This will pull updates from the remote Git repository and automatically merge them into your local repository You will be notified if there are any conflicts during the merge process You will need to resolve them before you can push pull any changes from your local Git repository into OpenInsight or back out to any remove repository See Resolving conflicts for more information 3 Click the Pull button to begin the Pull and Merge operation Once the Pull and Merge operation is complete and any conflicts are resolved your local Git repository master branch will contain the latest version of the source code including any changes pulled from remote repositories and any changes you made in your local copy of OpenInsight You are now ready to push your changes back to remote repositories Merge updates from remote repository with your local repository When you pull updates from a remote repository Git does not automatically incorporate the updates into the master branch of your local repository You must perform a Merge process to do this Some Git client tools such as Git Extensions can automatically merge the changes at the end of the pull process This is a handy shortcut that saves you from performing a manual merge yourself The purpose of the merge process i
40. laceable keywords are available here APPID replaced with the current application Id USERNAME replaced with the current OpenInsight username Use this setting to customize how your OpenInsight source is stored within your Git repository For example if you wanted to have one Git repository and store source code for multiple OpenInsight applications in it then you could change this value to be something like 7 APPID oirepository Then your Git repository would have a sub directory for each of your applications like this c Revsoft Git abeco myapp 1 oirepository c Revsoft Git abcco myapp2 oirepository Ol repository types to include Select which OI repository types you wish to push out to Git Enter in the repository types here and only these types will be pushed to Git If you leave this blank then all repository types will be pushed with the exception of EXE and DBG types like STPROCEXE and STPROCDBG KEE Note s The following OpenInsight repository types are automatically excluded STPROCEXE stored procedure executable STPROCDBG stored procedure debug tables OIWINEXE OpenInsight window executable DBCOMPONENTEXE database component executable OIEVENETEXE OpenInsight event executable OIEVENTDBG OpenInsight event debug table Ol repository types to exclude Enter in the OI repository types you wish to exclude from being pushed to Git This value only applies if the Include list above is left blank By default t
41. lling updates from remote Git repository for more information 37 Git Push The Git Push option opens the Git Push window Use this window to push your committed updates to an external Git repository See Pushing updates to a remote Git repository for more information OI Manual Push Pull This option opens the main OI Git window From this window you can control what entities you wish to push or pull between OpenInsight and your local Git repository See Pushing updates from OpenInsight to Git for more information Ol Pull Changed This option opens the main OI Git window and preloads the window will a list of Git entities that are different to the entities in OpenInsight or do not currently exist in OpenInsight This is the easiest way to pull updates from your local Git repository into OpenInsight See Pulling updates from Git to OpenInsight for more information Recompile The Recompile option displays a popup list of procedures or OI windows that require recompilation The number of procedures or windows requiring recompilation will be displayed in square brackets If no procedures or windows require recompilation this menu option will be disabled See Recompiling Procedures and Windows for more information Settings Opens the Git Settings window where you can control different aspects of the OpenInsight for Git interface See Setting up OpenInsight Git for more information 58 r ae bare T R
42. mit Moves changes from your local working directory to your local master branch Each commit should contain a short description and signed off by the local developer Each commit is assigned a unique id so that it can be identified later A Git tool that identifies who changed a particular line in a file and when it was changed A new file to be added to your local Git repository as seen in your Working Directory A file that is to be deleted from your local Git repository as seen in your Working Directory i Aline removed from afile asseeninGitDiff Theflehasbendelted ThefleinGitisidenticaltothesoureinOpenInsght o lt Master Branch Origin Pull Merge Push Diff 12 Getting Started Openlnsight Git is fully integrated with the OpenInsight repository This means that every time you save changes to an entity in OpenInsight the changes will automatically be updated to the working directory in your local Git repository OpenInsight v10 0 and above The instructions below will guide you through setting up OpenInsight Git for the EXAMPLES application Step one is to login to the EXAMPLES application in your local copy of OpenInsight For a full description of the features of OpenInsight Git please refer to the Seven Steps to Using OpenInsight Git chapter Setting up Openlnsight Git The first time you run OpenInsight Git you will be asked to enter s
43. nabled and has a number in the square brackets this means that there are entities requiring recompilation Select this menu option to display a list of entities to recompile 55 SYSPROG ESRI NR _MVBFS SYSPROG STPROC OIPI EXAMPLE2 BYSPROG STPROC ORMAIN32 LABELS LINUX visse etre YSPROG STPROC RTI COUCHDB SYSPROG STPROC RTI GIT 041514 SPROG STPROC RTI_GIT_CALLS era 2 3 5 amp 7 8 9 10 Figure 53 Openlnsight Git Recompilation popup This lists all the entities in the current application that require a recompilation Select the entities you wish to recompile and click the OK button An error log will be generated if any of the entities fail to recompile The failed entities will remain flagged as requiring recompilation 56 System Editor Openlnsight Git Menu The OpenInsight Git Settings window controls which Git UI you wish to use Farm dil System Editor Utilities Options Git Window Help a iP Git Commit File Edit View search Macros v 231611251 D ia es an a E s Git Diff SYSPROCS CUST_ENTRY sr pum Lz J 4 Git GUI SYS 5T_ENTI Z Git History 1 function CUST_ENTRY Ctx 4 Git Pull fam Param3 2 18 April 2014 Added this Git Push 3 21 April 2014 Added this 4 20071024 OI Manual Push Pull 3 OI Pull Changed 6 SINSERT PS EQUATES m d Recompile 7 DECLARE SUBROUTINE FORK UTI
44. name you wish to save the Stored Procedure as A Compilation Status Record Information S Find Text Editor Info Status Line 5 of 5 Mew Entity Found Col 7 Gathering Required Information Size 58 X e mee cus a ae EE FIT ln LJ PW 03 sna Figure 24 Creation of a new stored procedure using the System Editor 28 From the System Editor menu select the Git menu Git Commit OpenInsight has automatically pushed the newly created stored procedure into the local Git repository on Ekim ar er ditor E a Gare E L File Edit View Search Macros Utilities Options Git Window Help Es G ca afi ALLER Gitcommit N EJA j muee 0 m m9 7 E C ad i Git Diff v SYSPROCS A NEW PROC 4 Git GUI EW PROC RNC Sse a Ls bal a eA z I u J _ Q T Subroutine NEW PROC PARAM1 2 uus tiic dR GitPush E 3 B 2 OI Manual Push Pull E 74 4 n OI Pull Changed Recompile p GP Settings m 4 n A Compilation Status Record Information S Find Text 98 Replace Text Favorites List Editor Info Status Line 5 of 5 RAAU SYSPROCS A NEW PROC Compilation Successful 18 APR 2014 11 42 40 Elapsed 00 00 01 T cal 7 ONE Player SYSPROCS A NEW PROC VNAV Search Successful 18 APR 2014 11 42 41 Elapsed 00 00 01 Gba Sa LEE 71 E O LECURRSOQI LO VL BED m gt a 0 eee
45. nd are ready to commit Only the items in the staged box will be committed your main Git repository 3 The upper right box displays the contents of the file currently selected in either the unstaged or staged boxes When the item is in the staged box this box contains the complete source code When selected from the staged box only the changes or deltas are displayed 4 Thelower right box is where you type a short description of the contents of this commit e g updated Git to support Git Extensions client The comment is optional but we strongly recommend that you write something short and meaningful Other users will be able to read this comment which will help them identify what changes occurred in the commit 5 When you are happy with the selected changes and have typed in your comment click on the Commit button This will commit your changes to your local Git repository commonly referred to as your Master branch You can also click on the Commit amp Push button This will commit your changes locally and then push them to your designed remote repository commonly referred to as origin But it is recommended that you always pull changes from the remote repository first When you pull first you resolve any conflicts locally before you push your changes to the remote repository 40 Pulling updates from a remote Git repository It is recommended that you always push and commit your OpenInsight changes to your local Git reposito
46. nsight to Git all the items have a green plus icon Now click the Go button OpenInsight Git will push the selected items to your local Git repository Note You will probably see the following message at the end of the push process 20 Git Interface Errors Occurred during the Push process Click Ok to view the errors Figure 16 Errors occurred while pushing to Git To view the errors click the OK button This will open Notepad and display the errors log ne rti git errors log Notepad File Edit Format View Help 58 51 18 APR 2014 USH EXAMPLES STPROC wWINDOW Null Record Missing Source 58 51 18 APR 2014 SH EXAMPLES STPROC CREATE DIALOG Null Record Missing Source 58 51 18 APR 2014 PUSH E EXAMPLES STPROC DECLARE FCNS Null Record Missing Source 58 51 18 APR 2014 SH EXAMPLES STPROC DELAY Null Record Missing Source 58 51 18 APR 2014 USH EXAMPLES STPROC DELETE ROW Null Record Missing Source 58 51 18 APR 2014 PUSH EXAMPLES STPROC FORMATMESSAGE Null Record Missing source 18 APR 2014 SH Gi EXAMPLES STPROC GET_PRINTER Null Record Missing Source R 2014 PUS EXAMPLES STPROC GET PROPERTY Null Record Missing Source t 2014 PUSH i EXAMPLES STPROC MESSAGE BOX Null Record Missing source 2014 USH G EXAMPLES STPROC OCONV Null Record Missing Source 2014 PUSH GE EXAMPLES STPROC OR PRTF Null Record Missing Source 2014 USH EXAMPLES STPROC REGCLOSEKEY Null Record Missing Source 2014 USH EXAMPLES STPROC
47. ome configuration settings To start using OpenInsight Git from the Application Manager select Application Tools Git Settings File Entity Application Tools Tools View Development Window Help Ci a A Database Manager E wl l 1 m Client Server Workspace zi AML Workspace al 4 Datab Report Builder 4 Doan Bf Banded Report Writer QMT ee ee Tools BR Userinterface Workspace L3 OpenInsic IE System Editor Datab Form Designer 4 Miscell v eee Open Table Builder Repor QW a POPS 3 Arev32 4 User I 4 O4W CTO ooo o o M General gt Git Fal Git Commit 4 Cath a Launch Application Entry Point Git Diff 4 Doan unch Application Entry Poin Lya Git Dr 4 Miscel Advanced a 49 Git GUI dr Media Components pal Git History 4 Windows Components m Git Pull Git Push OI Manual Push Pull o OI Pull Changed aj aje P Z Hg rays Recompile OpenInsight Help br Guide to Application Development Settings Figure 10 Starting the Openlnsight Git Interface Programmer s Reference Manual Be nas TEMEM 13 Maintain the settings for the OpenInsight Git interface Application EXAMPLES General Git Locala Git Repository Locations Directory Last Pull Last Push LEN a TI T R 7 r CN amni us 65 Pra v Git Repository Directory Name is
48. os OIEVENT CLICK TESTVS BUTTON 1 txt 1 4 sysrepos OIREPORT OIBRW REPORTS txt 4 sysrepos OIREPORT RBLAYOUT AGE REPORT txt E Commit message Commit templates Options sysrepos OIREPORT RBLAYOUT CUSTOMER PHONE LISTING txt sysrepos OIREPORT RBLAYOUT PRODUCT GIT txt My first commit sysrepos OIREPORT RDLAYOUT AGED INVOICES RPT txt sysrepos OIWIN BILL1 txt sysrepos OIWIN BILL2 txt F Amend Commit i sysrepos OIWIN BOB FORM txt sysrepos OIWIN CUST ENTRY txt sysrepos OIWIN CUST ENTRY QBF txt sysrepos OIWIN CUSTOMER REPORT txt T j Figure 21 Staged items prior to committing When you click the Commit button a process window will appear Your process window should look like this once it s completed 25 Process c Revsoft Git examples create mode 100644 oirepository STPROC ORDER ENTRY EVEMTS txt create mode 100644 oirepository STPROC PRIMT INVOICE txt create mode 100644 oirepository STPROC PROD ENTRY txt create mode 100644 oirepository STPROC PROD ENTRY EVENTS txt create mode 100644 oirepository STPROC PROD PIC ENTRVY txt create mode 100644 oirepository STPROC REDUCETEST txt create mode 100644 oirepository STPROC ST_ENTRY tt create mode 100644 oirepository STPROC A tt create mode 100644 oirepository STPROCIMS GOOGLE KML STYLES txt create mode 100644 oirepository STPROCINS MP3 IMPULSEMP3 txt create mode 1006
49. ository IMAGE BMP REPORTS MOFOCUS BMP create mode 100644 oirepository REPORT O4W BRYAN PROD 1 txt create mode 100644 oirepository REPORT O4W PRODUCT txt create mode 100644 oirepository STPROC A NEW PROC txt Il 1nne Keep dialog open Figure 30 Git Pull menu completed dialog 33 Pulling changes from Git into Openlnsight To pull changes from the Git Repository on Charisma into the OpenInsight on Charisma choose Git OI Manual Push Pull File Entity Application Tools Tools View Development Window Help Ci g Database Manager i H Client Server Workspace B XML Workspace i a ao 2 D jen 3 Lotus Not Datab 4 Report Builder 4 Doan BY Banded Report Writer Multi fe es eee NR 4 Tools User Interface Workspace E3 Openinsic System Editor 4 Datab M Form Designer Open dM Table Builder Repor 04W b midi 32 Arev32 2 User T aow G CTO 1 MGeneral gt Git Fl Git Commit Datab za T EES ra s C E Doan Launch Application Entry Point far Git Diff Miscell Adwanced 4 Git GUI e daos M ts lt Git History Windows Components e Git Pull de Git Push OI Manual Push Pull la qp pgp OI Pull Changed C sil s zz AUS PN Recompile OpenInsight Help Guide to Application Development fed Settings Programmer s Reference Manual Figure 31 Choosing Ol Manual Push Pull 1 A
50. ository Remote branch Merge options TT Merge remote branch into current branch L Rebase current branch on top of remote branch creates linear history use with caution O Do not merge only fetch remote changes i i i i a b Tag options Follow tagopt if not specified fetch tags reachable from remote HEAD ag square 5 green KY Fetch no tag ul current branch new corr postfix for files if AAA merge conflicts ocur E Auto ssh Figure 29 The Git Pull menu Note Pull from Example_on_Ekim is mapped to Ekim C Revsoft Git examples on our charisma workstation Click the Pull button to merge the remote branch Ekim repository into the current branch Charisma repository create mode 100644 oirepository TMAGE BMP MP3PLAY BMP create mode 100644 oirepository TMAGE BMP MP3PREVIOQUS BMP create mode 100644 oirepository TMAGE BMP MP3SAVE BMP create mode 100644 oirepository IMAGE BMP MP3STOP BMP create mode 100644 oirepository IMAGE BMP MPEADD BMP create mode 100644 oirepository IMAGE BMP MPEDELETE BMP create mode 100644 oirepository IMAGE BMP NOIMAGE BMP create mode 100644 oirepository IMAGE BMP ORDERS FOCUS BMP create mode 100644 oirepository IMAGE BMP ORDERS NOFOCUS BMP create mode 100644 oirepository IMAGE BMP PRODUCT FOCUS BMP create mode 100644 oirepository IMAGE BMP PRODUCT MOFOCUS BMP create mode 100644 airepository IMAGE BMP REPORTS FOCUS BMP create mode 100644 oirep
51. penInsight repository Items that have a pencil icon exist in both Git and OpenInsight but they are different You can compare the OpenInsight and Git versions by selecting the A NEW PROC procedure in the list on the left then clicking on the Compare button The compare window will appear 35 u RTI UTL Compare RTI Compare Compare two entities and highlight the differences STPROC A NEW PROC vs GIT A NEW PROC STPROC IT NEW PROC A NEW PROC EXAMPLES STPROC A NEW PROC EXAMPLES STPROC A NEW PROC es 1 Subroutine A NEW PROC PARAM amp p er 3 e xs EIS SS S L3 Figure 33 Openinsight Compare window A copy of the OpenInsight source code is on the left and a copy of the Git source code is on the right A yellow highlight indicates that something has changed on the line A green highlight indicates that this is a new line A red highlight indicates that a line has been deleted If you are unsure if your Git or OpenInsight version is the latest version you can use this window to compare each of them Click Close to close the Compare window After moving both procedures to the box on the right your window should look something like this 36 A OpenInsight Git Interface 10 0 OpenInsight Git Interface Pull and Push OpenInsight entities to an external Git repository Git Repository c Revsoft Git examples Operation Pull Selection Criteria selection Type
52. pushed to Git The structure of this directory is a mirror of your OpenInsight repository structure You can browse this directory and view your source code outside of OpenInsight Note Git is now monitoring these files If you make changes to these files then Git knows about it and tracks that as a change Committing changes to the Git repository Now that you have pushed your source code out to Git the next step is to commit the changes to Git Git maintains a database of the changes to files every time you commit the changes Therefore it is important to commit to Git on a regular basis say daily or at the end of your coding session There is no overhead to committing often In fact the more often you commit the better 22 To commit your changes you can either right click in the C Revsoft Git examples directory and select GitEx Commit or from the Application Manager Application Tools Git Git Commit Database Manager Client Server Workspace E Lotus Not E XML Workspace 4 Datab 4 Report Builder Banded Report Writer User Interface Workspace a System Editor Form Designer Table Builder 04W b Arev32 CTO Git Git Commit Launch Application Entry Point Git Diff S Git GUI Git History Git Pull Git Push Advanced E Multi M amp tfa components 3 Windows Components OI Manual Push Pull OI Pull Changed Brass 3 n zs OpenInsight Help Guide to
53. r right displays the contents of the file you selected in your Working Directory You must stage your changes from the Working Directory to the Staging Area in the lower left before you can commit Only files in the Staging Area will be committed To move files from the Working Directory to the Staging Area use the Stage buttons Move all your files to the Staging Area Before you commit you must add a comment This comment is used to describe the purpose of this commit You can type as much or as little as you like The commit process will automatically add the date time and your Git user details to the commit so there is no need to add these details Type the following commit comment My first commit 24 Now click the Commit button to commit these files to Git Committing files is like taking a snap shot of the file at a point in time You will be able to revert back to or look at these files as they were when you committed them Your commit window should look like this V Commit to master c Revsoft Git examples 2 ER Working dir changes i diff git a sysrepos FORM O4W CUSTOMERS txt b sysrepos m gt i new file mode 100644 index QO0300000 9561e6c3 Ge 0 0 41 27 TEXAMPLES TSPUBLIC SPUBLIC O4WINQUIRY EXAMPLES CUSTOMERS Eg sysrepas FORM O4W CUSTOMERS txt h sysrepos FORM O4W CUSTOMERSI txt F sysrepos GRAPH O4W SALES txt sysrepos MENU O4W EXAMPLES MENU txt sysrepos OCX MP3 OCX txt sysrep
54. repository Git Repository Operation Push Selection Criteria Compile Entities Clean Related Entities Compare Properties Delete _ Hep j cit Gut Figure 14 OpenInsight Pull Push window You are about to perform a manual Push from OpenInsight to Git When you do a manual push you can choose which items to push much the same way you choose which items to include in an RDK To push your source to the Git Repository 1 At Operation select Push 2 At Selection Type select AII OpenInsight Git will build a list of all pushable items from your OpenInsight application and display the list in the box on the left You can then choose which items to push by moving the items from the left box to the right box Items in the right box will be pushed to the Git repository thereby overwriting the version in Git 19 Select all the items by clicking the button This will move all the items from the left box to the right box Your window should then look something like this 48 Openinsight Git Interface 10 0 OpenInsight Git Interface Pull and Push OpenInsight entities to an external Git repository Git Repository c lRevsoftiGitlexamples Operation Bush Selection Criteria selection Type 7 Compile Entities 7 Clean Related Entities Clear J EXAMPLES FORM O4W CUSTOMERS EXAMPLES FORM O4W CUSTOMERS EXAMPLES FORM O4W CUSTOMERS1 EXAMPLES FORM O4W CUSTOMERS1 EXA
55. ry before pulling changes from a remote Git repository If you are not using a remote Git repository then you can skip this step To pull updates from a remote repository select the Git Pull menu option from the OpenInsight Git menu or open your Git Client software and select Pull l a ia Git Diff 4 Git GUI Git History 3E GitPull N 4 Git Push OI Manual Push Pull OI Pull Changed A Recompile Settings Figure 47 Openlnsight for Git Git Pull The Git Pull window will appear This example is from the Git Extensions UI VJ Pull cARevsoftGitvexamples Hide help Pull from Hover to see scenario when fast forward is possible Remote merge eamm E Ur T REMOTE Branch other Local branch master remote repasitory Remote branch Merge options TTL Merge remote branch into current branch O 2 Rebase current branch on top of remote branch creates linear history use with caution O Do not merge only fetch remote changes I i i H i i b Tag options Follow tagopt if not specified fetch tags reachable from remote HEAD square praen C Fetch no tag E current branch new orm t postfix for files if AAA merge conflicts occur Solve conflicts Stash changes Auto stash Figure 48 Git Extensions Pull Window 1 Pull from will automatically default to origin which is the remote repository you cloned from your local Git repository You can change this to pul
56. s that match the selection type will be listed in left list box You can use the buttons between the list boxes to move entities in the left list box to and from the right list box The entities listed in the right list box will be the ones pushed out to your local Git working directory To push the selected entities click on the Go button If you push an entity that is identical in OpenInsight and Git Git will ignore the push for the entity If you wish you can compare the selected entities in the left list box with the corresponding copy in your Git repository by clicking on the Compare button The icons next to each entity have the following meaning when performing a push operation Does not currently exist in your Git repository so it will be added Youshould never see this icon during a manual push process A version exists in Git The push will update the Git version with the version in Openlnsight The file in Git is identical to the source in Openlnsight These items are ignored during a manual push How to commit changes to your local Git repository You can check if there are any changes that require committing by opening the OpenInsight for Git menu from the System Editor or opening your Git client software and clicking on the Commit button F Git Commit da Git Diff Ls GitGUI 7 Git History Git Pull 2 Git Push OI Manual Push Pull OI Pull Changed Recompile fed Settings F
57. s to check for any conflicts between your local repository and the remote repository Conflicts occur when the same line of code is changed in both your local repository and the remote repository copy of a file If a conflict is found none of the updates from the remote repository will be integrated with your local repository until the conflicts are resolved Below is an example of a conflict Local Git copy Remote Git Copy loop to check a date loop to check a date table eof falses table eof falses old flag falses old flag falses Loop Loop readnext id else table eof trues readnext id else table eof trues while id do while id do old flag falses old flag falses read record from table handle id then read record from table handle id then old flag true old flag true end end end end repeat repeat In the above code the highlighted line has been changed in both the local copy and the remote copy of the file During the merge process this will be identified as a conflict Any files containing conflicts will be listed in the merge conflict resolution window You must then resolve all conflicts using the Git client compare tool Once all conflicts have been resolved you can then rerun the merge process 51 Resolving conflicts If any conflicts are found during the merge process you will be required to manually resolve the conflicts before continuing Different Git clients offer different conflict resol
58. stead these will be marked as in need of recompilation Any errors that occur during the pull process will be displayed at the end of the pull process Typical errors include a The entity is open in an OpenInsight development tool and thus is locked Locked entities cannot be updated b Recompilation failed the compilation error code and description will be listed in the error log If a source entity fails to be pulled in successfully check the error log for the error code and description Once you resolve the error you can try the Pull process again Recompiling procedures and windows Usually when you pull in stored procedure insert or window updates from your local Git repository the necessary entities will be automatically recompiled However sometimes the recompilation may fail or it may not be possible to recompile at the time the updates are pulled in For example a The stored procedure is currently running in the program stack b The stored procedure is in an inherited application c The stored procedure failed recompilation for some reason d The window failed to compile because the corresponding data tables were not attached or a dictionary field is missing When the automatic recompilation fails or is not possible the entity is flagged as requiring recompilation To check if you need to manually recompile entities click on the OI Git menu and check the Recompile menu option If the Recompile menu option is e
59. t Operation select Pull 2 At Selection Type select Changed When you select Changed OpenInsight Git will compare your OpenInsight source with the source in Git and only select the items that don t match Note THIS IS IMPORTANT the changed option only knows that the item in Git and the item in OpenInsight are not the same It does not know which one is the latest version However it is reasonable to assume that if the Git version and OpenInsight version are different then the Git version must have been pulled in from a remote server You can use the Compare button to compare the OpenInsight and Git version 34 Your OpenInsight Git window should look something like this Z Openinsight Git Interface 10 0 nan aw OpenInsight Git Interface Pull and Push OpenInsight entities to an external Git repository Git Repository c Revsoft Git examples Operation Pull Selection Criteria Selection Type Changed Compile Entities Clean Related Entities Filter By J EXAMPLES REPORT O4W PRODUCT JL EXAMPLES STPROC A_NEW_PROC t Figure 32 Openlnsight Git pull changes Just as in the push operation above you need to select the items you wish to pull into OpenInsight Move the items you wish to pull into the box on the right Note that the new program A NEW PROC txt has a green plus icon T next to it indicating that this procedure exists in your Git repository but not in your O
60. the following Start Menu folder To continue dick Next If you would like to select a different folder dick Browse Git Browse Don t create a Start Menu folder http iimsysgit googlecade com Figure 2 Git options screen 2 Adjusting your PATH environment How would you like to use Git from the command line Use Git Bash only This is the most conservative choice if you are concerned about the stability of your system Your PATH will not be modified Run Git from the Windows Command Prompt This option is considered safe and no conflicts with other tools are known Only Git will be added to your PATH Use this option if you want to use Git from a Cygwin Prompt make sure to not have Cygwin s Git installed O Rum Git and included Unix tools from the Windows Command Prompt Both Git and its accompanying Unix tools will be added to your PATH Warning This will override Windows tools like find exe and sort exe Select this option only if you understand the implications http msysgit qaoglecade cam Figure 3 Git options screen 3 Which Secure Shell client program would you like Git to use Q Use OpenSSH This uses ssh exe that comes with Git The GIT SSH and SVN SSH environment variables will not be modified C Use Torboise Plink PuTTY sessions were found in your Registry You may specify the path to an existing copy of Tortoise Plink exe from the TortoiseSVM CVS or PUTTY applications The
61. uld you like to revert back to a previous version of a procedure no problem Just select the previous version you want copy the code and paste it into the editor in OpenInsight Done Also there is no need to worry about losing the current version of the code in OpenInsight As long as it has been committed to Git you will always have a snapshot of the code as it was at that point in time Even if you delete a procedure from OpenInsight and commit the delete to Git all is not lost Git will always remember the snapshots of files even after they have been deleted Therefore you can always get your source back The only catch is that you must commit your changes to Git on a regular basis because Git only remembers committed files Remember commit early and commit often 44 The Seven Steps to Using Openlnsight Git You should follow these simple steps when using a Git repository with OpenInsight Depending on the Git client you use some of these steps may be combined together e g Pull and Merge Also the first step Push your updates from Openlnsight is automatically done for you in OpenInsight v10 0 and above Push your updates from OpenInsight to your local Git repository Commit your updates to your local Git repository Pull updates from remote Git repositories Merge updates pulled from remote Git repositories with your local Git repository Resolve any conflicts Push updates to remote Git repositories le iu gee qure
62. ument 2 KB Documents i CUST ENTRY bt M 1 18 2014 3 12 PM a Music L CUSTOMER_REPORT_EVENTS Open E Pictures DEBUGGER EXAMPLE bxt Print amp Videos EXAMPLES MAIN bxt Edit A Robert Catalano Lj GET DEFAULT bxt Sc EC AE Computer GET INV NOS bt Convert to Adobe PDF and EMail l Local Disk C GET NEXT ID bd ca RECOVERY D j GIT TESTO3312014 t iat toten pec eii DVD RW Drive E GITTEST bt KDiff3 Ge AREV ardefisariovinsoLint F GITTEST_BILL1 txt ee C Sici ee Li GITTEST R1 txt Git Commit Tool G3 OI ardelis winwinsol int J Li GITTEST2 b t Git History G arev32 ardelis oi K GITTESTO2112014 txt isle 2 examples EKIM C_on_Ekim Revsoft INET_INVOICE_RPT tt ZO G anniestemplate niobe Q INET_TRACE_EX bt wane amp B home devserver T INET_WEB_CUST_ENTRY tt Sano soft devserver winwinsol int U LL INV_ENTRY bt cos i GP data devserver winwinsol int V __ MP3_PLAYER bt E Gitbt Browse G install devserver winwinsol int W O4WCM_CUSTOMERS bt Git Extensions C temp ardelis shared files X L OLDATACONV tt Bl Ci Network j OLDATACONV KML b SEND TOEA El Control Panel __ OLDATACONV KML EXAMP pen a Recycle Bin OIPL EXAMPLE2 bt Mo pe eom VM Shortcuts OIPI REPORT b t Send to 0 L AIDI SEAM EYAMDI FI Ht CUST ENTRY bxt State B Shared Size cut Text Document Date modified 4 18 2014 3 12 PM Date created Copy Figure 4
63. ution tools Git Extensions offers a great tool called KDiff KDiff presents both versions of the file side by side You have the option of choosing either one as the master copy or you can merge parts of each file into a new file See your Git client for further details on conflict resolution You will not be able to perform any further commit pull or push operations from Git until all conflicts are resolved Push updates to remote repositories You should only push your changes to remote repositories once a You have pushed and committed your changes from your OpenInsight system b You have pulled and merged updates from the remote repositories and resolved any conflicts To push your changes to remote Git repositories select the Git Push option from the OpenInsight Git menu or open your Git client and select Push S Git Commit i Git Diff 4 Git GU Z Git History Git Pull de Git Push OI Manual Push Pull OI Pull Changed Recompile Settings Figure 49 Openinsight Git menu Git Push This will open the Git Push client window The example below is from the Git Extensions UI 52 Push to Remote xamples Repository on Ekim 4j Manage remotes Url Branch Branch to push master Show options Pull Figure 50 Git Extensions Push Window 1 Select the remote Git repository you wish to push changes to The default is origin this 1s the remote repository you cloned your local Git repository from

OpenInsight Git User Guide v1.0

Contents

Download Pdf Manuals

Related Search

Related Contents