![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/lib/merge.tcl b/lib/merge.tcl
index e0e84aeabebe2bf3ed35d1bc0d485254a6f168c3..889182f5454ac0f636fc57c31a16331c097b0c71 100644 (file)
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
# git-gui branch merge support
# Copyright (C) 2006, 2007 Shawn Pearce
-proc can_merge {} {
+namespace eval merge {
+
+proc _can_merge {} {
global HEAD commit_type file_states
if {[string match amend* $commit_type]} {
return 1
}
-proc visualize_local_merge {w} {
- set revs {}
+proc _refs {w list} {
+ set r {}
foreach i [$w.source.l curselection] {
- lappend revs [$w.source.l get $i]
+ lappend r [lindex [lindex $list $i] 0]
}
+ return $r
+}
+
+proc _visualize {w list} {
+ set revs [_refs $w $list]
if {$revs eq {}} return
lappend revs --not HEAD
do_gitk $revs
}
-proc start_local_merge_action {w} {
+proc _start {w list} {
global HEAD ui_status_value current_branch
set cmd [list git merge]
- set names {}
- set revcnt 0
- foreach i [$w.source.l curselection] {
- set b [$w.source.l get $i]
- lappend cmd $b
- lappend names $b
- incr revcnt
- }
+ set names [_refs $w $list]
+ set revcnt [llength $names]
+ append cmd { } $names
if {$revcnt == 0} {
return
@@ -121,12 +123,14 @@ Please select fewer branches. To merge more than 15 branches, merge the branche
set msg "Merging $current_branch, [join $names {, }]"
set ui_status_value "$msg..."
set cons [console::new "Merge" $msg]
- console::exec $cons $cmd [list finish_merge $revcnt]
- bind $w <Destroy> {}
+ console::exec $cons $cmd \
+ [namespace code [list _finish $revcnt $cons]]
+
+ wm protocol $w WM_DELETE_WINDOW {}
destroy $w
}
-proc finish_merge {revcnt w ok} {
+proc _finish {revcnt w ok} {
console::done $w $ok
if {$ok} {
set msg {Merge completed successfully.}
set fd [open "| git read-tree --reset -u HEAD" r]
fconfigure $fd -blocking 0 -translation binary
- fileevent $fd readable [list reset_hard_wait $fd]
+ fileevent $fd readable \
+ [namespace code [list _reset_wait $fd]]
set ui_status_value {Aborting... please wait...}
return
}
rescan [list set ui_status_value $msg]
}
-proc do_local_merge {} {
+proc dialog {} {
global current_branch
+ global M1B
- if {![can_merge]} return
+ if {![_can_merge]} return
+
+ set fmt {list %(objectname) %(*objectname) %(refname) %(subject)}
+ set cmd [list git for-each-ref --tcl --format=$fmt]
+ lappend cmd refs/heads
+ lappend cmd refs/remotes
+ lappend cmd refs/tags
+ set fr_fd [open "| $cmd" r]
+ fconfigure $fr_fd -translation binary
+ while {[gets $fr_fd line] > 0} {
+ set line [eval $line]
+ set ref [lindex $line 2]
+ regsub ^refs/(heads|remotes|tags)/ $ref {} ref
+ set subj($ref) [lindex $line 3]
+ lappend sha1([lindex $line 0]) $ref
+ if {[lindex $line 1] ne {}} {
+ lappend sha1([lindex $line 1]) $ref
+ }
+ }
+ close $fr_fd
+
+ set to_show {}
+ set fr_fd [open "| git rev-list --all --not HEAD"]
+ while {[gets $fr_fd line] > 0} {
+ if {[catch {set ref $sha1($line)}]} continue
+ foreach n $ref {
+ lappend to_show [list $n $line]
+ }
+ }
+ close $fr_fd
+ set to_show [lsort -unique $to_show]
set w .merge_setup
toplevel $w
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+ set _visualize [namespace code [list _visualize $w $to_show]]
+ set _start [namespace code [list _start $w $to_show]]
+
label $w.header \
-text "Merge Into $current_branch" \
-font font_uibold
pack $w.header -side top -fill x
frame $w.buttons
- button $w.buttons.visualize -text Visualize \
- -command [list visualize_local_merge $w]
+ button $w.buttons.visualize -text Visualize -command $_visualize
pack $w.buttons.visualize -side left
- button $w.buttons.create -text Merge \
- -command [list start_local_merge_action $w]
+ button $w.buttons.create -text Merge -command $_start
pack $w.buttons.create -side right
- button $w.buttons.cancel -text {Cancel} \
- -command [list destroy $w]
+ button $w.buttons.cancel \
+ -text {Cancel} \
+ -command "unlock_index;destroy $w"
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
listbox $w.source.l \
-height 10 \
-width 70 \
+ -font font_diff \
-selectmode extended \
-yscrollcommand [list $w.source.sby set]
scrollbar $w.source.sby -command [list $w.source.l yview]
pack $w.source.l -side left -fill both -expand 1
pack $w.source -fill both -expand 1 -pady 5 -padx 5
- set cmd [list git for-each-ref]
- lappend cmd {--format=%(objectname) %(*objectname) %(refname)}
- lappend cmd refs/heads
- lappend cmd refs/remotes
- lappend cmd refs/tags
- set fr_fd [open "| $cmd" r]
- fconfigure $fr_fd -translation binary
- while {[gets $fr_fd line] > 0} {
- set line [split $line { }]
- set sha1([lindex $line 0]) [lindex $line 2]
- set sha1([lindex $line 1]) [lindex $line 2]
- }
- close $fr_fd
-
- set to_show {}
- set fr_fd [open "| git rev-list --all --not HEAD"]
- while {[gets $fr_fd line] > 0} {
- if {[catch {set ref $sha1($line)}]} continue
- regsub ^refs/(heads|remotes|tags)/ $ref {} ref
- lappend to_show $ref
+ foreach ref $to_show {
+ set n [lindex $ref 0]
+ if {[string length $n] > 20} {
+ set n "[string range $n 0 16]..."
+ }
+ $w.source.l insert end [format {%s %-20s %s} \
+ [string range [lindex $ref 1] 0 5] \
+ $n \
+ $subj([lindex $ref 0])]
}
- close $fr_fd
- foreach ref [lsort -unique $to_show] {
- $w.source.l insert end $ref
- }
+ bind $w.source.l <Key-K> [list event generate %W <Shift-Key-Up>]
+ bind $w.source.l <Key-J> [list event generate %W <Shift-Key-Down>]
+ bind $w.source.l <Key-k> [list event generate %W <Key-Up>]
+ bind $w.source.l <Key-j> [list event generate %W <Key-Down>]
+ bind $w.source.l <Key-h> [list event generate %W <Key-Left>]
+ bind $w.source.l <Key-l> [list event generate %W <Key-Right>]
+ bind $w.source.l <Key-v> $_visualize
- bind $w <Visibility> "grab $w"
+ bind $w <$M1B-Key-Return> $_start
+ bind $w <Visibility> "grab $w; focus $w.source.l"
bind $w <Key-Escape> "unlock_index;destroy $w"
- bind $w <Destroy> unlock_index
+ wm protocol $w WM_DELETE_WINDOW "unlock_index;destroy $w"
wm title $w "[appname] ([reponame]): Merge"
tkwait window $w
}
-proc do_reset_hard {} {
+proc reset_hard {} {
global HEAD commit_type file_states
if {[string match amend* $commit_type]} {
Continue with aborting the current $op?"] eq {yes}} {
set fd [open "| git read-tree --reset -u HEAD" r]
fconfigure $fd -blocking 0 -translation binary
- fileevent $fd readable [list reset_hard_wait $fd]
+ fileevent $fd readable [namespace code [list _reset_wait $fd]]
set ui_status_value {Aborting... please wait...}
} else {
unlock_index
}
}
-proc reset_hard_wait {fd} {
+proc _reset_wait {fd} {
global ui_comm
read $fd
rescan {set ui_status_value {Abort completed. Ready.}}
}
}
+
+}