From 86512b2d5abe19762fd1f55290975c58e88f1173 Mon Sep 17 00:00:00 2001 From: Thyphoon Date: Fri, 29 Aug 2025 17:44:10 +0200 Subject: [PATCH] Add Commit --- main2.pb | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/main2.pb b/main2.pb index 4a05368..149ca47 100644 --- a/main2.pb +++ b/main2.pb @@ -902,6 +902,44 @@ Procedure.i DoGitFetch(remote.s="origin",branch.s="main") ProcedureReturn #False EndProcedure +Procedure.i DoCommit() + Protected code.i,nb.l=0,i.l + Protected args.s = "add" + For i = 0 To CountGadgetItems(#GID_ListStatus) - 1 + If GetGadgetItemState(#GID_ListStatus, i) & #PB_ListIcon_Checked + nb+1 + args+" "+Chr(34)+StringField(GetGadgetItemText(#GID_ListStatus, i),1,Chr(10))+Chr(34) + EndIf + Next i + If nb=0 + MessageRequester("Git add", "Échec: Vous devez selectionnez des fichiers à ajouter au commit", #PB_MessageRequester_Error) + ProcedureReturn #False + EndIf + + If Trim(GetGadgetText(#GID_EdMessage))="" + MessageRequester("Git add", "Échec: Vous devez mettre un message", #PB_MessageRequester_Error) + ProcedureReturn #False + EndIf + + + If Git(args)<>0 + MessageRequester("Git add", "Échec: " + #LF$ + main\GitCall\errors, #PB_MessageRequester_Error) + ProcedureReturn #False + EndIf + + ; Commit with message / Valider avec un message + args = "commit -m " + Chr(34) + GetGadgetText(#GID_EdMessage) + Chr(34) + + If Git(args)<>0 + MessageRequester("Git commit", "Échec ou rien à valider: " + #LF$ + main\GitCall\errors + #LF$ + main\GitCall\output, #PB_MessageRequester_Warning) + ProcedureReturn 0 + Else + MessageRequester("Git commit", "OK:" + #LF$ + main\GitCall\output, #PB_MessageRequester_Info) + EndIf + + ProcedureReturn #True +EndProcedure + Procedure.s GetStatusDescription(status.s) Select status Case " " @@ -1326,7 +1364,7 @@ Procedure Main() ; TODO: ignore Case #GID_BtnCommit - ; TODO: commit with GetGadgetText(#GID_EdMessage) + DoCommit() Case #GID_BtnSaveGitIgnore ; TODO: save .gitignore @@ -1344,8 +1382,8 @@ EndProcedure Main() ; IDE Options = PureBasic 6.21 (Windows - x64) -; CursorPosition = 1191 -; FirstLine = 1159 +; CursorPosition = 932 +; FirstLine = 904 ; Folding = ------ ; EnableXP ; DPIAware \ No newline at end of file