svk/projman
svk/projman
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Создание ветки

Browse Source
This commit is contained in:
svkalinin 2022-10-21 13:21:32 +03:00
parent a3d9001cc8
commit ccc75b2b18
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/git.tcl
View File

@ -45,7 +45,7 @@ namespace eval Git {
return $res return $res
} }
proc Branches {opt} { proc Branches {opt {ent ".branch.entBranch"}} {
global cfgVariables activeProject global cfgVariables activeProject
set cmd exec set cmd exec
set d [pwd] set d [pwd]
@ -53,19 +53,22 @@ namespace eval Git {
cd $activeProject cd $activeProject
} }
lappend cmd $cfgVariables(gitCommand) lappend cmd $cfgVariables(gitCommand)
lappend cmd "branch"
# lappend cmd "-s" # lappend cmd "-s"
# lappend cmd "--" # lappend cmd "--"
# lappend cmd $activeProject # lappend cmd $activeProject
switch $opt { switch $opt {
current { current {
lappend cmd "branch"
lappend cmd "--show-current" lappend cmd "--show-current"
} }
list { list {
lappend cmd "branch"
lappend cmd "-l" lappend cmd "-l"
} }
new { new {
lappend cmd "-c" lappend cmd "checkout"
lappend cmd "-b"
puts "Branch [$ent get]"
} }
} }
catch $cmd pipe catch $cmd pipe
@ -395,7 +398,7 @@ namespace eval Git {
} }
proc BranchDialog {x y} { proc BranchDialog {x y} {
global editors lexers global editors lexers newBranchName
variable win variable win
# set txt $w.frmText.t # set txt $w.frmText.t
set win .branch set win .branch
@ -406,8 +409,14 @@ namespace eval Git {
toplevel $win toplevel $win
wm transient $win . wm transient $win .
wm overrideredirect $win 1 wm overrideredirect $win 1
ttk::button $win.bAdd -image new_14x14 -command "Git::Branch new" \ ttk::button $win.bAdd -image new_14x14 -compound left -text "[::msgcat::mc "Add new branch"]" \
-compound left -text "[::msgcat::mc "Add new branch"]" -command {
grid forget .branch.lBox .branch.yscroll
grid .branch.entBranch
bind .branch <Return> "Git::Branches new .branch.entBranch; destroy .branch"
}
ttk::entry $win.entBranch -textvariable newBranchName
listbox $win.lBox -width 30 -border 2 -yscrollcommand "$win.yscroll set" -border 1 listbox $win.lBox -width 30 -border 2 -yscrollcommand "$win.yscroll set" -border 1
ttk::scrollbar $win.yscroll -orient vertical -command "$win.lBox yview" ttk::scrollbar $win.yscroll -orient vertical -command "$win.lBox yview"
# pack $win.lBox -expand true -fill y -side left # pack $win.lBox -expand true -fill y -side left