+#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "$@"
##
## status
-proc repository_state {hdvar ctvar} {
+proc repository_state {ctvar hdvar mhvar} {
global gitdir
- upvar $hdvar hd $ctvar ct
+ upvar $ctvar ct $hdvar hd $mhvar mh
+
+ set mh [list]
if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
set hd {}
set ct initial
- } elseif {[file exists [file join $gitdir MERGE_HEAD]]} {
+ return
+ }
+
+ set merge_head [file join $gitdir MERGE_HEAD]
+ if {[file exists $merge_head]} {
set ct merge
- } else {
- set ct normal
+ set fd_mh [open $merge_head r]
+ while {[gets $fd_mh line] >= 0} {
+ lappend mh $line
+ }
+ close $fd_mh
+ return
}
+
+ set ct normal
}
proc PARENT {} {
global PARENT empty_tree
- if {$PARENT ne {}} {
- return $PARENT
+ set p [lindex $PARENT 0]
+ if {$p ne {}} {
+ return $p
}
if {$empty_tree eq {}} {
set empty_tree [exec git mktree << {}]
}
proc rescan {after} {
- global HEAD PARENT commit_type
+ global HEAD PARENT MERGE_HEAD commit_type
global ui_index ui_other ui_status_value ui_comm
global rescan_active file_states
global repo_config
if {$rescan_active > 0 || ![lock_index read]} return
- repository_state new_HEAD new_type
+ repository_state newType newHEAD newMERGE_HEAD
if {[string match amend* $commit_type]
- && $new_type eq {normal}
- && $new_HEAD eq $HEAD} {
+ && $newType eq {normal}
+ && $newHEAD eq $HEAD} {
} else {
- set HEAD $new_HEAD
- set PARENT $new_HEAD
- set commit_type $new_type
+ set HEAD $newHEAD
+ set PARENT $newHEAD
+ set MERGE_HEAD $newMERGE_HEAD
+ set commit_type $newType
}
array unset file_states
} elseif {[load_message MERGE_MSG]} {
} elseif {[load_message SQUASH_MSG]} {
}
- $ui_comm edit modified false
$ui_comm edit reset
+ $ui_comm edit modified false
}
if {$repo_config(gui.trustmtime) eq {true}} {
proc show_diff {path {w {}} {lno {}}} {
global file_states file_lists
- global diff_3way diff_active repo_config
+ global is_3way_diff diff_active repo_config
global ui_diff current_diff ui_status_value
if {$diff_active || ![lock_index read]} return
set s $file_states($path)
set m [lindex $s 0]
- set diff_3way 0
+ set is_3way_diff 0
set diff_active 1
set current_diff $path
set ui_status_value "Loading diff of [escape_path $path]..."
}
proc read_diff {fd} {
- global ui_diff ui_status_value diff_3way diff_active
+ global ui_diff ui_status_value is_3way_diff diff_active
global repo_config
+ $ui_diff conf -state normal
while {[gets $fd line] >= 0} {
- if {[string match {diff --git *} $line]} continue
+ # -- Cleanup uninteresting diff header lines.
+ #
+ if {[string match {diff --git *} $line]} continue
if {[string match {diff --combined *} $line]} continue
- if {[string match {--- *} $line]} continue
- if {[string match {+++ *} $line]} continue
+ if {[string match {--- *} $line]} continue
+ if {[string match {+++ *} $line]} continue
if {$line eq {deleted file mode 120000}} {
set line "deleted symlink"
}
- if {[string match index* $line]} {
- if {[string first , $line] >= 0} {
- set diff_3way 1
- }
- }
- $ui_diff conf -state normal
- if {!$diff_3way} {
- set x [string index $line 0]
- switch -- $x {
- "@" {set tags da}
- "+" {set tags dp}
- "-" {set tags dm}
+ # -- Automatically detect if this is a 3 way diff.
+ #
+ if {[string match {@@@ *} $line]} {set is_3way_diff 1}
+
+ # -- Reformat a 3 way diff, 'cause its too weird.
+ #
+ if {$is_3way_diff} {
+ set op [string range $line 0 1]
+ switch -- $op {
+ {@@} {set tags d_@}
+ {++} {set tags d_+ ; set op { +}}
+ {--} {set tags d_- ; set op { -}}
+ { +} {set tags d_++; set op {++}}
+ { -} {set tags d_--; set op {--}}
+ {+ } {set tags d_-+; set op {-+}}
+ {- } {set tags d_+-; set op {+-}}
default {set tags {}}
}
+ set line [string replace $line 0 1 $op]
} else {
- set x [string range $line 0 1]
- switch -- $x {
- default {set tags {}}
- "@@" {set tags da}
- "++" {set tags dp; set x " +"}
- " +" {set tags {di bold}; set x "++"}
- "+ " {set tags dni; set x "-+"}
- "--" {set tags dm; set x " -"}
- " -" {set tags {dm bold}; set x "--"}
- "- " {set tags di; set x "+-"}
+ switch -- [string index $line 0] {
+ @ {set tags d_@}
+ + {set tags d_+}
+ - {set tags d_-}
default {set tags {}}
}
- set line [string replace $line 0 1 $x]
}
$ui_diff insert end $line $tags
- $ui_diff insert end "\n"
- $ui_diff conf -state disabled
+ $ui_diff insert end "\n" $tags
}
+ $ui_diff conf -state disabled
if {[eof $fd]} {
close $fd
## commit
proc load_last_commit {} {
- global HEAD PARENT commit_type ui_comm
+ global HEAD PARENT MERGE_HEAD commit_type ui_comm
- if {[string match amend* $commit_type]} return
- if {$commit_type ne {normal}} {
- error_popup "Can't amend a $commit_type commit."
+ if {[llength $PARENT] == 0} {
+ error_popup {There is nothing to amend.
+
+You are about to create the initial commit.
+There is no commit before this to amend.
+}
+ return
+ }
+
+ repository_state curType curHEAD curMERGE_HEAD
+ if {$curType eq {merge}} {
+ error_popup {Cannot amend while merging.
+
+You are currently in the middle of a merge that
+has not been fully completed. You cannot amend
+the prior commit unless you first abort the
+current merge activity.
+}
return
}
set msg {}
- set parent {}
- set parent_count 0
+ set parents [list]
if {[catch {
- set fd [open "| git cat-file commit $HEAD" r]
+ set fd [open "| git cat-file commit $curHEAD" r]
while {[gets $fd line] > 0} {
if {[string match {parent *} $line]} {
- set parent [string range $line 7 end]
- incr parent_count
+ lappend parents [string range $line 7 end]
}
}
set msg [string trim [read $fd]]
return
}
- if {$parent_count > 1} {
- error_popup {Can't amend a merge commit.}
- return
- }
-
- if {$parent_count == 0} {
- set commit_type amend-initial
- set PARENT {}
- } elseif {$parent_count == 1} {
- set commit_type amend
- set PARENT $parent
+ set HEAD $curHEAD
+ set PARENT $parents
+ set MERGE_HEAD [list]
+ switch -- [llength $parents] {
+ 0 {set commit_type amend-initial}
+ 1 {set commit_type amend}
+ default {set commit_type amend-merge}
}
$ui_comm delete 0.0 end
$ui_comm insert end $msg
- $ui_comm edit modified false
$ui_comm edit reset
+ $ui_comm edit modified false
rescan {set ui_status_value {Ready.}}
}
set commit_type normal
$ui_comm delete 0.0 end
- $ui_comm edit modified false
$ui_comm edit reset
+ $ui_comm edit modified false
rescan {set ui_status_value {Ready.}}
}
# -- Our in memory state should match the repository.
#
- repository_state curHEAD cur_type
+ repository_state curType curHEAD curMERGE_HEAD
if {[string match amend* $commit_type]
- && $cur_type eq {normal}
+ && $curType eq {normal}
&& $curHEAD eq $HEAD} {
- } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
+ } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
info_popup {Last scanned state does not match repository state.
Another Git program has modified this repository
}
proc commit_committree {fd_wt curHEAD msg} {
- global single_commit gitdir HEAD PARENT commit_type tcl_platform
+ global HEAD PARENT MERGE_HEAD commit_type
+ global single_commit gitdir tcl_platform
global ui_status_value ui_comm selected_commit_type
- global file_states selected_paths
+ global file_states selected_paths rescan_active
gets $fd_wt tree_id
if {$tree_id eq {} || [catch {close $fd_wt} err]} {
# -- Create the commit.
#
set cmd [list git commit-tree $tree_id]
- if {$PARENT ne {}} {
- lappend cmd -p $PARENT
- }
- if {$commit_type eq {merge}} {
- if {[catch {
- set fd_mh [open [file join $gitdir MERGE_HEAD] r]
- while {[gets $fd_mh merge_head] >= 0} {
- lappend cmd -p $merge_head
- }
- close $fd_mh
- } err]} {
- error_popup "Loading MERGE_HEAD failed:\n\n$err"
- set ui_status_value {Commit failed.}
- unlock_index
- return
+ set parents [concat $PARENT $MERGE_HEAD]
+ if {[llength $parents] > 0} {
+ foreach p $parents {
+ lappend cmd -p $p
}
- }
- if {$PARENT eq {}} {
+ } else {
# git commit-tree writes to stderr during initial commit.
lappend cmd 2>/dev/null
}
}
$ui_comm delete 0.0 end
- $ui_comm edit modified false
$ui_comm edit reset
+ $ui_comm edit modified false
if {$single_commit} do_quit
- # -- Update status without invoking any git commands.
+ # -- Update in memory status
#
- set commit_type normal
set selected_commit_type new
+ set commit_type normal
set HEAD $cmt_id
set PARENT $cmt_id
+ set MERGE_HEAD [list]
foreach path [array names file_states] {
set s $file_states($path)
set m [lindex $s 0]
switch -glob -- $m {
- DD -
- AO {set m __}
- A? -
- M? -
- D? {set m _[string index $m 1]}
- }
-
- if {$m eq {__}} {
+ _O -
+ _M -
+ _D {continue}
+ __ -
+ A_ -
+ M_ -
+ DD {
unset file_states($path)
catch {unset selected_paths($path)}
- } else {
- lset file_states($path) 0 $m
+ }
+ DO {
+ set file_states($path) [list _O [lindex $s 1] {} {}]
+ }
+ AM -
+ AD -
+ MM -
+ DM {
+ set file_states($path) [list \
+ _[string index $m 1] \
+ [lindex $s 1] \
+ [lindex $s 3] \
+ {}]
+ }
}
}
# -- Our in memory state should match the repository.
#
- repository_state curHEAD cur_type
- if {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
+ repository_state curType curHEAD curMERGE_HEAD
+ if {$commit_type ne $curType || $HEAD ne $curHEAD} {
error_popup {Last scanned state does not match repository state.
Its highly likely that another Git program modified the
}
proc post_pull_remote {remote branch success} {
- global HEAD PARENT commit_type selected_commit_type
+ global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
global ui_status_value
unlock_index
if {$success} {
- repository_state HEAD commit_type
+ repository_state commit_type HEAD MERGE_HEAD
set PARENT $HEAD
set selected_commit_type new
- set $ui_status_value "Pulling $branch from $remote complete."
+ set ui_status_value "Pulling $branch from $remote complete."
} else {
- set m "Conflicts detected while pulling $branch from $remote."
- rescan "set ui_status_value {$m}"
+ rescan [list set ui_status_value \
+ "Conflicts detected while pulling $branch from $remote."]
}
}
{AD o question "Added (but now gone)"}
{_D i question "Missing"}
- {D_ i removed "Removed by commit"}
{DD i removed "Removed by commit"}
{DO i removed "Removed (still exists)"}
+ {DM i removed "Removed (but modified)"}
+ {UD i merge "Merge conflicts"}
{UM i merge "Merge conflicts"}
{U_ i merge "Merge conflicts"}
} {
}
proc do_repack {} {
- set w [new_console "repack" "Repacking the object database"]
+ set w [new_console {repack} \
+ {Repacking the object database}]
set cmd [list git repack]
lappend cmd -a
lappend cmd -d
console_exec $w $cmd
}
+proc do_fsck_objects {} {
+ set w [new_console {fsck-objects} \
+ {Verifying the object database with fsck-objects}]
+ set cmd [list git fsck-objects]
+ lappend cmd --full
+ lappend cmd --cache
+ lappend cmd --strict
+ console_exec $w $cmd
+}
+
set is_quitting 0
proc do_quit {} {
- global gitdir ui_comm is_quitting repo_config
+ global gitdir ui_comm is_quitting repo_config commit_type
if {$is_quitting} return
set is_quitting 1
#
set save [file join $gitdir GITGUI_MSG]
set msg [string trim [$ui_comm get 0.0 end]]
- if {[$ui_comm edit modified] && $msg ne {}} {
+ if {![string match amend* $commit_type]
+ && [$ui_comm edit modified]
+ && $msg ne {}} {
catch {
set fd [open $save w]
puts $fd [string trim [$ui_comm get 0.0 end]]
close $fd
}
- } elseif {$msg eq {} && [file exists $save]} {
- file delete $save
+ } else {
+ catch {file delete $save}
}
# -- Stash our current window geometry into this repository.
set pathList [list]
set after {}
foreach path $paths {
- switch -- [lindex $file_states($path) 0] {
+ switch -glob -- [lindex $file_states($path) 0] {
AM -
AD -
MM -
- UM -
- U_ -
+ U? -
_M -
_D -
_O {
}
switch -glob -- [lindex $file_states($path) 0] {
A_ -
- AO -
M_ -
DD -
- D_ {
+ DO -
+ DM {
update_indexinfo \
"Removing [short_path $path] from commit" \
[list $path] \
# -- Menu Bar
#
menu .mbar -tearoff 0
-.mbar add cascade -label Project -menu .mbar.project
+.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
.mbar add cascade -label Commit -menu .mbar.commit
if {!$single_commit} {
}
. configure -menu .mbar
-# -- Project Menu
+# -- Repository Menu
#
-menu .mbar.project
-.mbar.project add command -label Visualize \
+menu .mbar.repository
+.mbar.repository add command -label Visualize \
-command do_gitk \
-font font_ui
if {!$single_commit} {
- .mbar.project add command -label {Repack Database} \
+ .mbar.repository add separator
+
+ .mbar.repository add command -label {Repack Database} \
-command do_repack \
-font font_ui
+ .mbar.repository add command -label {Verify Database} \
+ -command do_fsck_objects \
+ -font font_ui
+
+ .mbar.repository add separator
+
if {$tcl_platform(platform) eq {windows}} {
- .mbar.project add command \
+ .mbar.repository add command \
-label {Create Desktop Icon} \
-command do_windows_shortcut \
-font font_ui
} elseif {[is_MacOSX]} {
- .mbar.project add command \
+ .mbar.repository add command \
-label {Create Desktop Icon} \
-command do_macosx_app \
-font font_ui
}
}
-.mbar.project add command -label Quit \
+.mbar.repository add command -label Quit \
-command do_quit \
-accelerator $M1T-Q \
-font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Include All} \
+.mbar.commit add command -label {Include All In Commit} \
-command do_include_all \
-accelerator $M1T-I \
-font font_ui
initial {set txt {Initial Commit Message:}}
amend {set txt {Amended Commit Message:}}
amend-initial {set txt {Amended Initial Commit Message:}}
+ amend-merge {set txt {Amended Merge Commit Message:}}
merge {set txt {Merge Commit Message:}}
* {set txt {Commit Message:}}
}
pack .vpane.lower.diff.header -side top -fill x
pack .vpane.lower.diff.body -side bottom -fill both -expand 1
-$ui_diff tag conf dm -foreground red
-$ui_diff tag conf dp -foreground blue
-$ui_diff tag conf di -foreground {#00a000}
-$ui_diff tag conf dni -foreground {#a000a0}
-$ui_diff tag conf da -font font_diffbold
-$ui_diff tag conf bold -font font_diffbold
+$ui_diff tag conf d_@ -font font_diffbold
+$ui_diff tag conf d_+ -foreground blue
+$ui_diff tag conf d_- -foreground red
+$ui_diff tag conf d_++ -foreground {#00a000}
+$ui_diff tag conf d_-- -foreground {#a000a0}
+$ui_diff tag conf d_+- \
+ -foreground red \
+ -background {light goldenrod yellow}
+$ui_diff tag conf d_-+ \
+ -foreground blue \
+ -background azure2
# -- Diff Body Context Menu
#
set HEAD {}
set PARENT {}
+set MERGE_HEAD [list]
set commit_type {}
set empty_tree {}
set current_diff {}