Skip to content

Commit

Permalink
Rename function
Browse files Browse the repository at this point in the history
Git.Installed sounds better than Git.GitInstalled, and will almost always be called in the context of the git class.
  • Loading branch information
joyfullservice committed Nov 13, 2023
1 parent e2049fa commit e723123
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Version Control.accda.src/forms/frmVCSSplitFiles.bas
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ Private Sub cmdSplitFiles_Click()
AddToArray strPaths, varPaths(0)
AddToArray strNew, varPaths(1)
Else
If UBound(varPaths) = 0 And Trim(varPaths(0)) = vbNullString Then
If Len(Trim(varEntries(lngLine))) = 0 Then
' Ignore blank lines
Else
strError = "Expecting two file paths, separated by | character. See line: '" & varPaths(0) & "'"
Expand All @@ -1033,7 +1033,7 @@ Private Sub cmdSplitFiles_Click()

' Require clean branch with git installation
If Not Git.IsCleanBranch Then strError = "Cannot split files in Git when changes are present in the branch"
If Not Git.GitInstalled Then strError = "Git must be installed to use this tool."
If Not Git.Installed Then strError = "Git must be installed to use this tool."

' Make sure we don't have any errors with the Git commands
If Len(strError) Then
Expand Down
8 changes: 4 additions & 4 deletions Version Control.accda.src/modules/clsGitIntegration.cls
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Public Function GetRepositoryRoot(Optional blnFallBackToWorking As Boolean = Tru
strWorking = GetWorkingFolder

' Make sure git is actually installed
If Not Me.GitInstalled Then
If Not Me.Installed Then
If blnFallBackToWorking Then GetRepositoryRoot = strWorking
Exit Function
End If
Expand Down Expand Up @@ -272,7 +272,7 @@ End Function
'---------------------------------------------------------------------------------------
'
Public Function IsInsideRepository() As Boolean
If Me.GitInstalled Then
If Me.Installed Then
IsInsideRepository = (RunGitCommand(egcIsInsideTree) = "true")
End If
End Function
Expand Down Expand Up @@ -524,8 +524,8 @@ End Function
' Purpose : Returns true if git is installed.
'---------------------------------------------------------------------------------------
'
Public Function GitInstalled() As Boolean
GitInstalled = (Len(Me.Version))
Public Function Installed() As Boolean
Installed = (Len(Me.Version))
End Function


Expand Down
2 changes: 1 addition & 1 deletion Version Control.accda.src/modules/clsOptions.cls
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ Private Function HasUnifiedLayoutFilesInGit(strExportPath As String) As Boolean

If blnHasFiles Then
' Check to see if this folder is in a git repository
If Git.GitInstalled Then
If Git.Installed Then
' Check export path
Git.WorkingFolder = strExportPath
HasUnifiedLayoutFilesInGit = Git.IsInsideRepository
Expand Down

0 comments on commit e723123

Please sign in to comment.