improvement AddRemoteRepo
This commit is contained in:
46
main.pb
46
main.pb
@@ -1261,24 +1261,31 @@ EndProcedure
|
|||||||
Procedure AddRemoteRepo(Url.s,name.s="origin")
|
Procedure AddRemoteRepo(Url.s,name.s="origin")
|
||||||
Url=_SupTrim(Url)
|
Url=_SupTrim(Url)
|
||||||
name=_SupTrim(name)
|
name=_SupTrim(name)
|
||||||
Debug "Url="+Url
|
Protected add.b=#False
|
||||||
Debug "name="+name
|
|
||||||
;Check if this remote already exists
|
;Check if this remote already exists
|
||||||
main\Gitcall\args = "remote get-url "+name
|
main\Gitcall\args = "remote get-url "+name
|
||||||
If RunExe(@main\Gitcall) = 0
|
If RunExe(@main\Gitcall) = 0
|
||||||
;if yes we remove it
|
;if yes we remove it
|
||||||
|
If Url<>_SupTrim(main\Gitcall\output)
|
||||||
main\Gitcall\args = "remote remove "+name
|
main\Gitcall\args = "remote remove "+name
|
||||||
RunExe(@main\Gitcall)
|
RunExe(@main\Gitcall)
|
||||||
|
add=#True
|
||||||
|
EndIf
|
||||||
|
Else
|
||||||
|
add=#True
|
||||||
EndIf
|
EndIf
|
||||||
; We add a new remote
|
; We add a new remote
|
||||||
|
If add=#True
|
||||||
main\Gitcall\args = "remote add "+name+" "+Url
|
main\Gitcall\args = "remote add "+name+" "+Url
|
||||||
If RunExe(@main\Gitcall) = 0
|
If RunExe(@main\Gitcall) = 0
|
||||||
MessageRequester("Git Remote", "OK:" + #LF$ + main\Gitcall\output, #PB_MessageRequester_Info)
|
;MessageRequester("Git Remote", "OK:" + #LF$ + main\Gitcall\output, #PB_MessageRequester_Info)
|
||||||
ProcedureReturn #True
|
ProcedureReturn #True
|
||||||
Else
|
Else
|
||||||
MessageRequester("Git config", "Échec: " + #LF$ + main\Gitcall\errors, #PB_MessageRequester_Error)
|
MessageRequester("Git config", "Échec: " + #LF$ + main\Gitcall\errors, #PB_MessageRequester_Error)
|
||||||
ProcedureReturn #False
|
ProcedureReturn #False
|
||||||
EndIf
|
EndIf
|
||||||
|
ProcedureReturn #True
|
||||||
|
EndIf
|
||||||
EndProcedure
|
EndProcedure
|
||||||
|
|
||||||
Procedure GetRemoteUrl(name.s="origin")
|
Procedure GetRemoteUrl(name.s="origin")
|
||||||
@@ -1823,6 +1830,7 @@ Procedure RefreshFileList(null.i)
|
|||||||
DisableGadget(#GdtBtnRefresh,#False)
|
DisableGadget(#GdtBtnRefresh,#False)
|
||||||
GetBranchesList()
|
GetBranchesList()
|
||||||
GetRemoteUrl()
|
GetRemoteUrl()
|
||||||
|
GetCommitHistory()
|
||||||
EndProcedure
|
EndProcedure
|
||||||
|
|
||||||
Procedure UpdateHelp(txt.s)
|
Procedure UpdateHelp(txt.s)
|
||||||
@@ -2108,10 +2116,10 @@ WebViewGadget(#GdtHelp, helpX, helpY, helpW, helpH)
|
|||||||
InitGadget()
|
InitGadget()
|
||||||
_SetTooltips()
|
_SetTooltips()
|
||||||
If FileSize(".git")=-2:main\info\isInit=#True:EndIf
|
If FileSize(".git")=-2:main\info\isInit=#True:EndIf
|
||||||
If main\info\isInit=#True
|
;If main\info\isInit=#True
|
||||||
GetRemoteUrl("origin")
|
; GetRemoteUrl("origin")
|
||||||
GetCommitHistory()
|
; GetCommitHistory()
|
||||||
EndIf
|
;;EndIf
|
||||||
|
|
||||||
GetBranchesList()
|
GetBranchesList()
|
||||||
|
|
||||||
@@ -2124,7 +2132,8 @@ WebViewGadget(#GdtHelp, helpX, helpY, helpW, helpH)
|
|||||||
Quit=#True
|
Quit=#True
|
||||||
Case #PB_Event_Gadget
|
Case #PB_Event_Gadget
|
||||||
Select EventGadget()
|
Select EventGadget()
|
||||||
Case #gdtPnl
|
Case #GdtPnl
|
||||||
|
Debug "Click>#gdtPnl"
|
||||||
If EventType()=#PB_EventType_Change
|
If EventType()=#PB_EventType_Change
|
||||||
ReadGitIgnorefile()
|
ReadGitIgnorefile()
|
||||||
Select GetGadgetState(#GdtPnl)
|
Select GetGadgetState(#GdtPnl)
|
||||||
@@ -2134,17 +2143,22 @@ WebViewGadget(#GdtHelp, helpX, helpY, helpW, helpH)
|
|||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
Case #GdtBtnInit
|
Case #GdtBtnInit
|
||||||
|
Debug "Click>#GdtBtnInit"
|
||||||
DoInit()
|
DoInit()
|
||||||
CreateThread(@RefreshFileList(),0)
|
CreateThread(@RefreshFileList(),0)
|
||||||
Case #GdtBtnRefresh
|
Case #GdtBtnRefresh
|
||||||
|
Debug "Click>#GdtBtnRefresh"
|
||||||
CreateThread(@RefreshFileList(),0)
|
CreateThread(@RefreshFileList(),0)
|
||||||
Case #GgtFieldRepo
|
Case #GgtFieldRepo
|
||||||
|
|
||||||
If EventType()=#PB_EventType_LostFocus
|
If EventType()=#PB_EventType_LostFocus
|
||||||
|
Debug "Click>#GgtFieldRepo"
|
||||||
main\GitCall\workdir=GetGadgetText(#GgtFieldRepo)
|
main\GitCall\workdir=GetGadgetText(#GgtFieldRepo)
|
||||||
CreateThread(@RefreshFileList(),0)
|
CreateThread(@RefreshFileList(),0)
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Case #GdtBtnBrowseRepo
|
Case #GdtBtnBrowseRepo
|
||||||
|
Debug "Click>#GdtBtnBrowseRepo"
|
||||||
Protected path.s=PathRequester("Select Folder",main\GitCall\workdir,WindowID(#WinMain))
|
Protected path.s=PathRequester("Select Folder",main\GitCall\workdir,WindowID(#WinMain))
|
||||||
If path<>"" And FileSize(path)=-2
|
If path<>"" And FileSize(path)=-2
|
||||||
main\GitCall\workdir=path
|
main\GitCall\workdir=path
|
||||||
@@ -2158,15 +2172,21 @@ WebViewGadget(#GdtHelp, helpX, helpY, helpW, helpH)
|
|||||||
; EndIf
|
; EndIf
|
||||||
|
|
||||||
Case #GdtBtnClone
|
Case #GdtBtnClone
|
||||||
|
Debug "Click>#GdtBtnClone"
|
||||||
DoClone()
|
DoClone()
|
||||||
Case #GdtBtnPush
|
Case #GdtBtnPush
|
||||||
|
Debug "Click>#GdtBtnPush"
|
||||||
DoPush()
|
DoPush()
|
||||||
Case #GdtBtnPull
|
Case #GdtBtnPull
|
||||||
|
Debug "Click>#GdtBtnPull"
|
||||||
DoPull()
|
DoPull()
|
||||||
Case #GdtListStatus
|
Case #GdtListStatus
|
||||||
|
Debug "Click>#GdtListStatus"
|
||||||
Case #GdtBtnIgnore
|
Case #GdtBtnIgnore
|
||||||
|
Debug "Click>#GdtBtnIgnore"
|
||||||
ToggleGitIgnoreForSelection()
|
ToggleGitIgnoreForSelection()
|
||||||
Case #GdtBtnSaveGitIgnore
|
Case #GdtBtnSaveGitIgnore
|
||||||
|
Debug "Click>#GdtBtnSaveGitIgnore"
|
||||||
Protected hf.i=CreateFile(#PB_Any,".gitignore")
|
Protected hf.i=CreateFile(#PB_Any,".gitignore")
|
||||||
If hf
|
If hf
|
||||||
WriteString(hf,GetGadgetText(#GdtTxtGitIgnore))
|
WriteString(hf,GetGadgetText(#GdtTxtGitIgnore))
|
||||||
@@ -2174,18 +2194,24 @@ WebViewGadget(#GdtHelp, helpX, helpY, helpW, helpH)
|
|||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Case #GdtBtnCommit
|
Case #GdtBtnCommit
|
||||||
|
Debug "Click>#GdtBtnCommit"
|
||||||
DoCommit()
|
DoCommit()
|
||||||
Case #GdtFieldRemote
|
Case #GdtFieldRemote
|
||||||
|
Debug "Click>#GdtFieldRemote"
|
||||||
|
|
||||||
Case #GdtListHistory
|
Case #GdtListHistory
|
||||||
|
Debug "Click>#GdtListHistory"
|
||||||
If EventType() = #PB_EventType_Change
|
If EventType() = #PB_EventType_Change
|
||||||
ShowSelectedCommitInfo()
|
ShowSelectedCommitInfo()
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
Case #GdtSlctBranch
|
Case #GdtSlctBranch
|
||||||
|
Debug "Click>#GdtSlctBranch"
|
||||||
Case #GdtSlctScope
|
Case #GdtSlctScope
|
||||||
|
Debug "Click>#GdtSlctScope"
|
||||||
GetGitIdentity()
|
GetGitIdentity()
|
||||||
Case #GdtBtnSaveCfg
|
Case #GdtBtnSaveCfg
|
||||||
|
Debug "Click>#GdtBtnSaveCfg"
|
||||||
SetGitIdentity()
|
SetGitIdentity()
|
||||||
|
|
||||||
|
|
||||||
@@ -2202,8 +2228,8 @@ OpenGUI()
|
|||||||
|
|
||||||
|
|
||||||
; IDE Options = PureBasic 6.21 (Windows - x64)
|
; IDE Options = PureBasic 6.21 (Windows - x64)
|
||||||
; CursorPosition = 541
|
; CursorPosition = 2191
|
||||||
; FirstLine = 509
|
; FirstLine = 2180
|
||||||
; Folding = ----------
|
; Folding = ----------
|
||||||
; Optimizer
|
; Optimizer
|
||||||
; EnableThread
|
; EnableThread
|
||||||
|
Reference in New Issue
Block a user