git-guion commit git-gui: Automatically skip tracking branches in branch menu. (359ca42)
   1#!/bin/sh
   2# Tcl ignores the next line -*- tcl -*- \
   3exec wish "$0" -- "$@"
   4
   5set copyright {
   6Copyright © 2006 Shawn Pearce, Paul Mackerras.
   7
   8All rights reserved.
   9
  10This program is free software; it may be used, copied, modified
  11and distributed under the terms of the GNU General Public Licence,
  12either version 2, or (at your option) any later version.}
  13
  14set appname [lindex [file split $argv0] end]
  15set gitdir {}
  16
  17######################################################################
  18##
  19## config
  20
  21proc is_many_config {name} {
  22        switch -glob -- $name {
  23        remote.*.fetch -
  24        remote.*.push
  25                {return 1}
  26        *
  27                {return 0}
  28        }
  29}
  30
  31proc load_config {include_global} {
  32        global repo_config global_config default_config
  33
  34        array unset global_config
  35        if {$include_global} {
  36                catch {
  37                        set fd_rc [open "| git repo-config --global --list" r]
  38                        while {[gets $fd_rc line] >= 0} {
  39                                if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
  40                                        if {[is_many_config $name]} {
  41                                                lappend global_config($name) $value
  42                                        } else {
  43                                                set global_config($name) $value
  44                                        }
  45                                }
  46                        }
  47                        close $fd_rc
  48                }
  49        }
  50
  51        array unset repo_config
  52        catch {
  53                set fd_rc [open "| git repo-config --list" r]
  54                while {[gets $fd_rc line] >= 0} {
  55                        if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
  56                                if {[is_many_config $name]} {
  57                                        lappend repo_config($name) $value
  58                                } else {
  59                                        set repo_config($name) $value
  60                                }
  61                        }
  62                }
  63                close $fd_rc
  64        }
  65
  66        foreach name [array names default_config] {
  67                if {[catch {set v $global_config($name)}]} {
  68                        set global_config($name) $default_config($name)
  69                }
  70                if {[catch {set v $repo_config($name)}]} {
  71                        set repo_config($name) $default_config($name)
  72                }
  73        }
  74}
  75
  76proc save_config {} {
  77        global default_config font_descs
  78        global repo_config global_config
  79        global repo_config_new global_config_new
  80
  81        foreach option $font_descs {
  82                set name [lindex $option 0]
  83                set font [lindex $option 1]
  84                font configure $font \
  85                        -family $global_config_new(gui.$font^^family) \
  86                        -size $global_config_new(gui.$font^^size)
  87                font configure ${font}bold \
  88                        -family $global_config_new(gui.$font^^family) \
  89                        -size $global_config_new(gui.$font^^size)
  90                set global_config_new(gui.$name) [font configure $font]
  91                unset global_config_new(gui.$font^^family)
  92                unset global_config_new(gui.$font^^size)
  93        }
  94
  95        foreach name [array names default_config] {
  96                set value $global_config_new($name)
  97                if {$value ne $global_config($name)} {
  98                        if {$value eq $default_config($name)} {
  99                                catch {exec git repo-config --global --unset $name}
 100                        } else {
 101                                regsub -all "\[{}\]" $value {"} value
 102                                exec git repo-config --global $name $value
 103                        }
 104                        set global_config($name) $value
 105                        if {$value eq $repo_config($name)} {
 106                                catch {exec git repo-config --unset $name}
 107                                set repo_config($name) $value
 108                        }
 109                }
 110        }
 111
 112        foreach name [array names default_config] {
 113                set value $repo_config_new($name)
 114                if {$value ne $repo_config($name)} {
 115                        if {$value eq $global_config($name)} {
 116                                catch {exec git repo-config --unset $name}
 117                        } else {
 118                                regsub -all "\[{}\]" $value {"} value
 119                                exec git repo-config $name $value
 120                        }
 121                        set repo_config($name) $value
 122                }
 123        }
 124}
 125
 126proc error_popup {msg} {
 127        global gitdir appname
 128
 129        set title $appname
 130        if {$gitdir ne {}} {
 131                append title { (}
 132                append title [lindex \
 133                        [file split [file normalize [file dirname $gitdir]]] \
 134                        end]
 135                append title {)}
 136        }
 137        set cmd [list tk_messageBox \
 138                -icon error \
 139                -type ok \
 140                -title "$title: error" \
 141                -message $msg]
 142        if {[winfo ismapped .]} {
 143                lappend cmd -parent .
 144        }
 145        eval $cmd
 146}
 147
 148proc warn_popup {msg} {
 149        global gitdir appname
 150
 151        set title $appname
 152        if {$gitdir ne {}} {
 153                append title { (}
 154                append title [lindex \
 155                        [file split [file normalize [file dirname $gitdir]]] \
 156                        end]
 157                append title {)}
 158        }
 159        set cmd [list tk_messageBox \
 160                -icon warning \
 161                -type ok \
 162                -title "$title: warning" \
 163                -message $msg]
 164        if {[winfo ismapped .]} {
 165                lappend cmd -parent .
 166        }
 167        eval $cmd
 168}
 169
 170proc info_popup {msg} {
 171        global gitdir appname
 172
 173        set title $appname
 174        if {$gitdir ne {}} {
 175                append title { (}
 176                append title [lindex \
 177                        [file split [file normalize [file dirname $gitdir]]] \
 178                        end]
 179                append title {)}
 180        }
 181        tk_messageBox \
 182                -parent . \
 183                -icon info \
 184                -type ok \
 185                -title $title \
 186                -message $msg
 187}
 188
 189######################################################################
 190##
 191## repository setup
 192
 193if {   [catch {set gitdir $env(GIT_DIR)}]
 194        && [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
 195        catch {wm withdraw .}
 196        error_popup "Cannot find the git directory:\n\n$err"
 197        exit 1
 198}
 199if {![file isdirectory $gitdir]} {
 200        catch {wm withdraw .}
 201        error_popup "Git directory not found:\n\n$gitdir"
 202        exit 1
 203}
 204if {[lindex [file split $gitdir] end] ne {.git}} {
 205        catch {wm withdraw .}
 206        error_popup "Cannot use funny .git directory:\n\n$gitdir"
 207        exit 1
 208}
 209if {[catch {cd [file dirname $gitdir]} err]} {
 210        catch {wm withdraw .}
 211        error_popup "No working directory [file dirname $gitdir]:\n\n$err"
 212        exit 1
 213}
 214
 215set single_commit 0
 216if {$appname eq {git-citool}} {
 217        set single_commit 1
 218}
 219
 220######################################################################
 221##
 222## task management
 223
 224set rescan_active 0
 225set diff_active 0
 226set last_clicked {}
 227
 228set disable_on_lock [list]
 229set index_lock_type none
 230
 231proc lock_index {type} {
 232        global index_lock_type disable_on_lock
 233
 234        if {$index_lock_type eq {none}} {
 235                set index_lock_type $type
 236                foreach w $disable_on_lock {
 237                        uplevel #0 $w disabled
 238                }
 239                return 1
 240        } elseif {$index_lock_type eq "begin-$type"} {
 241                set index_lock_type $type
 242                return 1
 243        }
 244        return 0
 245}
 246
 247proc unlock_index {} {
 248        global index_lock_type disable_on_lock
 249
 250        set index_lock_type none
 251        foreach w $disable_on_lock {
 252                uplevel #0 $w normal
 253        }
 254}
 255
 256######################################################################
 257##
 258## status
 259
 260proc repository_state {ctvar hdvar mhvar} {
 261        global gitdir current_branch
 262        upvar $ctvar ct $hdvar hd $mhvar mh
 263
 264        set mh [list]
 265
 266        if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
 267                set current_branch {}
 268        } else {
 269                regsub ^refs/((heads|tags|remotes)/)? \
 270                        $current_branch \
 271                        {} \
 272                        current_branch
 273        }
 274
 275        if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
 276                set hd {}
 277                set ct initial
 278                return
 279        }
 280
 281        set merge_head [file join $gitdir MERGE_HEAD]
 282        if {[file exists $merge_head]} {
 283                set ct merge
 284                set fd_mh [open $merge_head r]
 285                while {[gets $fd_mh line] >= 0} {
 286                        lappend mh $line
 287                }
 288                close $fd_mh
 289                return
 290        }
 291
 292        set ct normal
 293}
 294
 295proc PARENT {} {
 296        global PARENT empty_tree
 297
 298        set p [lindex $PARENT 0]
 299        if {$p ne {}} {
 300                return $p
 301        }
 302        if {$empty_tree eq {}} {
 303                set empty_tree [exec git mktree << {}]
 304        }
 305        return $empty_tree
 306}
 307
 308proc rescan {after} {
 309        global HEAD PARENT MERGE_HEAD commit_type
 310        global ui_index ui_other ui_status_value ui_comm
 311        global rescan_active file_states
 312        global repo_config
 313
 314        if {$rescan_active > 0 || ![lock_index read]} return
 315
 316        repository_state newType newHEAD newMERGE_HEAD
 317        if {[string match amend* $commit_type]
 318                && $newType eq {normal}
 319                && $newHEAD eq $HEAD} {
 320        } else {
 321                set HEAD $newHEAD
 322                set PARENT $newHEAD
 323                set MERGE_HEAD $newMERGE_HEAD
 324                set commit_type $newType
 325        }
 326
 327        array unset file_states
 328
 329        if {![$ui_comm edit modified]
 330                || [string trim [$ui_comm get 0.0 end]] eq {}} {
 331                if {[load_message GITGUI_MSG]} {
 332                } elseif {[load_message MERGE_MSG]} {
 333                } elseif {[load_message SQUASH_MSG]} {
 334                }
 335                $ui_comm edit reset
 336                $ui_comm edit modified false
 337        }
 338
 339        if {$repo_config(gui.trustmtime) eq {true}} {
 340                rescan_stage2 {} $after
 341        } else {
 342                set rescan_active 1
 343                set ui_status_value {Refreshing file status...}
 344                set cmd [list git update-index]
 345                lappend cmd -q
 346                lappend cmd --unmerged
 347                lappend cmd --ignore-missing
 348                lappend cmd --refresh
 349                set fd_rf [open "| $cmd" r]
 350                fconfigure $fd_rf -blocking 0 -translation binary
 351                fileevent $fd_rf readable \
 352                        [list rescan_stage2 $fd_rf $after]
 353        }
 354}
 355
 356proc rescan_stage2 {fd after} {
 357        global gitdir ui_status_value
 358        global rescan_active buf_rdi buf_rdf buf_rlo
 359
 360        if {$fd ne {}} {
 361                read $fd
 362                if {![eof $fd]} return
 363                close $fd
 364        }
 365
 366        set ls_others [list | git ls-files --others -z \
 367                --exclude-per-directory=.gitignore]
 368        set info_exclude [file join $gitdir info exclude]
 369        if {[file readable $info_exclude]} {
 370                lappend ls_others "--exclude-from=$info_exclude"
 371        }
 372
 373        set buf_rdi {}
 374        set buf_rdf {}
 375        set buf_rlo {}
 376
 377        set rescan_active 3
 378        set ui_status_value {Scanning for modified files ...}
 379        set fd_di [open "| git diff-index --cached -z [PARENT]" r]
 380        set fd_df [open "| git diff-files -z" r]
 381        set fd_lo [open $ls_others r]
 382
 383        fconfigure $fd_di -blocking 0 -translation binary
 384        fconfigure $fd_df -blocking 0 -translation binary
 385        fconfigure $fd_lo -blocking 0 -translation binary
 386        fileevent $fd_di readable [list read_diff_index $fd_di $after]
 387        fileevent $fd_df readable [list read_diff_files $fd_df $after]
 388        fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
 389}
 390
 391proc load_message {file} {
 392        global gitdir ui_comm
 393
 394        set f [file join $gitdir $file]
 395        if {[file isfile $f]} {
 396                if {[catch {set fd [open $f r]}]} {
 397                        return 0
 398                }
 399                set content [string trim [read $fd]]
 400                close $fd
 401                $ui_comm delete 0.0 end
 402                $ui_comm insert end $content
 403                return 1
 404        }
 405        return 0
 406}
 407
 408proc read_diff_index {fd after} {
 409        global buf_rdi
 410
 411        append buf_rdi [read $fd]
 412        set c 0
 413        set n [string length $buf_rdi]
 414        while {$c < $n} {
 415                set z1 [string first "\0" $buf_rdi $c]
 416                if {$z1 == -1} break
 417                incr z1
 418                set z2 [string first "\0" $buf_rdi $z1]
 419                if {$z2 == -1} break
 420
 421                incr c
 422                set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
 423                merge_state \
 424                        [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
 425                        [lindex $i 4]? \
 426                        [list [lindex $i 0] [lindex $i 2]] \
 427                        [list]
 428                set c $z2
 429                incr c
 430        }
 431        if {$c < $n} {
 432                set buf_rdi [string range $buf_rdi $c end]
 433        } else {
 434                set buf_rdi {}
 435        }
 436
 437        rescan_done $fd buf_rdi $after
 438}
 439
 440proc read_diff_files {fd after} {
 441        global buf_rdf
 442
 443        append buf_rdf [read $fd]
 444        set c 0
 445        set n [string length $buf_rdf]
 446        while {$c < $n} {
 447                set z1 [string first "\0" $buf_rdf $c]
 448                if {$z1 == -1} break
 449                incr z1
 450                set z2 [string first "\0" $buf_rdf $z1]
 451                if {$z2 == -1} break
 452
 453                incr c
 454                set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
 455                merge_state \
 456                        [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
 457                        ?[lindex $i 4] \
 458                        [list] \
 459                        [list [lindex $i 0] [lindex $i 2]]
 460                set c $z2
 461                incr c
 462        }
 463        if {$c < $n} {
 464                set buf_rdf [string range $buf_rdf $c end]
 465        } else {
 466                set buf_rdf {}
 467        }
 468
 469        rescan_done $fd buf_rdf $after
 470}
 471
 472proc read_ls_others {fd after} {
 473        global buf_rlo
 474
 475        append buf_rlo [read $fd]
 476        set pck [split $buf_rlo "\0"]
 477        set buf_rlo [lindex $pck end]
 478        foreach p [lrange $pck 0 end-1] {
 479                merge_state $p ?O
 480        }
 481        rescan_done $fd buf_rlo $after
 482}
 483
 484proc rescan_done {fd buf after} {
 485        global rescan_active
 486        global file_states repo_config
 487        upvar $buf to_clear
 488
 489        if {![eof $fd]} return
 490        set to_clear {}
 491        close $fd
 492        if {[incr rescan_active -1] > 0} return
 493
 494        prune_selection
 495        unlock_index
 496        display_all_files
 497
 498        if {$repo_config(gui.partialinclude) ne {true}} {
 499                set pathList [list]
 500                foreach path [array names file_states] {
 501                        switch -- [lindex $file_states($path) 0] {
 502                        AM -
 503                        MM {lappend pathList $path}
 504                        }
 505                }
 506                if {$pathList ne {}} {
 507                        update_index \
 508                                "Updating included files" \
 509                                $pathList \
 510                                [concat {reshow_diff;} $after]
 511                        return
 512                }
 513        }
 514
 515        reshow_diff
 516        uplevel #0 $after
 517}
 518
 519proc prune_selection {} {
 520        global file_states selected_paths
 521
 522        foreach path [array names selected_paths] {
 523                if {[catch {set still_here $file_states($path)}]} {
 524                        unset selected_paths($path)
 525                }
 526        }
 527}
 528
 529######################################################################
 530##
 531## diff
 532
 533proc clear_diff {} {
 534        global ui_diff current_diff ui_index ui_other
 535
 536        $ui_diff conf -state normal
 537        $ui_diff delete 0.0 end
 538        $ui_diff conf -state disabled
 539
 540        set current_diff {}
 541
 542        $ui_index tag remove in_diff 0.0 end
 543        $ui_other tag remove in_diff 0.0 end
 544}
 545
 546proc reshow_diff {} {
 547        global current_diff ui_status_value file_states
 548
 549        if {$current_diff eq {}
 550                || [catch {set s $file_states($current_diff)}]} {
 551                clear_diff
 552        } else {
 553                show_diff $current_diff
 554        }
 555}
 556
 557proc handle_empty_diff {} {
 558        global current_diff file_states file_lists
 559
 560        set path $current_diff
 561        set s $file_states($path)
 562        if {[lindex $s 0] ne {_M}} return
 563
 564        info_popup "No differences detected.
 565
 566[short_path $path] has no changes.
 567
 568The modification date of this file was updated
 569by another application and you currently have
 570the Trust File Modification Timestamps option
 571enabled, so Git did not automatically detect
 572that there are no content differences in this
 573file.
 574
 575This file will now be removed from the modified
 576files list, to prevent possible confusion.
 577"
 578        if {[catch {exec git update-index -- $path} err]} {
 579                error_popup "Failed to refresh index:\n\n$err"
 580        }
 581
 582        clear_diff
 583        set old_w [mapcol [lindex $file_states($path) 0] $path]
 584        set lno [lsearch -sorted $file_lists($old_w) $path]
 585        if {$lno >= 0} {
 586                set file_lists($old_w) \
 587                        [lreplace $file_lists($old_w) $lno $lno]
 588                incr lno
 589                $old_w conf -state normal
 590                $old_w delete $lno.0 [expr {$lno + 1}].0
 591                $old_w conf -state disabled
 592        }
 593}
 594
 595proc show_diff {path {w {}} {lno {}}} {
 596        global file_states file_lists
 597        global is_3way_diff diff_active repo_config
 598        global ui_diff current_diff ui_status_value
 599
 600        if {$diff_active || ![lock_index read]} return
 601
 602        clear_diff
 603        if {$w eq {} || $lno == {}} {
 604                foreach w [array names file_lists] {
 605                        set lno [lsearch -sorted $file_lists($w) $path]
 606                        if {$lno >= 0} {
 607                                incr lno
 608                                break
 609                        }
 610                }
 611        }
 612        if {$w ne {} && $lno >= 1} {
 613                $w tag add in_diff $lno.0 [expr {$lno + 1}].0
 614        }
 615
 616        set s $file_states($path)
 617        set m [lindex $s 0]
 618        set is_3way_diff 0
 619        set diff_active 1
 620        set current_diff $path
 621        set ui_status_value "Loading diff of [escape_path $path]..."
 622
 623        set cmd [list | git diff-index]
 624        lappend cmd --no-color
 625        if {$repo_config(gui.diffcontext) > 0} {
 626                lappend cmd "-U$repo_config(gui.diffcontext)"
 627        }
 628        lappend cmd -p
 629
 630        switch $m {
 631        MM {
 632                lappend cmd -c
 633        }
 634        _O {
 635                if {[catch {
 636                                set fd [open $path r]
 637                                set content [read $fd]
 638                                close $fd
 639                        } err ]} {
 640                        set diff_active 0
 641                        unlock_index
 642                        set ui_status_value "Unable to display [escape_path $path]"
 643                        error_popup "Error loading file:\n\n$err"
 644                        return
 645                }
 646                $ui_diff conf -state normal
 647                $ui_diff insert end $content
 648                $ui_diff conf -state disabled
 649                set diff_active 0
 650                unlock_index
 651                set ui_status_value {Ready.}
 652                return
 653        }
 654        }
 655
 656        lappend cmd [PARENT]
 657        lappend cmd --
 658        lappend cmd $path
 659
 660        if {[catch {set fd [open $cmd r]} err]} {
 661                set diff_active 0
 662                unlock_index
 663                set ui_status_value "Unable to display [escape_path $path]"
 664                error_popup "Error loading diff:\n\n$err"
 665                return
 666        }
 667
 668        fconfigure $fd -blocking 0 -translation auto
 669        fileevent $fd readable [list read_diff $fd]
 670}
 671
 672proc read_diff {fd} {
 673        global ui_diff ui_status_value is_3way_diff diff_active
 674        global repo_config
 675
 676        $ui_diff conf -state normal
 677        while {[gets $fd line] >= 0} {
 678                # -- Cleanup uninteresting diff header lines.
 679                #
 680                if {[string match {diff --git *}      $line]} continue
 681                if {[string match {diff --combined *} $line]} continue
 682                if {[string match {--- *}             $line]} continue
 683                if {[string match {+++ *}             $line]} continue
 684                if {$line eq {deleted file mode 120000}} {
 685                        set line "deleted symlink"
 686                }
 687
 688                # -- Automatically detect if this is a 3 way diff.
 689                #
 690                if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 691
 692                # -- Reformat a 3 way diff, 'cause its too weird.
 693                #
 694                if {$is_3way_diff} {
 695                        set op [string range $line 0 1]
 696                        switch -- $op {
 697                        {@@} {set tags d_@}
 698                        {++} {set tags d_+ ; set op { +}}
 699                        {--} {set tags d_- ; set op { -}}
 700                        { +} {set tags d_++; set op {++}}
 701                        { -} {set tags d_--; set op {--}}
 702                        {+ } {set tags d_-+; set op {-+}}
 703                        {- } {set tags d_+-; set op {+-}}
 704                        default {set tags {}}
 705                        }
 706                        set line [string replace $line 0 1 $op]
 707                } else {
 708                        switch -- [string index $line 0] {
 709                        @ {set tags d_@}
 710                        + {set tags d_+}
 711                        - {set tags d_-}
 712                        default {set tags {}}
 713                        }
 714                }
 715                $ui_diff insert end $line $tags
 716                $ui_diff insert end "\n" $tags
 717        }
 718        $ui_diff conf -state disabled
 719
 720        if {[eof $fd]} {
 721                close $fd
 722                set diff_active 0
 723                unlock_index
 724                set ui_status_value {Ready.}
 725
 726                if {$repo_config(gui.trustmtime) eq {true}
 727                        && [$ui_diff index end] eq {2.0}} {
 728                        handle_empty_diff
 729                }
 730        }
 731}
 732
 733######################################################################
 734##
 735## commit
 736
 737proc load_last_commit {} {
 738        global HEAD PARENT MERGE_HEAD commit_type ui_comm
 739
 740        if {[llength $PARENT] == 0} {
 741                error_popup {There is nothing to amend.
 742
 743You are about to create the initial commit.
 744There is no commit before this to amend.
 745}
 746                return
 747        }
 748
 749        repository_state curType curHEAD curMERGE_HEAD
 750        if {$curType eq {merge}} {
 751                error_popup {Cannot amend while merging.
 752
 753You are currently in the middle of a merge that
 754has not been fully completed.  You cannot amend
 755the prior commit unless you first abort the
 756current merge activity.
 757}
 758                return
 759        }
 760
 761        set msg {}
 762        set parents [list]
 763        if {[catch {
 764                        set fd [open "| git cat-file commit $curHEAD" r]
 765                        while {[gets $fd line] > 0} {
 766                                if {[string match {parent *} $line]} {
 767                                        lappend parents [string range $line 7 end]
 768                                }
 769                        }
 770                        set msg [string trim [read $fd]]
 771                        close $fd
 772                } err]} {
 773                error_popup "Error loading commit data for amend:\n\n$err"
 774                return
 775        }
 776
 777        set HEAD $curHEAD
 778        set PARENT $parents
 779        set MERGE_HEAD [list]
 780        switch -- [llength $parents] {
 781        0       {set commit_type amend-initial}
 782        1       {set commit_type amend}
 783        default {set commit_type amend-merge}
 784        }
 785
 786        $ui_comm delete 0.0 end
 787        $ui_comm insert end $msg
 788        $ui_comm edit reset
 789        $ui_comm edit modified false
 790        rescan {set ui_status_value {Ready.}}
 791}
 792
 793proc create_new_commit {} {
 794        global commit_type ui_comm
 795
 796        set commit_type normal
 797        $ui_comm delete 0.0 end
 798        $ui_comm edit reset
 799        $ui_comm edit modified false
 800        rescan {set ui_status_value {Ready.}}
 801}
 802
 803set GIT_COMMITTER_IDENT {}
 804
 805proc committer_ident {} {
 806        global GIT_COMMITTER_IDENT
 807
 808        if {$GIT_COMMITTER_IDENT eq {}} {
 809                if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
 810                        error_popup "Unable to obtain your identity:\n\n$err"
 811                        return {}
 812                }
 813                if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
 814                        $me me GIT_COMMITTER_IDENT]} {
 815                        error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
 816                        return {}
 817                }
 818        }
 819
 820        return $GIT_COMMITTER_IDENT
 821}
 822
 823proc commit_tree {} {
 824        global HEAD commit_type file_states ui_comm repo_config
 825
 826        if {![lock_index update]} return
 827        if {[committer_ident] eq {}} return
 828
 829        # -- Our in memory state should match the repository.
 830        #
 831        repository_state curType curHEAD curMERGE_HEAD
 832        if {[string match amend* $commit_type]
 833                && $curType eq {normal}
 834                && $curHEAD eq $HEAD} {
 835        } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
 836                info_popup {Last scanned state does not match repository state.
 837
 838Another Git program has modified this repository
 839since the last scan.  A rescan must be performed
 840before another commit can be created.
 841
 842The rescan will be automatically started now.
 843}
 844                unlock_index
 845                rescan {set ui_status_value {Ready.}}
 846                return
 847        }
 848
 849        # -- At least one file should differ in the index.
 850        #
 851        set files_ready 0
 852        foreach path [array names file_states] {
 853                switch -glob -- [lindex $file_states($path) 0] {
 854                _? {continue}
 855                A? -
 856                D? -
 857                M? {set files_ready 1; break}
 858                U? {
 859                        error_popup "Unmerged files cannot be committed.
 860
 861File [short_path $path] has merge conflicts.
 862You must resolve them and include the file before committing.
 863"
 864                        unlock_index
 865                        return
 866                }
 867                default {
 868                        error_popup "Unknown file state [lindex $s 0] detected.
 869
 870File [short_path $path] cannot be committed by this program.
 871"
 872                }
 873                }
 874        }
 875        if {!$files_ready} {
 876                error_popup {No included files to commit.
 877
 878You must include at least 1 file before you can commit.
 879}
 880                unlock_index
 881                return
 882        }
 883
 884        # -- A message is required.
 885        #
 886        set msg [string trim [$ui_comm get 1.0 end]]
 887        if {$msg eq {}} {
 888                error_popup {Please supply a commit message.
 889
 890A good commit message has the following format:
 891
 892- First line: Describe in one sentance what you did.
 893- Second line: Blank
 894- Remaining lines: Describe why this change is good.
 895}
 896                unlock_index
 897                return
 898        }
 899
 900        # -- Update included files if partialincludes are off.
 901        #
 902        if {$repo_config(gui.partialinclude) ne {true}} {
 903                set pathList [list]
 904                foreach path [array names file_states] {
 905                        switch -glob -- [lindex $file_states($path) 0] {
 906                        A? -
 907                        M? {lappend pathList $path}
 908                        }
 909                }
 910                if {$pathList ne {}} {
 911                        unlock_index
 912                        update_index \
 913                                "Updating included files" \
 914                                $pathList \
 915                                [concat {lock_index update;} \
 916                                        [list commit_prehook $curHEAD $msg]]
 917                        return
 918                }
 919        }
 920
 921        commit_prehook $curHEAD $msg
 922}
 923
 924proc commit_prehook {curHEAD msg} {
 925        global gitdir ui_status_value pch_error
 926
 927        set pchook [file join $gitdir hooks pre-commit]
 928
 929        # On Cygwin [file executable] might lie so we need to ask
 930        # the shell if the hook is executable.  Yes that's annoying.
 931        #
 932        if {[is_Windows] && [file isfile $pchook]} {
 933                set pchook [list sh -c [concat \
 934                        "if test -x \"$pchook\";" \
 935                        "then exec \"$pchook\" 2>&1;" \
 936                        "fi"]]
 937        } elseif {[file executable $pchook]} {
 938                set pchook [list $pchook |& cat]
 939        } else {
 940                commit_writetree $curHEAD $msg
 941                return
 942        }
 943
 944        set ui_status_value {Calling pre-commit hook...}
 945        set pch_error {}
 946        set fd_ph [open "| $pchook" r]
 947        fconfigure $fd_ph -blocking 0 -translation binary
 948        fileevent $fd_ph readable \
 949                [list commit_prehook_wait $fd_ph $curHEAD $msg]
 950}
 951
 952proc commit_prehook_wait {fd_ph curHEAD msg} {
 953        global pch_error ui_status_value
 954
 955        append pch_error [read $fd_ph]
 956        fconfigure $fd_ph -blocking 1
 957        if {[eof $fd_ph]} {
 958                if {[catch {close $fd_ph}]} {
 959                        set ui_status_value {Commit declined by pre-commit hook.}
 960                        hook_failed_popup pre-commit $pch_error
 961                        unlock_index
 962                } else {
 963                        commit_writetree $curHEAD $msg
 964                }
 965                set pch_error {}
 966                return
 967        }
 968        fconfigure $fd_ph -blocking 0
 969}
 970
 971proc commit_writetree {curHEAD msg} {
 972        global ui_status_value
 973
 974        set ui_status_value {Committing changes...}
 975        set fd_wt [open "| git write-tree" r]
 976        fileevent $fd_wt readable \
 977                [list commit_committree $fd_wt $curHEAD $msg]
 978}
 979
 980proc commit_committree {fd_wt curHEAD msg} {
 981        global HEAD PARENT MERGE_HEAD commit_type
 982        global single_commit gitdir
 983        global ui_status_value ui_comm selected_commit_type
 984        global file_states selected_paths rescan_active
 985
 986        gets $fd_wt tree_id
 987        if {$tree_id eq {} || [catch {close $fd_wt} err]} {
 988                error_popup "write-tree failed:\n\n$err"
 989                set ui_status_value {Commit failed.}
 990                unlock_index
 991                return
 992        }
 993
 994        # -- Create the commit.
 995        #
 996        set cmd [list git commit-tree $tree_id]
 997        set parents [concat $PARENT $MERGE_HEAD]
 998        if {[llength $parents] > 0} {
 999                foreach p $parents {
1000                        lappend cmd -p $p
1001                }
1002        } else {
1003                # git commit-tree writes to stderr during initial commit.
1004                lappend cmd 2>/dev/null
1005        }
1006        lappend cmd << $msg
1007        if {[catch {set cmt_id [eval exec $cmd]} err]} {
1008                error_popup "commit-tree failed:\n\n$err"
1009                set ui_status_value {Commit failed.}
1010                unlock_index
1011                return
1012        }
1013
1014        # -- Update the HEAD ref.
1015        #
1016        set reflogm commit
1017        if {$commit_type ne {normal}} {
1018                append reflogm " ($commit_type)"
1019        }
1020        set i [string first "\n" $msg]
1021        if {$i >= 0} {
1022                append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1023        } else {
1024                append reflogm {: } $msg
1025        }
1026        set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1027        if {[catch {eval exec $cmd} err]} {
1028                error_popup "update-ref failed:\n\n$err"
1029                set ui_status_value {Commit failed.}
1030                unlock_index
1031                return
1032        }
1033
1034        # -- Cleanup after ourselves.
1035        #
1036        catch {file delete [file join $gitdir MERGE_HEAD]}
1037        catch {file delete [file join $gitdir MERGE_MSG]}
1038        catch {file delete [file join $gitdir SQUASH_MSG]}
1039        catch {file delete [file join $gitdir GITGUI_MSG]}
1040
1041        # -- Let rerere do its thing.
1042        #
1043        if {[file isdirectory [file join $gitdir rr-cache]]} {
1044                catch {exec git rerere}
1045        }
1046
1047        # -- Run the post-commit hook.
1048        #
1049        set pchook [file join $gitdir hooks post-commit]
1050        if {[is_Windows] && [file isfile $pchook]} {
1051                set pchook [list sh -c [concat \
1052                        "if test -x \"$pchook\";" \
1053                        "then exec \"$pchook\";" \
1054                        "fi"]]
1055        } elseif {![file executable $pchook]} {
1056                set pchook {}
1057        }
1058        if {$pchook ne {}} {
1059                catch {exec $pchook &}
1060        }
1061
1062        $ui_comm delete 0.0 end
1063        $ui_comm edit reset
1064        $ui_comm edit modified false
1065
1066        if {$single_commit} do_quit
1067
1068        # -- Update in memory status
1069        #
1070        set selected_commit_type new
1071        set commit_type normal
1072        set HEAD $cmt_id
1073        set PARENT $cmt_id
1074        set MERGE_HEAD [list]
1075
1076        foreach path [array names file_states] {
1077                set s $file_states($path)
1078                set m [lindex $s 0]
1079                switch -glob -- $m {
1080                _O -
1081                _M -
1082                _D {continue}
1083                __ -
1084                A_ -
1085                M_ -
1086                DD {
1087                        unset file_states($path)
1088                        catch {unset selected_paths($path)}
1089                }
1090                DO {
1091                        set file_states($path) [list _O [lindex $s 1] {} {}]
1092                }
1093                AM -
1094                AD -
1095                MM -
1096                MD -
1097                DM {
1098                        set file_states($path) [list \
1099                                _[string index $m 1] \
1100                                [lindex $s 1] \
1101                                [lindex $s 3] \
1102                                {}]
1103                }
1104                }
1105        }
1106
1107        display_all_files
1108        unlock_index
1109        reshow_diff
1110        set ui_status_value \
1111                "Changes committed as [string range $cmt_id 0 7]."
1112}
1113
1114######################################################################
1115##
1116## fetch pull push
1117
1118proc fetch_from {remote} {
1119        set w [new_console "fetch $remote" \
1120                "Fetching new changes from $remote"]
1121        set cmd [list git fetch]
1122        lappend cmd $remote
1123        console_exec $w $cmd
1124}
1125
1126proc pull_remote {remote branch} {
1127        global HEAD commit_type file_states repo_config
1128
1129        if {![lock_index update]} return
1130
1131        # -- Our in memory state should match the repository.
1132        #
1133        repository_state curType curHEAD curMERGE_HEAD
1134        if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1135                info_popup {Last scanned state does not match repository state.
1136
1137Another Git program has modified this repository
1138since the last scan.  A rescan must be performed
1139before a pull operation can be started.
1140
1141The rescan will be automatically started now.
1142}
1143                unlock_index
1144                rescan {set ui_status_value {Ready.}}
1145                return
1146        }
1147
1148        # -- No differences should exist before a pull.
1149        #
1150        if {[array size file_states] != 0} {
1151                error_popup {Uncommitted but modified files are present.
1152
1153You should not perform a pull with unmodified
1154files in your working directory as Git will be
1155unable to recover from an incorrect merge.
1156
1157You should commit or revert all changes before
1158starting a pull operation.
1159}
1160                unlock_index
1161                return
1162        }
1163
1164        set w [new_console "pull $remote $branch" \
1165                "Pulling new changes from branch $branch in $remote"]
1166        set cmd [list git pull]
1167        if {$repo_config(gui.pullsummary) eq {false}} {
1168                lappend cmd --no-summary
1169        }
1170        lappend cmd $remote
1171        lappend cmd $branch
1172        console_exec $w $cmd [list post_pull_remote $remote $branch]
1173}
1174
1175proc post_pull_remote {remote branch success} {
1176        global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1177        global ui_status_value
1178
1179        unlock_index
1180        if {$success} {
1181                repository_state commit_type HEAD MERGE_HEAD
1182                set PARENT $HEAD
1183                set selected_commit_type new
1184                set ui_status_value "Pulling $branch from $remote complete."
1185        } else {
1186                rescan [list set ui_status_value \
1187                        "Conflicts detected while pulling $branch from $remote."]
1188        }
1189}
1190
1191proc push_to {remote} {
1192        set w [new_console "push $remote" \
1193                "Pushing changes to $remote"]
1194        set cmd [list git push]
1195        lappend cmd $remote
1196        console_exec $w $cmd
1197}
1198
1199######################################################################
1200##
1201## ui helpers
1202
1203proc mapcol {state path} {
1204        global all_cols ui_other
1205
1206        if {[catch {set r $all_cols($state)}]} {
1207                puts "error: no column for state={$state} $path"
1208                return $ui_other
1209        }
1210        return $r
1211}
1212
1213proc mapicon {state path} {
1214        global all_icons
1215
1216        if {[catch {set r $all_icons($state)}]} {
1217                puts "error: no icon for state={$state} $path"
1218                return file_plain
1219        }
1220        return $r
1221}
1222
1223proc mapdesc {state path} {
1224        global all_descs
1225
1226        if {[catch {set r $all_descs($state)}]} {
1227                puts "error: no desc for state={$state} $path"
1228                return $state
1229        }
1230        return $r
1231}
1232
1233proc escape_path {path} {
1234        regsub -all "\n" $path "\\n" path
1235        return $path
1236}
1237
1238proc short_path {path} {
1239        return [escape_path [lindex [file split $path] end]]
1240}
1241
1242set next_icon_id 0
1243set null_sha1 [string repeat 0 40]
1244
1245proc merge_state {path new_state {head_info {}} {index_info {}}} {
1246        global file_states next_icon_id null_sha1
1247
1248        set s0 [string index $new_state 0]
1249        set s1 [string index $new_state 1]
1250
1251        if {[catch {set info $file_states($path)}]} {
1252                set state __
1253                set icon n[incr next_icon_id]
1254        } else {
1255                set state [lindex $info 0]
1256                set icon [lindex $info 1]
1257                if {$head_info eq {}}  {set head_info  [lindex $info 2]}
1258                if {$index_info eq {}} {set index_info [lindex $info 3]}
1259        }
1260
1261        if     {$s0 eq {?}} {set s0 [string index $state 0]} \
1262        elseif {$s0 eq {_}} {set s0 _}
1263
1264        if     {$s1 eq {?}} {set s1 [string index $state 1]} \
1265        elseif {$s1 eq {_}} {set s1 _}
1266
1267        if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1268                set head_info [list 0 $null_sha1]
1269        } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1270                && $head_info eq {}} {
1271                set head_info $index_info
1272        }
1273
1274        set file_states($path) [list $s0$s1 $icon \
1275                $head_info $index_info \
1276                ]
1277        return $state
1278}
1279
1280proc display_file {path state} {
1281        global file_states file_lists selected_paths
1282
1283        set old_m [merge_state $path $state]
1284        set s $file_states($path)
1285        set new_m [lindex $s 0]
1286        set new_w [mapcol $new_m $path] 
1287        set old_w [mapcol $old_m $path]
1288        set new_icon [mapicon $new_m $path]
1289
1290        if {$new_m eq {__}} {
1291                set lno [lsearch -sorted $file_lists($old_w) $path]
1292                if {$lno >= 0} {
1293                        set file_lists($old_w) \
1294                                [lreplace $file_lists($old_w) $lno $lno]
1295                        incr lno
1296                        $old_w conf -state normal
1297                        $old_w delete $lno.0 [expr {$lno + 1}].0
1298                        $old_w conf -state disabled
1299                }
1300                unset file_states($path)
1301                catch {unset selected_paths($path)}
1302                return
1303        }
1304
1305        if {$new_w ne $old_w} {
1306                set lno [lsearch -sorted $file_lists($old_w) $path]
1307                if {$lno >= 0} {
1308                        set file_lists($old_w) \
1309                                [lreplace $file_lists($old_w) $lno $lno]
1310                        incr lno
1311                        $old_w conf -state normal
1312                        $old_w delete $lno.0 [expr {$lno + 1}].0
1313                        $old_w conf -state disabled
1314                }
1315
1316                lappend file_lists($new_w) $path
1317                set file_lists($new_w) [lsort $file_lists($new_w)]
1318                set lno [lsearch -sorted $file_lists($new_w) $path]
1319                incr lno
1320                $new_w conf -state normal
1321                $new_w image create $lno.0 \
1322                        -align center -padx 5 -pady 1 \
1323                        -name [lindex $s 1] \
1324                        -image $new_icon
1325                $new_w insert $lno.1 "[escape_path $path]\n"
1326                if {[catch {set in_sel $selected_paths($path)}]} {
1327                        set in_sel 0
1328                }
1329                if {$in_sel} {
1330                        $new_w tag add in_sel $lno.0 [expr {$lno + 1}].0
1331                }
1332                $new_w conf -state disabled
1333        } elseif {$new_icon ne [mapicon $old_m $path]} {
1334                $new_w conf -state normal
1335                $new_w image conf [lindex $s 1] -image $new_icon
1336                $new_w conf -state disabled
1337        }
1338}
1339
1340proc display_all_files {} {
1341        global ui_index ui_other
1342        global file_states file_lists
1343        global last_clicked selected_paths
1344
1345        $ui_index conf -state normal
1346        $ui_other conf -state normal
1347
1348        $ui_index delete 0.0 end
1349        $ui_other delete 0.0 end
1350        set last_clicked {}
1351
1352        set file_lists($ui_index) [list]
1353        set file_lists($ui_other) [list]
1354
1355        foreach path [lsort [array names file_states]] {
1356                set s $file_states($path)
1357                set m [lindex $s 0]
1358                set w [mapcol $m $path]
1359                lappend file_lists($w) $path
1360                set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1361                $w image create end \
1362                        -align center -padx 5 -pady 1 \
1363                        -name [lindex $s 1] \
1364                        -image [mapicon $m $path]
1365                $w insert end "[escape_path $path]\n"
1366                if {[catch {set in_sel $selected_paths($path)}]} {
1367                        set in_sel 0
1368                }
1369                if {$in_sel} {
1370                        $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1371                }
1372        }
1373
1374        $ui_index conf -state disabled
1375        $ui_other conf -state disabled
1376}
1377
1378proc update_indexinfo {msg pathList after} {
1379        global update_index_cp ui_status_value
1380
1381        if {![lock_index update]} return
1382
1383        set update_index_cp 0
1384        set pathList [lsort $pathList]
1385        set totalCnt [llength $pathList]
1386        set batch [expr {int($totalCnt * .01) + 1}]
1387        if {$batch > 25} {set batch 25}
1388
1389        set ui_status_value [format \
1390                "$msg... %i/%i files (%.2f%%)" \
1391                $update_index_cp \
1392                $totalCnt \
1393                0.0]
1394        set fd [open "| git update-index -z --index-info" w]
1395        fconfigure $fd \
1396                -blocking 0 \
1397                -buffering full \
1398                -buffersize 512 \
1399                -translation binary
1400        fileevent $fd writable [list \
1401                write_update_indexinfo \
1402                $fd \
1403                $pathList \
1404                $totalCnt \
1405                $batch \
1406                $msg \
1407                $after \
1408                ]
1409}
1410
1411proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1412        global update_index_cp ui_status_value
1413        global file_states current_diff
1414
1415        if {$update_index_cp >= $totalCnt} {
1416                close $fd
1417                unlock_index
1418                uplevel #0 $after
1419                return
1420        }
1421
1422        for {set i $batch} \
1423                {$update_index_cp < $totalCnt && $i > 0} \
1424                {incr i -1} {
1425                set path [lindex $pathList $update_index_cp]
1426                incr update_index_cp
1427
1428                set s $file_states($path)
1429                switch -glob -- [lindex $s 0] {
1430                A? {set new _O}
1431                M? {set new _M}
1432                D? {set new _?}
1433                ?? {continue}
1434                }
1435                set info [lindex $s 2]
1436                if {$info eq {}} continue
1437
1438                puts -nonewline $fd $info
1439                puts -nonewline $fd "\t"
1440                puts -nonewline $fd $path
1441                puts -nonewline $fd "\0"
1442                display_file $path $new
1443        }
1444
1445        set ui_status_value [format \
1446                "$msg... %i/%i files (%.2f%%)" \
1447                $update_index_cp \
1448                $totalCnt \
1449                [expr {100.0 * $update_index_cp / $totalCnt}]]
1450}
1451
1452proc update_index {msg pathList after} {
1453        global update_index_cp ui_status_value
1454
1455        if {![lock_index update]} return
1456
1457        set update_index_cp 0
1458        set pathList [lsort $pathList]
1459        set totalCnt [llength $pathList]
1460        set batch [expr {int($totalCnt * .01) + 1}]
1461        if {$batch > 25} {set batch 25}
1462
1463        set ui_status_value [format \
1464                "$msg... %i/%i files (%.2f%%)" \
1465                $update_index_cp \
1466                $totalCnt \
1467                0.0]
1468        set fd [open "| git update-index --add --remove -z --stdin" w]
1469        fconfigure $fd \
1470                -blocking 0 \
1471                -buffering full \
1472                -buffersize 512 \
1473                -translation binary
1474        fileevent $fd writable [list \
1475                write_update_index \
1476                $fd \
1477                $pathList \
1478                $totalCnt \
1479                $batch \
1480                $msg \
1481                $after \
1482                ]
1483}
1484
1485proc write_update_index {fd pathList totalCnt batch msg after} {
1486        global update_index_cp ui_status_value
1487        global file_states current_diff
1488
1489        if {$update_index_cp >= $totalCnt} {
1490                close $fd
1491                unlock_index
1492                uplevel #0 $after
1493                return
1494        }
1495
1496        for {set i $batch} \
1497                {$update_index_cp < $totalCnt && $i > 0} \
1498                {incr i -1} {
1499                set path [lindex $pathList $update_index_cp]
1500                incr update_index_cp
1501
1502                switch -glob -- [lindex $file_states($path) 0] {
1503                AD -
1504                MD -
1505                _D {set new DD}
1506
1507                _M -
1508                MM -
1509                M_ {set new M_}
1510
1511                _O -
1512                AM -
1513                A_ {set new A_}
1514
1515                ?? {continue}
1516                }
1517
1518                puts -nonewline $fd $path
1519                puts -nonewline $fd "\0"
1520                display_file $path $new
1521        }
1522
1523        set ui_status_value [format \
1524                "$msg... %i/%i files (%.2f%%)" \
1525                $update_index_cp \
1526                $totalCnt \
1527                [expr {100.0 * $update_index_cp / $totalCnt}]]
1528}
1529
1530proc checkout_index {msg pathList after} {
1531        global update_index_cp ui_status_value
1532
1533        if {![lock_index update]} return
1534
1535        set update_index_cp 0
1536        set pathList [lsort $pathList]
1537        set totalCnt [llength $pathList]
1538        set batch [expr {int($totalCnt * .01) + 1}]
1539        if {$batch > 25} {set batch 25}
1540
1541        set ui_status_value [format \
1542                "$msg... %i/%i files (%.2f%%)" \
1543                $update_index_cp \
1544                $totalCnt \
1545                0.0]
1546        set cmd [list git checkout-index]
1547        lappend cmd --index
1548        lappend cmd --quiet
1549        lappend cmd --force
1550        lappend cmd -z
1551        lappend cmd --stdin
1552        set fd [open "| $cmd " w]
1553        fconfigure $fd \
1554                -blocking 0 \
1555                -buffering full \
1556                -buffersize 512 \
1557                -translation binary
1558        fileevent $fd writable [list \
1559                write_checkout_index \
1560                $fd \
1561                $pathList \
1562                $totalCnt \
1563                $batch \
1564                $msg \
1565                $after \
1566                ]
1567}
1568
1569proc write_checkout_index {fd pathList totalCnt batch msg after} {
1570        global update_index_cp ui_status_value
1571        global file_states current_diff
1572
1573        if {$update_index_cp >= $totalCnt} {
1574                close $fd
1575                unlock_index
1576                uplevel #0 $after
1577                return
1578        }
1579
1580        for {set i $batch} \
1581                {$update_index_cp < $totalCnt && $i > 0} \
1582                {incr i -1} {
1583                set path [lindex $pathList $update_index_cp]
1584                incr update_index_cp
1585
1586                switch -glob -- [lindex $file_states($path) 0] {
1587                AM -
1588                AD {set new A_}
1589                MM -
1590                MD {set new M_}
1591                _M -
1592                _D {set new __}
1593                ?? {continue}
1594                }
1595
1596                puts -nonewline $fd $path
1597                puts -nonewline $fd "\0"
1598                display_file $path $new
1599        }
1600
1601        set ui_status_value [format \
1602                "$msg... %i/%i files (%.2f%%)" \
1603                $update_index_cp \
1604                $totalCnt \
1605                [expr {100.0 * $update_index_cp / $totalCnt}]]
1606}
1607
1608######################################################################
1609##
1610## branch management
1611
1612proc load_all_branches {} {
1613        global all_branches tracking_branches
1614
1615        set all_branches [list]
1616        set cmd [list git for-each-ref]
1617        lappend cmd --format=%(refname)
1618        lappend cmd refs/heads
1619        set fd [open "| $cmd" r]
1620        while {[gets $fd line] > 0} {
1621                if {![catch {set info $tracking_branches($line)}]} continue
1622                if {![regsub ^refs/heads/ $line {} name]} continue
1623                lappend all_branches $name
1624        }
1625        close $fd
1626
1627        set all_branches [lsort $all_branches]
1628}
1629
1630proc populate_branch_menu {m} {
1631        global all_branches disable_on_lock
1632
1633        $m add separator
1634        foreach b $all_branches {
1635                $m add radiobutton \
1636                        -label $b \
1637                        -command [list switch_branch $b] \
1638                        -variable current_branch \
1639                        -value $b \
1640                        -font font_ui
1641                lappend disable_on_lock \
1642                        [list $m entryconf [$m index last] -state]
1643        }
1644}
1645
1646proc switch_branch {b} {
1647        error "NOT IMPLEMENTED"
1648}
1649
1650######################################################################
1651##
1652## remote management
1653
1654proc load_all_remotes {} {
1655        global gitdir repo_config
1656        global all_remotes tracking_branches
1657
1658        set all_remotes [list]
1659        array unset tracking_branches
1660
1661        set rm_dir [file join $gitdir remotes]
1662        if {[file isdirectory $rm_dir]} {
1663                set all_remotes [glob \
1664                        -types f \
1665                        -tails \
1666                        -nocomplain \
1667                        -directory $rm_dir *]
1668
1669                foreach name $all_remotes {
1670                        catch {
1671                                set fd [open [file join $rm_dir $name] r]
1672                                while {[gets $fd line] >= 0} {
1673                                        if {![regexp {^Pull:[   ]*([^:]+):(.+)$} \
1674                                                $line line src dst]} continue
1675                                        if {![regexp ^refs/ $dst]} {
1676                                                set dst "refs/heads/$dst"
1677                                        }
1678                                        set tracking_branches($dst) [list $name $src]
1679                                }
1680                                close $fd
1681                        }
1682                }
1683        }
1684
1685        foreach line [array names repo_config remote.*.url] {
1686                if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
1687                lappend all_remotes $name
1688
1689                if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
1690                        set fl {}
1691                }
1692                foreach line $fl {
1693                        if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
1694                        if {![regexp ^refs/ $dst]} {
1695                                set dst "refs/heads/$dst"
1696                        }
1697                        set tracking_branches($dst) [list $name $src]
1698                }
1699        }
1700
1701        set all_remotes [lsort -unique $all_remotes]
1702}
1703
1704proc populate_fetch_menu {m} {
1705        global gitdir all_remotes repo_config
1706
1707        foreach r $all_remotes {
1708                set enable 0
1709                if {![catch {set a $repo_config(remote.$r.url)}]} {
1710                        if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1711                                set enable 1
1712                        }
1713                } else {
1714                        catch {
1715                                set fd [open [file join $gitdir remotes $r] r]
1716                                while {[gets $fd n] >= 0} {
1717                                        if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1718                                                set enable 1
1719                                                break
1720                                        }
1721                                }
1722                                close $fd
1723                        }
1724                }
1725
1726                if {$enable} {
1727                        $m add command \
1728                                -label "Fetch from $r..." \
1729                                -command [list fetch_from $r] \
1730                                -font font_ui
1731                }
1732        }
1733}
1734
1735proc populate_push_menu {m} {
1736        global gitdir all_remotes repo_config
1737
1738        foreach r $all_remotes {
1739                set enable 0
1740                if {![catch {set a $repo_config(remote.$r.url)}]} {
1741                        if {![catch {set a $repo_config(remote.$r.push)}]} {
1742                                set enable 1
1743                        }
1744                } else {
1745                        catch {
1746                                set fd [open [file join $gitdir remotes $r] r]
1747                                while {[gets $fd n] >= 0} {
1748                                        if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1749                                                set enable 1
1750                                                break
1751                                        }
1752                                }
1753                                close $fd
1754                        }
1755                }
1756
1757                if {$enable} {
1758                        $m add command \
1759                                -label "Push to $r..." \
1760                                -command [list push_to $r] \
1761                                -font font_ui
1762                }
1763        }
1764}
1765
1766proc populate_pull_menu {m} {
1767        global gitdir repo_config all_remotes disable_on_lock
1768
1769        foreach remote $all_remotes {
1770                set rb {}
1771                if {[array get repo_config remote.$remote.url] ne {}} {
1772                        if {[array get repo_config remote.$remote.fetch] ne {}} {
1773                                regexp {^([^:]+):} \
1774                                        [lindex $repo_config(remote.$remote.fetch) 0] \
1775                                        line rb
1776                        }
1777                } else {
1778                        catch {
1779                                set fd [open [file join $gitdir remotes $remote] r]
1780                                while {[gets $fd line] >= 0} {
1781                                        if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1782                                                break
1783                                        }
1784                                }
1785                                close $fd
1786                        }
1787                }
1788
1789                set rb_short $rb
1790                regsub ^refs/heads/ $rb {} rb_short
1791                if {$rb_short ne {}} {
1792                        $m add command \
1793                                -label "Branch $rb_short from $remote..." \
1794                                -command [list pull_remote $remote $rb] \
1795                                -font font_ui
1796                        lappend disable_on_lock \
1797                                [list $m entryconf [$m index last] -state]
1798                }
1799        }
1800}
1801
1802######################################################################
1803##
1804## icons
1805
1806set filemask {
1807#define mask_width 14
1808#define mask_height 15
1809static unsigned char mask_bits[] = {
1810   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1811   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1812   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1813}
1814
1815image create bitmap file_plain -background white -foreground black -data {
1816#define plain_width 14
1817#define plain_height 15
1818static unsigned char plain_bits[] = {
1819   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1820   0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1821   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1822} -maskdata $filemask
1823
1824image create bitmap file_mod -background white -foreground blue -data {
1825#define mod_width 14
1826#define mod_height 15
1827static unsigned char mod_bits[] = {
1828   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1829   0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1830   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1831} -maskdata $filemask
1832
1833image create bitmap file_fulltick -background white -foreground "#007000" -data {
1834#define file_fulltick_width 14
1835#define file_fulltick_height 15
1836static unsigned char file_fulltick_bits[] = {
1837   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1838   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1839   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1840} -maskdata $filemask
1841
1842image create bitmap file_parttick -background white -foreground "#005050" -data {
1843#define parttick_width 14
1844#define parttick_height 15
1845static unsigned char parttick_bits[] = {
1846   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1847   0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1848   0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1849} -maskdata $filemask
1850
1851image create bitmap file_question -background white -foreground black -data {
1852#define file_question_width 14
1853#define file_question_height 15
1854static unsigned char file_question_bits[] = {
1855   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1856   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1857   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1858} -maskdata $filemask
1859
1860image create bitmap file_removed -background white -foreground red -data {
1861#define file_removed_width 14
1862#define file_removed_height 15
1863static unsigned char file_removed_bits[] = {
1864   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1865   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1866   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1867} -maskdata $filemask
1868
1869image create bitmap file_merge -background white -foreground blue -data {
1870#define file_merge_width 14
1871#define file_merge_height 15
1872static unsigned char file_merge_bits[] = {
1873   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1874   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1875   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1876} -maskdata $filemask
1877
1878set ui_index .vpane.files.index.list
1879set ui_other .vpane.files.other.list
1880set max_status_desc 0
1881foreach i {
1882                {__ i plain    "Unmodified"}
1883                {_M i mod      "Modified"}
1884                {M_ i fulltick "Included in commit"}
1885                {MM i parttick "Partially included"}
1886                {MD i question "Included (but gone)"}
1887
1888                {_O o plain    "Untracked"}
1889                {A_ o fulltick "Added by commit"}
1890                {AM o parttick "Partially added"}
1891                {AD o question "Added (but gone)"}
1892
1893                {_D i question "Missing"}
1894                {DD i removed  "Removed by commit"}
1895                {DO i removed  "Removed (still exists)"}
1896                {DM i removed  "Removed (but modified)"}
1897
1898                {UD i merge    "Merge conflicts"}
1899                {UM i merge    "Merge conflicts"}
1900                {U_ i merge    "Merge conflicts"}
1901        } {
1902        if {$max_status_desc < [string length [lindex $i 3]]} {
1903                set max_status_desc [string length [lindex $i 3]]
1904        }
1905        if {[lindex $i 1] eq {i}} {
1906                set all_cols([lindex $i 0]) $ui_index
1907        } else {
1908                set all_cols([lindex $i 0]) $ui_other
1909        }
1910        set all_icons([lindex $i 0]) file_[lindex $i 2]
1911        set all_descs([lindex $i 0]) [lindex $i 3]
1912}
1913unset filemask i
1914
1915######################################################################
1916##
1917## util
1918
1919proc is_MacOSX {} {
1920        global tcl_platform tk_library
1921        if {[tk windowingsystem] eq {aqua}} {
1922                return 1
1923        }
1924        return 0
1925}
1926
1927proc is_Windows {} {
1928        global tcl_platform
1929        if {$tcl_platform(platform) eq {windows}} {
1930                return 1
1931        }
1932        return 0
1933}
1934
1935proc bind_button3 {w cmd} {
1936        bind $w <Any-Button-3> $cmd
1937        if {[is_MacOSX]} {
1938                bind $w <Control-Button-1> $cmd
1939        }
1940}
1941
1942proc incr_font_size {font {amt 1}} {
1943        set sz [font configure $font -size]
1944        incr sz $amt
1945        font configure $font -size $sz
1946        font configure ${font}bold -size $sz
1947}
1948
1949proc hook_failed_popup {hook msg} {
1950        global gitdir appname
1951
1952        set w .hookfail
1953        toplevel $w
1954
1955        frame $w.m
1956        label $w.m.l1 -text "$hook hook failed:" \
1957                -anchor w \
1958                -justify left \
1959                -font font_uibold
1960        text $w.m.t \
1961                -background white -borderwidth 1 \
1962                -relief sunken \
1963                -width 80 -height 10 \
1964                -font font_diff \
1965                -yscrollcommand [list $w.m.sby set]
1966        label $w.m.l2 \
1967                -text {You must correct the above errors before committing.} \
1968                -anchor w \
1969                -justify left \
1970                -font font_uibold
1971        scrollbar $w.m.sby -command [list $w.m.t yview]
1972        pack $w.m.l1 -side top -fill x
1973        pack $w.m.l2 -side bottom -fill x
1974        pack $w.m.sby -side right -fill y
1975        pack $w.m.t -side left -fill both -expand 1
1976        pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1977
1978        $w.m.t insert 1.0 $msg
1979        $w.m.t conf -state disabled
1980
1981        button $w.ok -text OK \
1982                -width 15 \
1983                -font font_ui \
1984                -command "destroy $w"
1985        pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1986
1987        bind $w <Visibility> "grab $w; focus $w"
1988        bind $w <Key-Return> "destroy $w"
1989        wm title $w "$appname ([lindex [file split \
1990                [file normalize [file dirname $gitdir]]] \
1991                end]): error"
1992        tkwait window $w
1993}
1994
1995set next_console_id 0
1996
1997proc new_console {short_title long_title} {
1998        global next_console_id console_data
1999        set w .console[incr next_console_id]
2000        set console_data($w) [list $short_title $long_title]
2001        return [console_init $w]
2002}
2003
2004proc console_init {w} {
2005        global console_cr console_data
2006        global gitdir appname M1B
2007
2008        set console_cr($w) 1.0
2009        toplevel $w
2010        frame $w.m
2011        label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2012                -anchor w \
2013                -justify left \
2014                -font font_uibold
2015        text $w.m.t \
2016                -background white -borderwidth 1 \
2017                -relief sunken \
2018                -width 80 -height 10 \
2019                -font font_diff \
2020                -state disabled \
2021                -yscrollcommand [list $w.m.sby set]
2022        label $w.m.s -text {Working... please wait...} \
2023                -anchor w \
2024                -justify left \
2025                -font font_uibold
2026        scrollbar $w.m.sby -command [list $w.m.t yview]
2027        pack $w.m.l1 -side top -fill x
2028        pack $w.m.s -side bottom -fill x
2029        pack $w.m.sby -side right -fill y
2030        pack $w.m.t -side left -fill both -expand 1
2031        pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2032
2033        menu $w.ctxm -tearoff 0
2034        $w.ctxm add command -label "Copy" \
2035                -font font_ui \
2036                -command "tk_textCopy $w.m.t"
2037        $w.ctxm add command -label "Select All" \
2038                -font font_ui \
2039                -command "$w.m.t tag add sel 0.0 end"
2040        $w.ctxm add command -label "Copy All" \
2041                -font font_ui \
2042                -command "
2043                        $w.m.t tag add sel 0.0 end
2044                        tk_textCopy $w.m.t
2045                        $w.m.t tag remove sel 0.0 end
2046                "
2047
2048        button $w.ok -text {Close} \
2049                -font font_ui \
2050                -state disabled \
2051                -command "destroy $w"
2052        pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2053
2054        bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2055        bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2056        bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2057        bind $w <Visibility> "focus $w"
2058        wm title $w "$appname ([lindex [file split \
2059                [file normalize [file dirname $gitdir]]] \
2060                end]): [lindex $console_data($w) 0]"
2061        return $w
2062}
2063
2064proc console_exec {w cmd {after {}}} {
2065        # -- Windows tosses the enviroment when we exec our child.
2066        #    But most users need that so we have to relogin. :-(
2067        #
2068        if {[is_Windows]} {
2069                set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2070        }
2071
2072        # -- Tcl won't let us redirect both stdout and stderr to
2073        #    the same pipe.  So pass it through cat...
2074        #
2075        set cmd [concat | $cmd |& cat]
2076
2077        set fd_f [open $cmd r]
2078        fconfigure $fd_f -blocking 0 -translation binary
2079        fileevent $fd_f readable [list console_read $w $fd_f $after]
2080}
2081
2082proc console_read {w fd after} {
2083        global console_cr console_data
2084
2085        set buf [read $fd]
2086        if {$buf ne {}} {
2087                if {![winfo exists $w]} {console_init $w}
2088                $w.m.t conf -state normal
2089                set c 0
2090                set n [string length $buf]
2091                while {$c < $n} {
2092                        set cr [string first "\r" $buf $c]
2093                        set lf [string first "\n" $buf $c]
2094                        if {$cr < 0} {set cr [expr {$n + 1}]}
2095                        if {$lf < 0} {set lf [expr {$n + 1}]}
2096
2097                        if {$lf < $cr} {
2098                                $w.m.t insert end [string range $buf $c $lf]
2099                                set console_cr($w) [$w.m.t index {end -1c}]
2100                                set c $lf
2101                                incr c
2102                        } else {
2103                                $w.m.t delete $console_cr($w) end
2104                                $w.m.t insert end "\n"
2105                                $w.m.t insert end [string range $buf $c $cr]
2106                                set c $cr
2107                                incr c
2108                        }
2109                }
2110                $w.m.t conf -state disabled
2111                $w.m.t see end
2112        }
2113
2114        fconfigure $fd -blocking 1
2115        if {[eof $fd]} {
2116                if {[catch {close $fd}]} {
2117                        if {![winfo exists $w]} {console_init $w}
2118                        $w.m.s conf -background red -text {Error: Command Failed}
2119                        $w.ok conf -state normal
2120                        set ok 0
2121                } elseif {[winfo exists $w]} {
2122                        $w.m.s conf -background green -text {Success}
2123                        $w.ok conf -state normal
2124                        set ok 1
2125                }
2126                array unset console_cr $w
2127                array unset console_data $w
2128                if {$after ne {}} {
2129                        uplevel #0 $after $ok
2130                }
2131                return
2132        }
2133        fconfigure $fd -blocking 0
2134}
2135
2136######################################################################
2137##
2138## ui commands
2139
2140set starting_gitk_msg {Please wait... Starting gitk...}
2141
2142proc do_gitk {revs} {
2143        global ui_status_value starting_gitk_msg
2144
2145        set cmd gitk
2146        if {$revs ne {}} {
2147                append cmd { }
2148                append cmd $revs
2149        }
2150        if {[is_Windows]} {
2151                set cmd "sh -c \"exec $cmd\""
2152        }
2153        append cmd { &}
2154
2155        if {[catch {eval exec $cmd} err]} {
2156                error_popup "Failed to start gitk:\n\n$err"
2157        } else {
2158                set ui_status_value $starting_gitk_msg
2159                after 10000 {
2160                        if {$ui_status_value eq $starting_gitk_msg} {
2161                                set ui_status_value {Ready.}
2162                        }
2163                }
2164        }
2165}
2166
2167proc do_repack {} {
2168        set w [new_console {repack} \
2169                {Repacking the object database}]
2170        set cmd [list git repack]
2171        lappend cmd -a
2172        lappend cmd -d
2173        console_exec $w $cmd
2174}
2175
2176proc do_fsck_objects {} {
2177        set w [new_console {fsck-objects} \
2178                {Verifying the object database with fsck-objects}]
2179        set cmd [list git fsck-objects]
2180        lappend cmd --full
2181        lappend cmd --cache
2182        lappend cmd --strict
2183        console_exec $w $cmd
2184}
2185
2186set is_quitting 0
2187
2188proc do_quit {} {
2189        global gitdir ui_comm is_quitting repo_config commit_type
2190
2191        if {$is_quitting} return
2192        set is_quitting 1
2193
2194        # -- Stash our current commit buffer.
2195        #
2196        set save [file join $gitdir GITGUI_MSG]
2197        set msg [string trim [$ui_comm get 0.0 end]]
2198        if {![string match amend* $commit_type]
2199                && [$ui_comm edit modified]
2200                && $msg ne {}} {
2201                catch {
2202                        set fd [open $save w]
2203                        puts $fd [string trim [$ui_comm get 0.0 end]]
2204                        close $fd
2205                }
2206        } else {
2207                catch {file delete $save}
2208        }
2209
2210        # -- Stash our current window geometry into this repository.
2211        #
2212        set cfg_geometry [list]
2213        lappend cfg_geometry [wm geometry .]
2214        lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2215        lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2216        if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2217                set rc_geometry {}
2218        }
2219        if {$cfg_geometry ne $rc_geometry} {
2220                catch {exec git repo-config gui.geometry $cfg_geometry}
2221        }
2222
2223        destroy .
2224}
2225
2226proc do_rescan {} {
2227        rescan {set ui_status_value {Ready.}}
2228}
2229
2230proc remove_helper {txt paths} {
2231        global file_states current_diff
2232
2233        if {![lock_index begin-update]} return
2234
2235        set pathList [list]
2236        set after {}
2237        foreach path $paths {
2238                switch -glob -- [lindex $file_states($path) 0] {
2239                A? -
2240                M? -
2241                D? {
2242                        lappend pathList $path
2243                        if {$path eq $current_diff} {
2244                                set after {reshow_diff;}
2245                        }
2246                }
2247                }
2248        }
2249        if {$pathList eq {}} {
2250                unlock_index
2251        } else {
2252                update_indexinfo \
2253                        $txt \
2254                        $pathList \
2255                        [concat $after {set ui_status_value {Ready.}}]
2256        }
2257}
2258
2259proc do_remove_selection {} {
2260        global current_diff selected_paths
2261
2262        if {[array size selected_paths] > 0} {
2263                remove_helper \
2264                        {Removing selected files from commit} \
2265                        [array names selected_paths]
2266        } elseif {$current_diff ne {}} {
2267                remove_helper \
2268                        "Removing [short_path $current_diff] from commit" \
2269                        [list $current_diff]
2270        }
2271}
2272
2273proc include_helper {txt paths} {
2274        global file_states current_diff
2275
2276        if {![lock_index begin-update]} return
2277
2278        set pathList [list]
2279        set after {}
2280        foreach path $paths {
2281                switch -glob -- [lindex $file_states($path) 0] {
2282                AM -
2283                AD -
2284                MM -
2285                MD -
2286                U? -
2287                _M -
2288                _D -
2289                _O {
2290                        lappend pathList $path
2291                        if {$path eq $current_diff} {
2292                                set after {reshow_diff;}
2293                        }
2294                }
2295                }
2296        }
2297        if {$pathList eq {}} {
2298                unlock_index
2299        } else {
2300                update_index \
2301                        $txt \
2302                        $pathList \
2303                        [concat $after {set ui_status_value {Ready to commit.}}]
2304        }
2305}
2306
2307proc do_include_selection {} {
2308        global current_diff selected_paths
2309
2310        if {[array size selected_paths] > 0} {
2311                include_helper \
2312                        {Including selected files} \
2313                        [array names selected_paths]
2314        } elseif {$current_diff ne {}} {
2315                include_helper \
2316                        "Including [short_path $current_diff]" \
2317                        [list $current_diff]
2318        }
2319}
2320
2321proc do_include_all {} {
2322        global file_states
2323
2324        set paths [list]
2325        foreach path [array names file_states] {
2326                switch -- [lindex $file_states($path) 0] {
2327                AM -
2328                AD -
2329                MM -
2330                MD -
2331                _M -
2332                _D {lappend paths $path}
2333                }
2334        }
2335        include_helper \
2336                {Including all modified files} \
2337                $paths
2338}
2339
2340proc revert_helper {txt paths} {
2341        global file_states current_diff
2342
2343        if {![lock_index begin-update]} return
2344
2345        set pathList [list]
2346        set after {}
2347        foreach path $paths {
2348                switch -glob -- [lindex $file_states($path) 0] {
2349                AM -
2350                AD -
2351                MM -
2352                MD -
2353                _M -
2354                _D {
2355                        lappend pathList $path
2356                        if {$path eq $current_diff} {
2357                                set after {reshow_diff;}
2358                        }
2359                }
2360                }
2361        }
2362
2363        set n [llength $pathList]
2364        if {$n == 0} {
2365                unlock_index
2366                return
2367        } elseif {$n == 1} {
2368                set s "[short_path [lindex $pathList]]"
2369        } else {
2370                set s "these $n files"
2371        }
2372
2373        set reply [tk_dialog \
2374                .confirm_revert \
2375                "title" \
2376                "Revert unincluded changes in $s?
2377
2378Any unincluded changes will be permanently lost by the revert." \
2379                questhead \
2380                1 \
2381                {Do Nothing} \
2382                {Revert Changes} \
2383                ]
2384        if {$reply == 1} {
2385                checkout_index \
2386                        $txt \
2387                        $pathList \
2388                        [concat $after {set ui_status_value {Ready.}}]
2389        } else {
2390                unlock_index
2391        }
2392}
2393
2394proc do_revert_selection {} {
2395        global current_diff selected_paths
2396
2397        if {[array size selected_paths] > 0} {
2398                revert_helper \
2399                        {Reverting selected files} \
2400                        [array names selected_paths]
2401        } elseif {$current_diff ne {}} {
2402                revert_helper \
2403                        "Reverting [short_path $current_diff]" \
2404                        [list $current_diff]
2405        }
2406}
2407
2408proc do_signoff {} {
2409        global ui_comm
2410
2411        set me [committer_ident]
2412        if {$me eq {}} return
2413
2414        set sob "Signed-off-by: $me"
2415        set last [$ui_comm get {end -1c linestart} {end -1c}]
2416        if {$last ne $sob} {
2417                $ui_comm edit separator
2418                if {$last ne {}
2419                        && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2420                        $ui_comm insert end "\n"
2421                }
2422                $ui_comm insert end "\n$sob"
2423                $ui_comm edit separator
2424                $ui_comm see end
2425        }
2426}
2427
2428proc do_select_commit_type {} {
2429        global commit_type selected_commit_type
2430
2431        if {$selected_commit_type eq {new}
2432                && [string match amend* $commit_type]} {
2433                create_new_commit
2434        } elseif {$selected_commit_type eq {amend}
2435                && ![string match amend* $commit_type]} {
2436                load_last_commit
2437
2438                # The amend request was rejected...
2439                #
2440                if {![string match amend* $commit_type]} {
2441                        set selected_commit_type new
2442                }
2443        }
2444}
2445
2446proc do_commit {} {
2447        commit_tree
2448}
2449
2450proc do_about {} {
2451        global appname copyright
2452        global tcl_patchLevel tk_patchLevel
2453
2454        set w .about_dialog
2455        toplevel $w
2456        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2457
2458        label $w.header -text "About $appname" \
2459                -font font_uibold
2460        pack $w.header -side top -fill x
2461
2462        frame $w.buttons
2463        button $w.buttons.close -text {Close} \
2464                -font font_ui \
2465                -command [list destroy $w]
2466        pack $w.buttons.close -side right
2467        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2468
2469        label $w.desc \
2470                -text "$appname - a commit creation tool for Git.
2471$copyright" \
2472                -padx 5 -pady 5 \
2473                -justify left \
2474                -anchor w \
2475                -borderwidth 1 \
2476                -relief solid \
2477                -font font_ui
2478        pack $w.desc -side top -fill x -padx 5 -pady 5
2479
2480        set v [exec git --version]
2481        append v "\n\n"
2482        if {$tcl_patchLevel eq $tk_patchLevel} {
2483                append v "Tcl/Tk version $tcl_patchLevel"
2484        } else {
2485                append v "Tcl version $tcl_patchLevel"
2486                append v ", Tk version $tk_patchLevel"
2487        }
2488
2489        label $w.vers \
2490                -text $v \
2491                -padx 5 -pady 5 \
2492                -justify left \
2493                -anchor w \
2494                -borderwidth 1 \
2495                -relief solid \
2496                -font font_ui
2497        pack $w.vers -side top -fill x -padx 5 -pady 5
2498
2499        bind $w <Visibility> "grab $w; focus $w"
2500        bind $w <Key-Escape> "destroy $w"
2501        wm title $w "About $appname"
2502        tkwait window $w
2503}
2504
2505proc do_options {} {
2506        global appname gitdir font_descs
2507        global repo_config global_config
2508        global repo_config_new global_config_new
2509
2510        array unset repo_config_new
2511        array unset global_config_new
2512        foreach name [array names repo_config] {
2513                set repo_config_new($name) $repo_config($name)
2514        }
2515        load_config 1
2516        foreach name [array names repo_config] {
2517                switch -- $name {
2518                gui.diffcontext {continue}
2519                }
2520                set repo_config_new($name) $repo_config($name)
2521        }
2522        foreach name [array names global_config] {
2523                set global_config_new($name) $global_config($name)
2524        }
2525        set reponame [lindex [file split \
2526                [file normalize [file dirname $gitdir]]] \
2527                end]
2528
2529        set w .options_editor
2530        toplevel $w
2531        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2532
2533        label $w.header -text "$appname Options" \
2534                -font font_uibold
2535        pack $w.header -side top -fill x
2536
2537        frame $w.buttons
2538        button $w.buttons.restore -text {Restore Defaults} \
2539                -font font_ui \
2540                -command do_restore_defaults
2541        pack $w.buttons.restore -side left
2542        button $w.buttons.save -text Save \
2543                -font font_ui \
2544                -command [list do_save_config $w]
2545        pack $w.buttons.save -side right
2546        button $w.buttons.cancel -text {Cancel} \
2547                -font font_ui \
2548                -command [list destroy $w]
2549        pack $w.buttons.cancel -side right
2550        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2551
2552        labelframe $w.repo -text "$reponame Repository" \
2553                -font font_ui \
2554                -relief raised -borderwidth 2
2555        labelframe $w.global -text {Global (All Repositories)} \
2556                -font font_ui \
2557                -relief raised -borderwidth 2
2558        pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2559        pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2560
2561        foreach option {
2562                {b partialinclude {Allow Partially Included Files}}
2563                {b pullsummary {Show Pull Summary}}
2564                {b trustmtime  {Trust File Modification Timestamps}}
2565                {i diffcontext {Number of Diff Context Lines}}
2566                } {
2567                set type [lindex $option 0]
2568                set name [lindex $option 1]
2569                set text [lindex $option 2]
2570                foreach f {repo global} {
2571                        switch $type {
2572                        b {
2573                                checkbutton $w.$f.$name -text $text \
2574                                        -variable ${f}_config_new(gui.$name) \
2575                                        -onvalue true \
2576                                        -offvalue false \
2577                                        -font font_ui
2578                                pack $w.$f.$name -side top -anchor w
2579                        }
2580                        i {
2581                                frame $w.$f.$name
2582                                label $w.$f.$name.l -text "$text:" -font font_ui
2583                                pack $w.$f.$name.l -side left -anchor w -fill x
2584                                spinbox $w.$f.$name.v \
2585                                        -textvariable ${f}_config_new(gui.$name) \
2586                                        -from 1 -to 99 -increment 1 \
2587                                        -width 3 \
2588                                        -font font_ui
2589                                pack $w.$f.$name.v -side right -anchor e
2590                                pack $w.$f.$name -side top -anchor w -fill x
2591                        }
2592                        }
2593                }
2594        }
2595
2596        set all_fonts [lsort [font families]]
2597        foreach option $font_descs {
2598                set name [lindex $option 0]
2599                set font [lindex $option 1]
2600                set text [lindex $option 2]
2601
2602                set global_config_new(gui.$font^^family) \
2603                        [font configure $font -family]
2604                set global_config_new(gui.$font^^size) \
2605                        [font configure $font -size]
2606
2607                frame $w.global.$name
2608                label $w.global.$name.l -text "$text:" -font font_ui
2609                pack $w.global.$name.l -side left -anchor w -fill x
2610                eval tk_optionMenu $w.global.$name.family \
2611                        global_config_new(gui.$font^^family) \
2612                        $all_fonts
2613                spinbox $w.global.$name.size \
2614                        -textvariable global_config_new(gui.$font^^size) \
2615                        -from 2 -to 80 -increment 1 \
2616                        -width 3 \
2617                        -font font_ui
2618                pack $w.global.$name.size -side right -anchor e
2619                pack $w.global.$name.family -side right -anchor e
2620                pack $w.global.$name -side top -anchor w -fill x
2621        }
2622
2623        bind $w <Visibility> "grab $w; focus $w"
2624        bind $w <Key-Escape> "destroy $w"
2625        wm title $w "$appname ($reponame): Options"
2626        tkwait window $w
2627}
2628
2629proc do_restore_defaults {} {
2630        global font_descs default_config repo_config
2631        global repo_config_new global_config_new
2632
2633        foreach name [array names default_config] {
2634                set repo_config_new($name) $default_config($name)
2635                set global_config_new($name) $default_config($name)
2636        }
2637
2638        foreach option $font_descs {
2639                set name [lindex $option 0]
2640                set repo_config(gui.$name) $default_config(gui.$name)
2641        }
2642        apply_config
2643
2644        foreach option $font_descs {
2645                set name [lindex $option 0]
2646                set font [lindex $option 1]
2647                set global_config_new(gui.$font^^family) \
2648                        [font configure $font -family]
2649                set global_config_new(gui.$font^^size) \
2650                        [font configure $font -size]
2651        }
2652}
2653
2654proc do_save_config {w} {
2655        if {[catch {save_config} err]} {
2656                error_popup "Failed to completely save options:\n\n$err"
2657        }
2658        reshow_diff
2659        destroy $w
2660}
2661
2662proc do_windows_shortcut {} {
2663        global gitdir appname argv0
2664
2665        set reponame [lindex [file split \
2666                [file normalize [file dirname $gitdir]]] \
2667                end]
2668
2669        if {[catch {
2670                set desktop [exec cygpath \
2671                        --windows \
2672                        --absolute \
2673                        --long-name \
2674                        --desktop]
2675                }]} {
2676                        set desktop .
2677        }
2678        set fn [tk_getSaveFile \
2679                -parent . \
2680                -title "$appname ($reponame): Create Desktop Icon" \
2681                -initialdir $desktop \
2682                -initialfile "Git $reponame.bat"]
2683        if {$fn != {}} {
2684                if {[catch {
2685                                set fd [open $fn w]
2686                                set sh [exec cygpath \
2687                                        --windows \
2688                                        --absolute \
2689                                        --long-name \
2690                                        /bin/sh]
2691                                set me [exec cygpath \
2692                                        --unix \
2693                                        --absolute \
2694                                        $argv0]
2695                                set gd [exec cygpath \
2696                                        --unix \
2697                                        --absolute \
2698                                        $gitdir]
2699                                regsub -all ' $me "'\\''" me
2700                                regsub -all ' $gd "'\\''" gd
2701                                puts -nonewline $fd "\"$sh\" --login -c \""
2702                                puts -nonewline $fd "GIT_DIR='$gd'"
2703                                puts -nonewline $fd " '$me'"
2704                                puts $fd "&\""
2705                                close $fd
2706                        } err]} {
2707                        error_popup "Cannot write script:\n\n$err"
2708                }
2709        }
2710}
2711
2712proc do_macosx_app {} {
2713        global gitdir appname argv0 env
2714
2715        set reponame [lindex [file split \
2716                [file normalize [file dirname $gitdir]]] \
2717                end]
2718
2719        set fn [tk_getSaveFile \
2720                -parent . \
2721                -title "$appname ($reponame): Create Desktop Icon" \
2722                -initialdir [file join $env(HOME) Desktop] \
2723                -initialfile "Git $reponame.app"]
2724        if {$fn != {}} {
2725                if {[catch {
2726                                set Contents [file join $fn Contents]
2727                                set MacOS [file join $Contents MacOS]
2728                                set exe [file join $MacOS git-gui]
2729
2730                                file mkdir $MacOS
2731
2732                                set fd [open [file join $Contents Info.plist] w]
2733                                puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2734<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2735<plist version="1.0">
2736<dict>
2737        <key>CFBundleDevelopmentRegion</key>
2738        <string>English</string>
2739        <key>CFBundleExecutable</key>
2740        <string>git-gui</string>
2741        <key>CFBundleIdentifier</key>
2742        <string>org.spearce.git-gui</string>
2743        <key>CFBundleInfoDictionaryVersion</key>
2744        <string>6.0</string>
2745        <key>CFBundlePackageType</key>
2746        <string>APPL</string>
2747        <key>CFBundleSignature</key>
2748        <string>????</string>
2749        <key>CFBundleVersion</key>
2750        <string>1.0</string>
2751        <key>NSPrincipalClass</key>
2752        <string>NSApplication</string>
2753</dict>
2754</plist>}
2755                                close $fd
2756
2757                                set fd [open $exe w]
2758                                set gd [file normalize $gitdir]
2759                                set ep [file normalize [exec git --exec-path]]
2760                                regsub -all ' $gd "'\\''" gd
2761                                regsub -all ' $ep "'\\''" ep
2762                                puts $fd "#!/bin/sh"
2763                                foreach name [array names env] {
2764                                        if {[string match GIT_* $name]} {
2765                                                regsub -all ' $env($name) "'\\''" v
2766                                                puts $fd "export $name='$v'"
2767                                        }
2768                                }
2769                                puts $fd "export PATH='$ep':\$PATH"
2770                                puts $fd "export GIT_DIR='$gd'"
2771                                puts $fd "exec [file normalize $argv0]"
2772                                close $fd
2773
2774                                file attributes $exe -permissions u+x,g+x,o+x
2775                        } err]} {
2776                        error_popup "Cannot write icon:\n\n$err"
2777                }
2778        }
2779}
2780
2781proc toggle_or_diff {w x y} {
2782        global file_states file_lists current_diff ui_index ui_other
2783        global last_clicked selected_paths
2784
2785        set pos [split [$w index @$x,$y] .]
2786        set lno [lindex $pos 0]
2787        set col [lindex $pos 1]
2788        set path [lindex $file_lists($w) [expr {$lno - 1}]]
2789        if {$path eq {}} {
2790                set last_clicked {}
2791                return
2792        }
2793
2794        set last_clicked [list $w $lno]
2795        array unset selected_paths
2796        $ui_index tag remove in_sel 0.0 end
2797        $ui_other tag remove in_sel 0.0 end
2798
2799        if {$col == 0} {
2800                if {$current_diff eq $path} {
2801                        set after {reshow_diff;}
2802                } else {
2803                        set after {}
2804                }
2805                switch -glob -- [lindex $file_states($path) 0] {
2806                A_ -
2807                M_ -
2808                DD -
2809                DO -
2810                DM {
2811                        update_indexinfo \
2812                                "Removing [short_path $path] from commit" \
2813                                [list $path] \
2814                                [concat $after {set ui_status_value {Ready.}}]
2815                }
2816                ?? {
2817                        update_index \
2818                                "Including [short_path $path]" \
2819                                [list $path] \
2820                                [concat $after {set ui_status_value {Ready.}}]
2821                }
2822                }
2823        } else {
2824                show_diff $path $w $lno
2825        }
2826}
2827
2828proc add_one_to_selection {w x y} {
2829        global file_lists
2830        global last_clicked selected_paths
2831
2832        set pos [split [$w index @$x,$y] .]
2833        set lno [lindex $pos 0]
2834        set col [lindex $pos 1]
2835        set path [lindex $file_lists($w) [expr {$lno - 1}]]
2836        if {$path eq {}} {
2837                set last_clicked {}
2838                return
2839        }
2840
2841        set last_clicked [list $w $lno]
2842        if {[catch {set in_sel $selected_paths($path)}]} {
2843                set in_sel 0
2844        }
2845        if {$in_sel} {
2846                unset selected_paths($path)
2847                $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2848        } else {
2849                set selected_paths($path) 1
2850                $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2851        }
2852}
2853
2854proc add_range_to_selection {w x y} {
2855        global file_lists
2856        global last_clicked selected_paths
2857
2858        if {[lindex $last_clicked 0] ne $w} {
2859                toggle_or_diff $w $x $y
2860                return
2861        }
2862
2863        set pos [split [$w index @$x,$y] .]
2864        set lno [lindex $pos 0]
2865        set lc [lindex $last_clicked 1]
2866        if {$lc < $lno} {
2867                set begin $lc
2868                set end $lno
2869        } else {
2870                set begin $lno
2871                set end $lc
2872        }
2873
2874        foreach path [lrange $file_lists($w) \
2875                [expr {$begin - 1}] \
2876                [expr {$end - 1}]] {
2877                set selected_paths($path) 1
2878        }
2879        $w tag add in_sel $begin.0 [expr {$end + 1}].0
2880}
2881
2882######################################################################
2883##
2884## config defaults
2885
2886set cursor_ptr arrow
2887font create font_diff -family Courier -size 10
2888font create font_ui
2889catch {
2890        label .dummy
2891        eval font configure font_ui [font actual [.dummy cget -font]]
2892        destroy .dummy
2893}
2894
2895font create font_uibold
2896font create font_diffbold
2897
2898if {[is_Windows]} {
2899        set M1B Control
2900        set M1T Ctrl
2901} elseif {[is_MacOSX]} {
2902        set M1B M1
2903        set M1T Cmd
2904} else {
2905        set M1B M1
2906        set M1T M1
2907}
2908
2909proc apply_config {} {
2910        global repo_config font_descs
2911
2912        foreach option $font_descs {
2913                set name [lindex $option 0]
2914                set font [lindex $option 1]
2915                if {[catch {
2916                        foreach {cn cv} $repo_config(gui.$name) {
2917                                font configure $font $cn $cv
2918                        }
2919                        } err]} {
2920                        error_popup "Invalid font specified in gui.$name:\n\n$err"
2921                }
2922                foreach {cn cv} [font configure $font] {
2923                        font configure ${font}bold $cn $cv
2924                }
2925                font configure ${font}bold -weight bold
2926        }
2927}
2928
2929set default_config(gui.trustmtime) false
2930set default_config(gui.pullsummary) true
2931set default_config(gui.partialinclude) false
2932set default_config(gui.diffcontext) 5
2933set default_config(gui.fontui) [font configure font_ui]
2934set default_config(gui.fontdiff) [font configure font_diff]
2935set font_descs {
2936        {fontui   font_ui   {Main Font}}
2937        {fontdiff font_diff {Diff/Console Font}}
2938}
2939load_config 0
2940apply_config
2941
2942######################################################################
2943##
2944## ui construction
2945
2946# -- Menu Bar
2947#
2948menu .mbar -tearoff 0
2949.mbar add cascade -label Repository -menu .mbar.repository
2950.mbar add cascade -label Edit -menu .mbar.edit
2951if {!$single_commit} {
2952        .mbar add cascade -label Branch -menu .mbar.branch
2953}
2954.mbar add cascade -label Commit -menu .mbar.commit
2955if {!$single_commit} {
2956        .mbar add cascade -label Fetch -menu .mbar.fetch
2957        .mbar add cascade -label Pull -menu .mbar.pull
2958        .mbar add cascade -label Push -menu .mbar.push
2959}
2960. configure -menu .mbar
2961
2962# -- Repository Menu
2963#
2964menu .mbar.repository
2965.mbar.repository add command \
2966        -label {Visualize Current Branch} \
2967        -command {do_gitk {}} \
2968        -font font_ui
2969if {![is_MacOSX]} {
2970        .mbar.repository add command \
2971                -label {Visualize All Branches} \
2972                -command {do_gitk {--all}} \
2973                -font font_ui
2974}
2975.mbar.repository add separator
2976
2977if {!$single_commit} {
2978        .mbar.repository add command -label {Repack Database} \
2979                -command do_repack \
2980                -font font_ui
2981
2982        .mbar.repository add command -label {Verify Database} \
2983                -command do_fsck_objects \
2984                -font font_ui
2985
2986        .mbar.repository add separator
2987
2988        if {[is_Windows]} {
2989                .mbar.repository add command \
2990                        -label {Create Desktop Icon} \
2991                        -command do_windows_shortcut \
2992                        -font font_ui
2993        } elseif {[is_MacOSX]} {
2994                .mbar.repository add command \
2995                        -label {Create Desktop Icon} \
2996                        -command do_macosx_app \
2997                        -font font_ui
2998        }
2999}
3000.mbar.repository add command -label Quit \
3001        -command do_quit \
3002        -accelerator $M1T-Q \
3003        -font font_ui
3004
3005# -- Edit Menu
3006#
3007menu .mbar.edit
3008.mbar.edit add command -label Undo \
3009        -command {catch {[focus] edit undo}} \
3010        -accelerator $M1T-Z \
3011        -font font_ui
3012.mbar.edit add command -label Redo \
3013        -command {catch {[focus] edit redo}} \
3014        -accelerator $M1T-Y \
3015        -font font_ui
3016.mbar.edit add separator
3017.mbar.edit add command -label Cut \
3018        -command {catch {tk_textCut [focus]}} \
3019        -accelerator $M1T-X \
3020        -font font_ui
3021.mbar.edit add command -label Copy \
3022        -command {catch {tk_textCopy [focus]}} \
3023        -accelerator $M1T-C \
3024        -font font_ui
3025.mbar.edit add command -label Paste \
3026        -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3027        -accelerator $M1T-V \
3028        -font font_ui
3029.mbar.edit add command -label Delete \
3030        -command {catch {[focus] delete sel.first sel.last}} \
3031        -accelerator Del \
3032        -font font_ui
3033.mbar.edit add separator
3034.mbar.edit add command -label {Select All} \
3035        -command {catch {[focus] tag add sel 0.0 end}} \
3036        -accelerator $M1T-A \
3037        -font font_ui
3038
3039if {!$single_commit} {
3040        # -- Branch Menu
3041        #
3042        menu .mbar.branch
3043
3044        .mbar.branch add command -label {Create...} \
3045                -command do_create_branch \
3046                -font font_ui
3047        lappend disable_on_lock [list .mbar.branch entryconf \
3048                [.mbar.branch index last] -state]
3049
3050        .mbar.branch add command -label {Delete...} \
3051                -command do_delete_branch \
3052                -font font_ui
3053        lappend disable_on_lock [list .mbar.branch entryconf \
3054                [.mbar.branch index last] -state]
3055}
3056
3057# -- Commit Menu
3058#
3059menu .mbar.commit
3060
3061.mbar.commit add radiobutton \
3062        -label {New Commit} \
3063        -command do_select_commit_type \
3064        -variable selected_commit_type \
3065        -value new \
3066        -font font_ui
3067lappend disable_on_lock \
3068        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3069
3070.mbar.commit add radiobutton \
3071        -label {Amend Last Commit} \
3072        -command do_select_commit_type \
3073        -variable selected_commit_type \
3074        -value amend \
3075        -font font_ui
3076lappend disable_on_lock \
3077        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3078
3079.mbar.commit add separator
3080
3081.mbar.commit add command -label Rescan \
3082        -command do_rescan \
3083        -accelerator F5 \
3084        -font font_ui
3085lappend disable_on_lock \
3086        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3087
3088.mbar.commit add command -label {Include In Commit} \
3089        -command do_include_selection \
3090        -font font_ui
3091lappend disable_on_lock \
3092        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3093
3094.mbar.commit add command -label {Include All In Commit} \
3095        -command do_include_all \
3096        -accelerator $M1T-I \
3097        -font font_ui
3098lappend disable_on_lock \
3099        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3100
3101.mbar.commit add command -label {Remove From Commit} \
3102        -command do_remove_selection \
3103        -font font_ui
3104lappend disable_on_lock \
3105        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3106
3107.mbar.commit add command -label {Revert Changes} \
3108        -command do_revert_selection \
3109        -font font_ui
3110lappend disable_on_lock \
3111        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3112
3113.mbar.commit add separator
3114
3115.mbar.commit add command -label {Sign Off} \
3116        -command do_signoff \
3117        -accelerator $M1T-S \
3118        -font font_ui
3119
3120.mbar.commit add command -label Commit \
3121        -command do_commit \
3122        -accelerator $M1T-Return \
3123        -font font_ui
3124lappend disable_on_lock \
3125        [list .mbar.commit entryconf [.mbar.commit index last] -state]
3126
3127# -- Transport menus
3128#
3129if {!$single_commit} {
3130        menu .mbar.fetch
3131        menu .mbar.pull
3132        menu .mbar.push
3133}
3134
3135if {[is_MacOSX]} {
3136        # -- Apple Menu (Mac OS X only)
3137        #
3138        .mbar add cascade -label Apple -menu .mbar.apple
3139        menu .mbar.apple
3140
3141        .mbar.apple add command -label "About $appname" \
3142                -command do_about \
3143                -font font_ui
3144        .mbar.apple add command -label "$appname Options..." \
3145                -command do_options \
3146                -font font_ui
3147} else {
3148        # -- Edit Menu
3149        #
3150        .mbar.edit add separator
3151        .mbar.edit add command -label {Options...} \
3152                -command do_options \
3153                -font font_ui
3154
3155        # -- Help Menu
3156        #
3157        .mbar add cascade -label Help -menu .mbar.help
3158        menu .mbar.help
3159
3160        .mbar.help add command -label "About $appname" \
3161                -command do_about \
3162                -font font_ui
3163}
3164
3165
3166# -- Branch Control
3167#
3168frame .branch \
3169        -borderwidth 1 \
3170        -relief sunken
3171label .branch.l1 \
3172        -text {Current Branch:} \
3173        -anchor w \
3174        -justify left \
3175        -font font_ui
3176label .branch.cb \
3177        -textvariable current_branch \
3178        -anchor w \
3179        -justify left \
3180        -font font_ui
3181pack .branch.l1 -side left
3182pack .branch.cb -side left -fill x
3183pack .branch -side top -fill x
3184
3185# -- Main Window Layout
3186#
3187panedwindow .vpane -orient vertical
3188panedwindow .vpane.files -orient horizontal
3189.vpane add .vpane.files -sticky nsew -height 100 -width 400
3190pack .vpane -anchor n -side top -fill both -expand 1
3191
3192# -- Index File List
3193#
3194frame .vpane.files.index -height 100 -width 400
3195label .vpane.files.index.title -text {Modified Files} \
3196        -background green \
3197        -font font_ui
3198text $ui_index -background white -borderwidth 0 \
3199        -width 40 -height 10 \
3200        -font font_ui \
3201        -cursor $cursor_ptr \
3202        -yscrollcommand {.vpane.files.index.sb set} \
3203        -state disabled
3204scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3205pack .vpane.files.index.title -side top -fill x
3206pack .vpane.files.index.sb -side right -fill y
3207pack $ui_index -side left -fill both -expand 1
3208.vpane.files add .vpane.files.index -sticky nsew
3209
3210# -- Other (Add) File List
3211#
3212frame .vpane.files.other -height 100 -width 100
3213label .vpane.files.other.title -text {Untracked Files} \
3214        -background red \
3215        -font font_ui
3216text $ui_other -background white -borderwidth 0 \
3217        -width 40 -height 10 \
3218        -font font_ui \
3219        -cursor $cursor_ptr \
3220        -yscrollcommand {.vpane.files.other.sb set} \
3221        -state disabled
3222scrollbar .vpane.files.other.sb -command [list $ui_other yview]
3223pack .vpane.files.other.title -side top -fill x
3224pack .vpane.files.other.sb -side right -fill y
3225pack $ui_other -side left -fill both -expand 1
3226.vpane.files add .vpane.files.other -sticky nsew
3227
3228foreach i [list $ui_index $ui_other] {
3229        $i tag conf in_diff -font font_uibold
3230        $i tag conf in_sel \
3231                -background [$i cget -foreground] \
3232                -foreground [$i cget -background]
3233}
3234unset i
3235
3236# -- Diff and Commit Area
3237#
3238frame .vpane.lower -height 300 -width 400
3239frame .vpane.lower.commarea
3240frame .vpane.lower.diff -relief sunken -borderwidth 1
3241pack .vpane.lower.commarea -side top -fill x
3242pack .vpane.lower.diff -side bottom -fill both -expand 1
3243.vpane add .vpane.lower -stick nsew
3244
3245# -- Commit Area Buttons
3246#
3247frame .vpane.lower.commarea.buttons
3248label .vpane.lower.commarea.buttons.l -text {} \
3249        -anchor w \
3250        -justify left \
3251        -font font_ui
3252pack .vpane.lower.commarea.buttons.l -side top -fill x
3253pack .vpane.lower.commarea.buttons -side left -fill y
3254
3255button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3256        -command do_rescan \
3257        -font font_ui
3258pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3259lappend disable_on_lock \
3260        {.vpane.lower.commarea.buttons.rescan conf -state}
3261
3262button .vpane.lower.commarea.buttons.incall -text {Include All} \
3263        -command do_include_all \
3264        -font font_ui
3265pack .vpane.lower.commarea.buttons.incall -side top -fill x
3266lappend disable_on_lock \
3267        {.vpane.lower.commarea.buttons.incall conf -state}
3268
3269button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3270        -command do_signoff \
3271        -font font_ui
3272pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3273
3274button .vpane.lower.commarea.buttons.commit -text {Commit} \
3275        -command do_commit \
3276        -font font_ui
3277pack .vpane.lower.commarea.buttons.commit -side top -fill x
3278lappend disable_on_lock \
3279        {.vpane.lower.commarea.buttons.commit conf -state}
3280
3281# -- Commit Message Buffer
3282#
3283frame .vpane.lower.commarea.buffer
3284frame .vpane.lower.commarea.buffer.header
3285set ui_comm .vpane.lower.commarea.buffer.t
3286set ui_coml .vpane.lower.commarea.buffer.header.l
3287radiobutton .vpane.lower.commarea.buffer.header.new \
3288        -text {New Commit} \
3289        -command do_select_commit_type \
3290        -variable selected_commit_type \
3291        -value new \
3292        -font font_ui
3293lappend disable_on_lock \
3294        [list .vpane.lower.commarea.buffer.header.new conf -state]
3295radiobutton .vpane.lower.commarea.buffer.header.amend \
3296        -text {Amend Last Commit} \
3297        -command do_select_commit_type \
3298        -variable selected_commit_type \
3299        -value amend \
3300        -font font_ui
3301lappend disable_on_lock \
3302        [list .vpane.lower.commarea.buffer.header.amend conf -state]
3303label $ui_coml \
3304        -anchor w \
3305        -justify left \
3306        -font font_ui
3307proc trace_commit_type {varname args} {
3308        global ui_coml commit_type
3309        switch -glob -- $commit_type {
3310        initial       {set txt {Initial Commit Message:}}
3311        amend         {set txt {Amended Commit Message:}}
3312        amend-initial {set txt {Amended Initial Commit Message:}}
3313        amend-merge   {set txt {Amended Merge Commit Message:}}
3314        merge         {set txt {Merge Commit Message:}}
3315        *             {set txt {Commit Message:}}
3316        }
3317        $ui_coml conf -text $txt
3318}
3319trace add variable commit_type write trace_commit_type
3320pack $ui_coml -side left -fill x
3321pack .vpane.lower.commarea.buffer.header.amend -side right
3322pack .vpane.lower.commarea.buffer.header.new -side right
3323
3324text $ui_comm -background white -borderwidth 1 \
3325        -undo true \
3326        -maxundo 20 \
3327        -autoseparators true \
3328        -relief sunken \
3329        -width 75 -height 9 -wrap none \
3330        -font font_diff \
3331        -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3332scrollbar .vpane.lower.commarea.buffer.sby \
3333        -command [list $ui_comm yview]
3334pack .vpane.lower.commarea.buffer.header -side top -fill x
3335pack .vpane.lower.commarea.buffer.sby -side right -fill y
3336pack $ui_comm -side left -fill y
3337pack .vpane.lower.commarea.buffer -side left -fill y
3338
3339# -- Commit Message Buffer Context Menu
3340#
3341set ctxm .vpane.lower.commarea.buffer.ctxm
3342menu $ctxm -tearoff 0
3343$ctxm add command \
3344        -label {Cut} \
3345        -font font_ui \
3346        -command {tk_textCut $ui_comm}
3347$ctxm add command \
3348        -label {Copy} \
3349        -font font_ui \
3350        -command {tk_textCopy $ui_comm}
3351$ctxm add command \
3352        -label {Paste} \
3353        -font font_ui \
3354        -command {tk_textPaste $ui_comm}
3355$ctxm add command \
3356        -label {Delete} \
3357        -font font_ui \
3358        -command {$ui_comm delete sel.first sel.last}
3359$ctxm add separator
3360$ctxm add command \
3361        -label {Select All} \
3362        -font font_ui \
3363        -command {$ui_comm tag add sel 0.0 end}
3364$ctxm add command \
3365        -label {Copy All} \
3366        -font font_ui \
3367        -command {
3368                $ui_comm tag add sel 0.0 end
3369                tk_textCopy $ui_comm
3370                $ui_comm tag remove sel 0.0 end
3371        }
3372$ctxm add separator
3373$ctxm add command \
3374        -label {Sign Off} \
3375        -font font_ui \
3376        -command do_signoff
3377bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3378
3379# -- Diff Header
3380#
3381set current_diff {}
3382set diff_actions [list]
3383proc trace_current_diff {varname args} {
3384        global current_diff diff_actions file_states
3385        if {$current_diff eq {}} {
3386                set s {}
3387                set f {}
3388                set p {}
3389                set o disabled
3390        } else {
3391                set p $current_diff
3392                set s [mapdesc [lindex $file_states($p) 0] $p]
3393                set f {File:}
3394                set p [escape_path $p]
3395                set o normal
3396        }
3397
3398        .vpane.lower.diff.header.status configure -text $s
3399        .vpane.lower.diff.header.file configure -text $f
3400        .vpane.lower.diff.header.path configure -text $p
3401        foreach w $diff_actions {
3402                uplevel #0 $w $o
3403        }
3404}
3405trace add variable current_diff write trace_current_diff
3406
3407frame .vpane.lower.diff.header -background orange
3408label .vpane.lower.diff.header.status \
3409        -background orange \
3410        -width $max_status_desc \
3411        -anchor w \
3412        -justify left \
3413        -font font_ui
3414label .vpane.lower.diff.header.file \
3415        -background orange \
3416        -anchor w \
3417        -justify left \
3418        -font font_ui
3419label .vpane.lower.diff.header.path \
3420        -background orange \
3421        -anchor w \
3422        -justify left \
3423        -font font_ui
3424pack .vpane.lower.diff.header.status -side left
3425pack .vpane.lower.diff.header.file -side left
3426pack .vpane.lower.diff.header.path -fill x
3427set ctxm .vpane.lower.diff.header.ctxm
3428menu $ctxm -tearoff 0
3429$ctxm add command \
3430        -label {Copy} \
3431        -font font_ui \
3432        -command {
3433                clipboard clear
3434                clipboard append \
3435                        -format STRING \
3436                        -type STRING \
3437                        -- $current_diff
3438        }
3439lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3440bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3441
3442# -- Diff Body
3443#
3444frame .vpane.lower.diff.body
3445set ui_diff .vpane.lower.diff.body.t
3446text $ui_diff -background white -borderwidth 0 \
3447        -width 80 -height 15 -wrap none \
3448        -font font_diff \
3449        -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3450        -yscrollcommand {.vpane.lower.diff.body.sby set} \
3451        -state disabled
3452scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3453        -command [list $ui_diff xview]
3454scrollbar .vpane.lower.diff.body.sby -orient vertical \
3455        -command [list $ui_diff yview]
3456pack .vpane.lower.diff.body.sbx -side bottom -fill x
3457pack .vpane.lower.diff.body.sby -side right -fill y
3458pack $ui_diff -side left -fill both -expand 1
3459pack .vpane.lower.diff.header -side top -fill x
3460pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3461
3462$ui_diff tag conf d_@ -font font_diffbold
3463$ui_diff tag conf d_+  -foreground blue
3464$ui_diff tag conf d_-  -foreground red
3465$ui_diff tag conf d_++ -foreground {#00a000}
3466$ui_diff tag conf d_-- -foreground {#a000a0}
3467$ui_diff tag conf d_+- \
3468        -foreground red \
3469        -background {light goldenrod yellow}
3470$ui_diff tag conf d_-+ \
3471        -foreground blue \
3472        -background azure2
3473
3474# -- Diff Body Context Menu
3475#
3476set ctxm .vpane.lower.diff.body.ctxm
3477menu $ctxm -tearoff 0
3478$ctxm add command \
3479        -label {Copy} \
3480        -font font_ui \
3481        -command {tk_textCopy $ui_diff}
3482lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3483$ctxm add command \
3484        -label {Select All} \
3485        -font font_ui \
3486        -command {$ui_diff tag add sel 0.0 end}
3487lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3488$ctxm add command \
3489        -label {Copy All} \
3490        -font font_ui \
3491        -command {
3492                $ui_diff tag add sel 0.0 end
3493                tk_textCopy $ui_diff
3494                $ui_diff tag remove sel 0.0 end
3495        }
3496lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3497$ctxm add separator
3498$ctxm add command \
3499        -label {Decrease Font Size} \
3500        -font font_ui \
3501        -command {incr_font_size font_diff -1}
3502lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3503$ctxm add command \
3504        -label {Increase Font Size} \
3505        -font font_ui \
3506        -command {incr_font_size font_diff 1}
3507lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3508$ctxm add separator
3509$ctxm add command \
3510        -label {Show Less Context} \
3511        -font font_ui \
3512        -command {if {$repo_config(gui.diffcontext) >= 2} {
3513                incr repo_config(gui.diffcontext) -1
3514                reshow_diff
3515        }}
3516lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3517$ctxm add command \
3518        -label {Show More Context} \
3519        -font font_ui \
3520        -command {
3521                incr repo_config(gui.diffcontext)
3522                reshow_diff
3523        }
3524lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3525$ctxm add separator
3526$ctxm add command -label {Options...} \
3527        -font font_ui \
3528        -command do_options
3529bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3530
3531# -- Status Bar
3532#
3533set ui_status_value {Initializing...}
3534label .status -textvariable ui_status_value \
3535        -anchor w \
3536        -justify left \
3537        -borderwidth 1 \
3538        -relief sunken \
3539        -font font_ui
3540pack .status -anchor w -side bottom -fill x
3541
3542# -- Load geometry
3543#
3544catch {
3545set gm $repo_config(gui.geometry)
3546wm geometry . [lindex $gm 0]
3547.vpane sash place 0 \
3548        [lindex [.vpane sash coord 0] 0] \
3549        [lindex $gm 1]
3550.vpane.files sash place 0 \
3551        [lindex $gm 2] \
3552        [lindex [.vpane.files sash coord 0] 1]
3553unset gm
3554}
3555
3556# -- Key Bindings
3557#
3558bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3559bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3560bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3561bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3562bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3563bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3564bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3565bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3566bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3567bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3568bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3569
3570bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3571bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3572bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3573bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3574bind $ui_diff <$M1B-Key-v> {break}
3575bind $ui_diff <$M1B-Key-V> {break}
3576bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3577bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3578bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
3579bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
3580bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
3581bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
3582
3583bind .   <Destroy> do_quit
3584bind all <Key-F5> do_rescan
3585bind all <$M1B-Key-r> do_rescan
3586bind all <$M1B-Key-R> do_rescan
3587bind .   <$M1B-Key-s> do_signoff
3588bind .   <$M1B-Key-S> do_signoff
3589bind .   <$M1B-Key-i> do_include_all
3590bind .   <$M1B-Key-I> do_include_all
3591bind .   <$M1B-Key-Return> do_commit
3592bind all <$M1B-Key-q> do_quit
3593bind all <$M1B-Key-Q> do_quit
3594bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3595bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3596foreach i [list $ui_index $ui_other] {
3597        bind $i <Button-1>       "toggle_or_diff         $i %x %y; break"
3598        bind $i <$M1B-Button-1>  "add_one_to_selection   $i %x %y; break"
3599        bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3600}
3601unset i
3602
3603set file_lists($ui_index) [list]
3604set file_lists($ui_other) [list]
3605
3606set HEAD {}
3607set PARENT {}
3608set MERGE_HEAD [list]
3609set commit_type {}
3610set empty_tree {}
3611set current_branch {}
3612set current_diff {}
3613set selected_commit_type new
3614
3615wm title . "$appname ([file normalize [file dirname $gitdir]])"
3616focus -force $ui_comm
3617
3618# -- Warn the user about environmental problems.
3619#    Cygwin's Tcl does *not* pass its env array
3620#    onto any processes it spawns.  This means
3621#    that the git processes get none of our
3622#    environment.  That may not work...
3623#
3624if {[is_Windows]} {
3625        set ignored_env 0
3626        set suggest_user {}
3627        set msg "Possible environment issues exist.
3628
3629The following environment variables are probably
3630going to be ignored by any Git subprocess run
3631by $appname:
3632
3633"
3634        foreach name [array names env] {
3635                switch -regexp -- $name {
3636                {^GIT_INDEX_FILE$} -
3637                {^GIT_OBJECT_DIRECTORY$} -
3638                {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3639                {^GIT_DIFF_OPTS$} -
3640                {^GIT_EXTERNAL_DIFF$} -
3641                {^GIT_PAGER$} -
3642                {^GIT_TRACE$} -
3643                {^GIT_CONFIG$} -
3644                {^GIT_CONFIG_LOCAL$} -
3645                {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3646                        append msg " - $name\n"
3647                        incr ignored_env
3648                }
3649                {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3650                        append msg " - $name\n"
3651                        incr ignored_env
3652                        set suggest_user $name
3653                }
3654                }
3655        }
3656        if {$ignored_env > 0} {
3657                append msg "
3658This is due to a known issue with the
3659Tcl binary distributed by Cygwin."
3660
3661                if {$suggest_user ne {}} {
3662                        append msg "
3663
3664A good replacement for $suggest_user
3665is placing values for the user.name and
3666user.email settings into your personal
3667~/.gitconfig file.
3668"
3669                }
3670                warn_popup $msg
3671        }
3672        unset ignored_env msg suggest_user name
3673}
3674
3675if {!$single_commit} {
3676        load_all_remotes
3677        load_all_branches
3678        populate_branch_menu .mbar.branch
3679        populate_fetch_menu .mbar.fetch
3680        populate_pull_menu .mbar.pull
3681        populate_push_menu .mbar.push
3682}
3683lock_index begin-read
3684after 1 do_rescan