#
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
- if {[string match {index *} $line]} {
+ if {[string match {index *} $line]
+ || [string match {mode *} $line]
+ || [regexp {^\* Unmerged path } $line]} {
set tags {}
} elseif {$is_3way_diff} {
set op [string range $line 0 1]
_? {continue}
A? -
D? -
- M? {set files_ready 1; break}
+ M? {set files_ready 1}
U? {
error_popup "Unmerged files cannot be committed.
File [short_path $path] has merge conflicts.
-You must resolve them and include the file before committing.
+You must resolve them and add the file before committing.
"
unlock_index
return
}
}
if {!$files_ready} {
- error_popup {No included files to commit.
+ info_popup {No changes to commit.
-You must include at least 1 file before you can commit.
+You must add at least 1 file before you can commit.
}
unlock_index
return
proc commit_committree {fd_wt curHEAD msg} {
global HEAD PARENT MERGE_HEAD commit_type
- global single_commit
+ global single_commit all_heads current_branch
global ui_status_value ui_comm selected_commit_type
global file_states selected_paths rescan_active
return
}
+ # -- Make sure our current branch exists.
+ #
+ if {$commit_type eq {initial}} {
+ lappend all_heads $current_branch
+ set all_heads [lsort -unique $all_heads]
+ populate_branch_menu
+ }
+
# -- Cleanup after ourselves.
#
catch {file delete [gitdir MERGE_HEAD]}
##
## branch management
+proc is_tracking_branch {name} {
+ global tracking_branches
+
+ if {![catch {set info $tracking_branches($name)}]} {
+ return 1
+ }
+ foreach t [array names tracking_branches] {
+ if {[string match {*/\*} $t] && [string match $t $name]} {
+ return 1
+ }
+ }
+ return 0
+}
+
proc load_all_heads {} {
- global all_heads tracking_branches
+ global all_heads
set all_heads [list]
- set cmd [list git for-each-ref]
- lappend cmd --format=%(refname)
- lappend cmd refs/heads
- set fd [open "| $cmd" r]
+ set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
while {[gets $fd line] > 0} {
- if {![catch {set info $tracking_branches($line)}]} continue
+ if {[is_tracking_branch $line]} continue
if {![regsub ^refs/heads/ $line {} name]} continue
lappend all_heads $name
}
}
}
+proc all_tracking_branches {} {
+ global tracking_branches
+
+ set all_trackings {}
+ set cmd {}
+ foreach name [array names tracking_branches] {
+ if {[regsub {/\*$} $name {} name]} {
+ lappend cmd $name
+ } else {
+ regsub ^refs/(heads|remotes)/ $name {} name
+ lappend all_trackings $name
+ }
+ }
+
+ if {$cmd ne {}} {
+ set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
+ while {[gets $fd name] > 0} {
+ regsub ^refs/(heads|remotes)/ $name {} name
+ lappend all_trackings $name
+ }
+ close $fd
+ }
+
+ return [lsort -unique $all_trackings]
+}
+
proc do_create_branch_action {w} {
- global all_heads null_sha1
+ global all_heads null_sha1 repo_config
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
- set newbranch [string trim [$w.name.t get 0.0 end]]
+ set newbranch [string trim [$w.desc.name_t get 0.0 end]]
+ if {$newbranch eq {}
+ || $newbranch eq $repo_config(gui.newbranchtemplate)} {
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title [wm title $w] \
+ -parent $w \
+ -message "Please supply a branch name."
+ focus $w.desc.name_t
+ return
+ }
if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
tk_messageBox \
-icon error \
-title [wm title $w] \
-parent $w \
-message "Branch '$newbranch' already exists."
- focus $w.name.t
+ focus $w.desc.name_t
return
}
if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
-title [wm title $w] \
-parent $w \
-message "We do not like '$newbranch' as a branch name."
- focus $w.name.t
+ focus $w.desc.name_t
return
}
switch -- $create_branch_revtype {
head {set rev $create_branch_head}
tracking {set rev $create_branch_trackinghead}
- expression {set rev [string trim [$w.from.exp.t get 0.0 end]]}
+ expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
}
if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
tk_messageBox \
}
}
+proc radio_selector {varname value args} {
+ upvar #0 $varname var
+ set var $value
+}
+
+trace add variable create_branch_head write \
+ [list radio_selector create_branch_revtype head]
+trace add variable create_branch_trackinghead write \
+ [list radio_selector create_branch_revtype tracking]
+
+trace add variable delete_branch_head write \
+ [list radio_selector delete_branch_checktype head]
+trace add variable delete_branch_trackinghead write \
+ [list radio_selector delete_branch_checktype tracking]
+
proc do_create_branch {} {
- global all_heads current_branch tracking_branches
+ global all_heads current_branch repo_config
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
- set create_branch_checkout 1
- set create_branch_revtype head
- set create_branch_head $current_branch
- set create_branch_trackinghead {}
-
set w .branch_editor
toplevel $w
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
pack $w.buttons.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
- labelframe $w.name \
+ labelframe $w.desc \
-text {Branch Description} \
-font font_ui
- label $w.name.l -text {Name:} -font font_ui
- text $w.name.t \
+ label $w.desc.name_l -text {Name:} -font font_ui
+ text $w.desc.name_t \
-borderwidth 1 \
-relief sunken \
-height 1 \
-width 40 \
-font font_ui
- bind $w.name.t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
- bind $w.name.t <Key-Tab> "focus $w.from.exp.t;break"
- bind $w.name.t <Key-Return> "do_create_branch_action $w;break"
- bind $w.name.t <Key> {
+ $w.desc.name_t insert 0.0 $repo_config(gui.newbranchtemplate)
+ grid $w.desc.name_l $w.desc.name_t -stick we -padx {0 5}
+ bind $w.desc.name_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
+ bind $w.desc.name_t <Key-Tab> {focus [tk_focusNext %W];break}
+ bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
+ bind $w.desc.name_t <Key> {
if {{%K} ne {BackSpace}
&& {%K} ne {Tab}
&& {%K} ne {Escape}
if {[string first %A {~^:?*[}] >= 0} break
}
}
- pack $w.name.l -side left -padx 5
- pack $w.name.t -side left -fill x -expand 1
- pack $w.name -anchor nw -fill x -pady 5 -padx 5
-
- set all_trackings [list]
- foreach b [array names tracking_branches] {
- regsub ^refs/(heads|remotes)/ $b {} b
- lappend all_trackings $b
- }
- set all_trackings [lsort -unique $all_trackings]
- if {$all_trackings ne {}} {
- set create_branch_trackinghead [lindex $all_trackings 0]
- }
+ grid columnconfigure $w.desc 1 -weight 1
+ pack $w.desc -anchor nw -fill x -pady 5 -padx 5
labelframe $w.from \
-text {Starting Revision} \
-font font_ui
- frame $w.from.head
- radiobutton $w.from.head.r \
+ radiobutton $w.from.head_r \
-text {Local Branch:} \
-value head \
-variable create_branch_revtype \
-font font_ui
- eval tk_optionMenu $w.from.head.m create_branch_head $all_heads
- pack $w.from.head.r -side left
- pack $w.from.head.m -side left
- frame $w.from.tracking
- radiobutton $w.from.tracking.r \
- -text {Tracking Branch:} \
- -value tracking \
- -variable create_branch_revtype \
- -font font_ui
- eval tk_optionMenu $w.from.tracking.m \
- create_branch_trackinghead \
- $all_trackings
- pack $w.from.tracking.r -side left
- pack $w.from.tracking.m -side left
- frame $w.from.exp
- radiobutton $w.from.exp.r \
+ eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
+ grid $w.from.head_r $w.from.head_m -sticky w
+ set all_trackings [all_tracking_branches]
+ if {$all_trackings ne {}} {
+ set create_branch_trackinghead [lindex $all_trackings 0]
+ radiobutton $w.from.tracking_r \
+ -text {Tracking Branch:} \
+ -value tracking \
+ -variable create_branch_revtype \
+ -font font_ui
+ eval tk_optionMenu $w.from.tracking_m \
+ create_branch_trackinghead \
+ $all_trackings
+ grid $w.from.tracking_r $w.from.tracking_m -sticky w
+ }
+ radiobutton $w.from.exp_r \
-text {Revision Expression:} \
-value expression \
-variable create_branch_revtype \
-font font_ui
- text $w.from.exp.t \
+ text $w.from.exp_t \
-borderwidth 1 \
-relief sunken \
-height 1 \
-width 50 \
-font font_ui
- bind $w.from.exp.t <Shift-Key-Tab> "focus $w.name.t;break"
- bind $w.from.exp.t <Key-Tab> "focus $w.postActions.checkout;break"
- bind $w.from.exp.t <Key-Return> "do_create_branch_action $w;break"
- pack $w.from.exp.r -side left
- pack $w.from.exp.t -side left -fill x -expand 1
- pack $w.from.head -padx 5 -fill x -expand 1
- pack $w.from.tracking -padx 5 -fill x -expand 1
- pack $w.from.exp -padx 5 -fill x -expand 1
+ grid $w.from.exp_r $w.from.exp_t -stick we -padx {0 5}
+ bind $w.from.exp_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
+ bind $w.from.exp_t <Key-Tab> {focus [tk_focusNext %W];break}
+ bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
+ bind $w.from.exp_t <Key-space> break
+ bind $w.from.exp_t <Key> {set create_branch_revtype expression}
+ grid columnconfigure $w.from 1 -weight 1
pack $w.from -anchor nw -fill x -pady 5 -padx 5
labelframe $w.postActions \
pack $w.postActions.checkout -anchor nw
pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
- bind $w <Visibility> "grab $w; focus $w.name.t"
+ set create_branch_checkout 1
+ set create_branch_head $current_branch
+ set create_branch_revtype head
+
+ bind $w <Visibility> "grab $w; focus $w.desc.name_t"
bind $w <Key-Escape> "destroy $w"
bind $w <Key-Return> "do_create_branch_action $w;break"
wm title $w "[appname] ([reponame]): Create Branch"
proc do_delete_branch_action {w} {
global all_heads
- global delete_branch_checkhead delete_branch_head
+ global delete_branch_checktype delete_branch_head delete_branch_trackinghead
+
+ set check_rev {}
+ switch -- $delete_branch_checktype {
+ head {set check_rev $delete_branch_head}
+ tracking {set check_rev $delete_branch_trackinghead}
+ always {set check_rev {:none}}
+ }
+ if {$check_rev eq {:none}} {
+ set check_cmt {}
+ } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title [wm title $w] \
+ -parent $w \
+ -message "Invalid check revision: $check_rev"
+ return
+ }
set to_delete [list]
set not_merged [list]
foreach i [$w.list.l curselection] {
set b [$w.list.l get $i]
if {[catch {set o [exec git rev-parse --verify $b]}]} continue
- if {$delete_branch_checkhead} {
- if {$b eq $delete_branch_head} continue
- if {[catch {set m [exec git merge-base $o $delete_branch_head]}]} continue
+ if {$check_cmt ne {}} {
+ if {$b eq $check_rev} continue
+ if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
if {$o ne $m} {
lappend not_merged $b
continue
lappend to_delete [list $b $o]
}
if {$not_merged ne {}} {
- set msg "The following branches are not completely merged into $delete_branch_head:
+ set msg "The following branches are not completely merged into $check_rev:
- [join $not_merged "\n - "]"
tk_messageBox \
-message $msg
}
if {$to_delete eq {}} return
- if {!$delete_branch_checkhead} {
+ if {$delete_branch_checktype eq {always}} {
set msg {Recovering deleted branches is difficult.
Delete the selected branches?}
proc do_delete_branch {} {
global all_heads tracking_branches current_branch
- global delete_branch_checkhead delete_branch_head
-
- set delete_branch_checkhead 1
- set delete_branch_head $current_branch
+ global delete_branch_checktype delete_branch_head delete_branch_trackinghead
set w .branch_editor
toplevel $w
pack $w.list.l -fill both -pady 5 -padx 5
pack $w.list -fill both -pady 5 -padx 5
- set all_trackings [list]
- foreach b [array names tracking_branches] {
- regsub ^refs/(heads|remotes)/ $b {} b
- lappend all_trackings $b
- }
-
labelframe $w.validate \
- -text {Only Delete If} \
+ -text {Delete Only If} \
+ -font font_ui
+ radiobutton $w.validate.head_r \
+ -text {Merged Into Local Branch:} \
+ -value head \
+ -variable delete_branch_checktype \
-font font_ui
- frame $w.validate.head
- checkbutton $w.validate.head.r \
- -text {Already Merged Into:} \
- -variable delete_branch_checkhead \
+ eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
+ grid $w.validate.head_r $w.validate.head_m -sticky w
+ set all_trackings [all_tracking_branches]
+ if {$all_trackings ne {}} {
+ set delete_branch_trackinghead [lindex $all_trackings 0]
+ radiobutton $w.validate.tracking_r \
+ -text {Merged Into Tracking Branch:} \
+ -value tracking \
+ -variable delete_branch_checktype \
+ -font font_ui
+ eval tk_optionMenu $w.validate.tracking_m \
+ delete_branch_trackinghead \
+ $all_trackings
+ grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
+ }
+ radiobutton $w.validate.always_r \
+ -text {Always (Do not perform merge checks)} \
+ -value always \
+ -variable delete_branch_checktype \
-font font_ui
- eval tk_optionMenu $w.validate.head.m delete_branch_head \
- $all_heads \
- [lsort -unique $all_trackings]
- pack $w.validate.head.r -side left
- pack $w.validate.head.m -side left
- pack $w.validate.head -padx 5 -fill x -expand 1
+ grid $w.validate.always_r -columnspan 2 -sticky w
+ grid columnconfigure $w.validate 1 -weight 1
pack $w.validate -anchor nw -fill x -pady 5 -padx 5
+ set delete_branch_head $current_branch
+ set delete_branch_checktype head
+
bind $w <Visibility> "grab $w; focus $w"
bind $w <Key-Escape> "destroy $w"
wm title $w "[appname] ([reponame]): Delete Branch"
pack $w.buttons.restore -side left
button $w.buttons.save -text Save \
-font font_ui \
- -command [list do_save_config $w]
+ -command "
+ catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
+ do_save_config $w
+ "
pack $w.buttons.save -side right
button $w.buttons.cancel -text {Cancel} \
-font font_ui \
{b pullsummary {Show Pull Summary}}
{b trustmtime {Trust File Modification Timestamps}}
{i diffcontext {Number of Diff Context Lines}}
+ {t newbranchtemplate {New Branch Name Template}}
} {
set type [lindex $option 0]
set name [lindex $option 1]
-from 1 -to 99 -increment 1 \
-width 3 \
-font font_ui
- pack $w.$f.$name.v -side right -anchor e
+ bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
+ pack $w.$f.$name.v -side right -anchor e -padx 5
+ pack $w.$f.$name -side top -anchor w -fill x
+ }
+ t {
+ frame $w.$f.$name
+ label $w.$f.$name.l -text "$text:" -font font_ui
+ text $w.$f.$name.v \
+ -borderwidth 1 \
+ -relief sunken \
+ -height 1 \
+ -width 20 \
+ -font font_ui
+ $w.$f.$name.v insert 0.0 [set ${f}_config_new(gui.$name)]
+ bind $w.$f.$name.v <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
+ bind $w.$f.$name.v <Key-Tab> {focus [tk_focusNext %W];break}
+ bind $w.$f.$name.v <Key-Return> break
+ bind $w.$f.$name.v <FocusIn> "$w.$f.$name.v tag add sel 0.0 end"
+ bind $w.$f.$name.v <FocusOut> "
+ set ${f}_config_new(gui.$name) \
+ \[string trim \[$w.$f.$name.v get 0.0 end\]\]
+ "
+ pack $w.$f.$name.l -side left -anchor w
+ pack $w.$f.$name.v -side left -anchor w \
+ -fill x -expand 1 \
+ -padx 5
pack $w.$f.$name -side top -anchor w -fill x
}
}
-from 2 -to 80 -increment 1 \
-width 3 \
-font font_ui
+ bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
pack $w.global.$name.size -side right -anchor e
pack $w.global.$name.family -side right -anchor e
pack $w.global.$name -side top -anchor w -fill x
set default_config(gui.trustmtime) false
set default_config(gui.pullsummary) true
set default_config(gui.diffcontext) 5
+set default_config(gui.newbranchtemplate) {}
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
set font_descs {
#
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
-.vpane add .vpane.files -sticky nsew -height 100 -width 400
+.vpane add .vpane.files -sticky nsew -height 100 -width 200
pack .vpane -anchor n -side top -fill both -expand 1
# -- Index File List
#
-frame .vpane.files.index -height 100 -width 400
+frame .vpane.files.index -height 100 -width 200
label .vpane.files.index.title -text {Changes To Be Committed} \
-background green \
-font font_ui
text $ui_index -background white -borderwidth 0 \
- -width 40 -height 10 \
+ -width 20 -height 10 \
+ -wrap none \
-font font_ui \
-cursor $cursor_ptr \
- -yscrollcommand {.vpane.files.index.sb set} \
+ -xscrollcommand {.vpane.files.index.sx set} \
+ -yscrollcommand {.vpane.files.index.sy set} \
-state disabled
-scrollbar .vpane.files.index.sb -command [list $ui_index yview]
+scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
+scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
pack .vpane.files.index.title -side top -fill x
-pack .vpane.files.index.sb -side right -fill y
+pack .vpane.files.index.sx -side bottom -fill x
+pack .vpane.files.index.sy -side right -fill y
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew
# -- Working Directory File List
#
-frame .vpane.files.workdir -height 100 -width 100
+frame .vpane.files.workdir -height 100 -width 200
label .vpane.files.workdir.title -text {Changed But Not Updated} \
-background red \
-font font_ui
text $ui_workdir -background white -borderwidth 0 \
- -width 40 -height 10 \
+ -width 20 -height 10 \
+ -wrap none \
-font font_ui \
-cursor $cursor_ptr \
- -yscrollcommand {.vpane.files.workdir.sb set} \
+ -xscrollcommand {.vpane.files.workdir.sx set} \
+ -yscrollcommand {.vpane.files.workdir.sy set} \
-state disabled
-scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
+scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
+scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
pack .vpane.files.workdir.title -side top -fill x
-pack .vpane.files.workdir.sb -side right -fill y
+pack .vpane.files.workdir.sx -side bottom -fill x
+pack .vpane.files.workdir.sy -side right -fill y
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
pack .vpane.lower.diff.header -side top -fill x
pack .vpane.lower.diff.body -side bottom -fill both -expand 1
-$ui_diff tag conf d_@ -font font_diffbold
-$ui_diff tag conf d_+ -foreground blue
+$ui_diff tag conf d_@ -foreground blue -font font_diffbold
+$ui_diff tag conf d_+ -foreground {#00a000}
$ui_diff tag conf d_- -foreground red
-$ui_diff tag conf d_++ -foreground blue
+$ui_diff tag conf d_++ -foreground {#00a000}
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
- -foreground blue \
- -background azure2
+ -foreground {#00a000} \
+ -background {#e2effa}
$ui_diff tag conf d_-s \
-foreground red \
- -background azure2
+ -background {#e2effa}
$ui_diff tag conf d_s+ \
- -foreground blue \
- -background {light goldenrod yellow}
+ -foreground {#00a000} \
+ -background ivory1
$ui_diff tag conf d_s- \
-foreground red \
- -background {light goldenrod yellow}
+ -background ivory1
$ui_diff tag conf d<<<<<<< \
-foreground orange \
-foreground orange \
-font font_diffbold
+$ui_diff tag raise sel
+
# -- Diff Body Context Menu
#
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
+$ctxm add command \
+ -label {Refresh} \
+ -font font_ui \
+ -command reshow_diff
$ctxm add command \
-label {Copy} \
-font font_ui \