From fdba263d3eca53ec610dc60bcb7fd06e1b3b238a Mon Sep 17 00:00:00 2001 From: svkalinin Date: Fri, 11 Nov 2022 13:04:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D1=80?= =?UTF-8?q?=D0=B5=D0=BB=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20Git::Commit=20(?= =?UTF-8?q?=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA=D1=81=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B2=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/git.tcl | 16 ++++++++++------ projman.tcl | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/git.tcl b/lib/git.tcl index 9cc54ff..dfb1f4d 100644 --- a/lib/git.tcl +++ b/lib/git.tcl @@ -159,16 +159,20 @@ namespace eval Git { proc Commit {w} { global cfgVariables activeProject - set txt [string trim [$w get 0.0 end]] - puts $txt + set txt $w.body.tCommit + set listBox $w.body.lCommit + set description [string trim [$txt get 0.0 end]] + puts $description set cmd exec append cmd " $cfgVariables(gitCommand)" append cmd " commit" append cmd " -m" - append cmd " \"$txt\"" + append cmd " \"$description\"" append cmd " --" - append cmd " $activeProject" - if {$txt eq ""} { + foreach item [$listBox get 0 [$listBox size]] { + append cmd " [file join $activeProject $item]" + } + if {$description eq ""} { set answer [tk_messageBox -message [::msgcat::mc "Empty commit description"] \ -icon info -type ok \ -detail [::msgcat::mc "You must enter a commit description"]] @@ -552,7 +556,7 @@ namespace eval Git { ttk::button $fr.body.bCommit -image done_20x20 -compound left \ -text "[::msgcat::mc "Commit changes"]" \ - -command "Git::Commit $fr.body.tCommit; Git::DialogUpdate $fr" + -command "Git::Commit $fr; Git::DialogUpdate $fr" ttk::button $fr.body.bPush -image doneall_20x20 -compound left \ -text "[::msgcat::mc "Push changes"]" \ -command "Git::PushPrepare; Git::DialogUpdate $fr" diff --git a/projman.tcl b/projman.tcl index 1a6b4d5..d5118d7 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: alpha -# Build: 11112022122612 +# Build: 11112022130209 ###################################################### # определим текущую версию, релиз и т.д.