git-gui.shon commit git-gui: Implement local merge operations. (e483483)
   1#!/bin/sh
   2# Tcl ignores the next line -*- tcl -*- \
   3exec wish "$0" -- "$@"
   4
   5set appvers {@@GIT_VERSION@@}
   6set copyright {
   7Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
   8
   9This program is free software; you can redistribute it and/or modify
  10it under the terms of the GNU General Public License as published by
  11the Free Software Foundation; either version 2 of the License, or
  12(at your option) any later version.
  13
  14This program is distributed in the hope that it will be useful,
  15but WITHOUT ANY WARRANTY; without even the implied warranty of
  16MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  17GNU General Public License for more details.
  18
  19You should have received a copy of the GNU General Public License
  20along with this program; if not, write to the Free Software
  21Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}
  22
  23######################################################################
  24##
  25## read only globals
  26
  27set _appname [lindex [file split $argv0] end]
  28set _gitdir {}
  29set _reponame {}
  30
  31proc appname {} {
  32        global _appname
  33        return $_appname
  34}
  35
  36proc gitdir {args} {
  37        global _gitdir
  38        if {$args eq {}} {
  39                return $_gitdir
  40        }
  41        return [eval [concat [list file join $_gitdir] $args]]
  42}
  43
  44proc reponame {} {
  45        global _reponame
  46        return $_reponame
  47}
  48
  49######################################################################
  50##
  51## config
  52
  53proc is_many_config {name} {
  54        switch -glob -- $name {
  55        remote.*.fetch -
  56        remote.*.push
  57                {return 1}
  58        *
  59                {return 0}
  60        }
  61}
  62
  63proc load_config {include_global} {
  64        global repo_config global_config default_config
  65
  66        array unset global_config
  67        if {$include_global} {
  68                catch {
  69                        set fd_rc [open "| git repo-config --global --list" r]
  70                        while {[gets $fd_rc line] >= 0} {
  71                                if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
  72                                        if {[is_many_config $name]} {
  73                                                lappend global_config($name) $value
  74                                        } else {
  75                                                set global_config($name) $value
  76                                        }
  77                                }
  78                        }
  79                        close $fd_rc
  80                }
  81        }
  82
  83        array unset repo_config
  84        catch {
  85                set fd_rc [open "| git repo-config --list" r]
  86                while {[gets $fd_rc line] >= 0} {
  87                        if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
  88                                if {[is_many_config $name]} {
  89                                        lappend repo_config($name) $value
  90                                } else {
  91                                        set repo_config($name) $value
  92                                }
  93                        }
  94                }
  95                close $fd_rc
  96        }
  97
  98        foreach name [array names default_config] {
  99                if {[catch {set v $global_config($name)}]} {
 100                        set global_config($name) $default_config($name)
 101                }
 102                if {[catch {set v $repo_config($name)}]} {
 103                        set repo_config($name) $default_config($name)
 104                }
 105        }
 106}
 107
 108proc save_config {} {
 109        global default_config font_descs
 110        global repo_config global_config
 111        global repo_config_new global_config_new
 112
 113        foreach option $font_descs {
 114                set name [lindex $option 0]
 115                set font [lindex $option 1]
 116                font configure $font \
 117                        -family $global_config_new(gui.$font^^family) \
 118                        -size $global_config_new(gui.$font^^size)
 119                font configure ${font}bold \
 120                        -family $global_config_new(gui.$font^^family) \
 121                        -size $global_config_new(gui.$font^^size)
 122                set global_config_new(gui.$name) [font configure $font]
 123                unset global_config_new(gui.$font^^family)
 124                unset global_config_new(gui.$font^^size)
 125        }
 126
 127        foreach name [array names default_config] {
 128                set value $global_config_new($name)
 129                if {$value ne $global_config($name)} {
 130                        if {$value eq $default_config($name)} {
 131                                catch {exec git repo-config --global --unset $name}
 132                        } else {
 133                                regsub -all "\[{}\]" $value {"} value
 134                                exec git repo-config --global $name $value
 135                        }
 136                        set global_config($name) $value
 137                        if {$value eq $repo_config($name)} {
 138                                catch {exec git repo-config --unset $name}
 139                                set repo_config($name) $value
 140                        }
 141                }
 142        }
 143
 144        foreach name [array names default_config] {
 145                set value $repo_config_new($name)
 146                if {$value ne $repo_config($name)} {
 147                        if {$value eq $global_config($name)} {
 148                                catch {exec git repo-config --unset $name}
 149                        } else {
 150                                regsub -all "\[{}\]" $value {"} value
 151                                exec git repo-config $name $value
 152                        }
 153                        set repo_config($name) $value
 154                }
 155        }
 156}
 157
 158proc error_popup {msg} {
 159        set title [appname]
 160        if {[reponame] ne {}} {
 161                append title " ([reponame])"
 162        }
 163        set cmd [list tk_messageBox \
 164                -icon error \
 165                -type ok \
 166                -title "$title: error" \
 167                -message $msg]
 168        if {[winfo ismapped .]} {
 169                lappend cmd -parent .
 170        }
 171        eval $cmd
 172}
 173
 174proc warn_popup {msg} {
 175        set title [appname]
 176        if {[reponame] ne {}} {
 177                append title " ([reponame])"
 178        }
 179        set cmd [list tk_messageBox \
 180                -icon warning \
 181                -type ok \
 182                -title "$title: warning" \
 183                -message $msg]
 184        if {[winfo ismapped .]} {
 185                lappend cmd -parent .
 186        }
 187        eval $cmd
 188}
 189
 190proc info_popup {msg} {
 191        set title [appname]
 192        if {[reponame] ne {}} {
 193                append title " ([reponame])"
 194        }
 195        tk_messageBox \
 196                -parent . \
 197                -icon info \
 198                -type ok \
 199                -title $title \
 200                -message $msg
 201}
 202
 203proc ask_popup {msg} {
 204        set title [appname]
 205        if {[reponame] ne {}} {
 206                append title " ([reponame])"
 207        }
 208        return [tk_messageBox \
 209                -parent . \
 210                -icon question \
 211                -type yesno \
 212                -title $title \
 213                -message $msg]
 214}
 215
 216######################################################################
 217##
 218## repository setup
 219
 220if {   [catch {set _gitdir $env(GIT_DIR)}]
 221        && [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
 222        catch {wm withdraw .}
 223        error_popup "Cannot find the git directory:\n\n$err"
 224        exit 1
 225}
 226if {![file isdirectory $_gitdir]} {
 227        catch {wm withdraw .}
 228        error_popup "Git directory not found:\n\n$_gitdir"
 229        exit 1
 230}
 231if {[lindex [file split $_gitdir] end] ne {.git}} {
 232        catch {wm withdraw .}
 233        error_popup "Cannot use funny .git directory:\n\n$gitdir"
 234        exit 1
 235}
 236if {[catch {cd [file dirname $_gitdir]} err]} {
 237        catch {wm withdraw .}
 238        error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
 239        exit 1
 240}
 241set _reponame [lindex [file split \
 242        [file normalize [file dirname $_gitdir]]] \
 243        end]
 244
 245set single_commit 0
 246if {[appname] eq {git-citool}} {
 247        set single_commit 1
 248}
 249
 250######################################################################
 251##
 252## task management
 253
 254set rescan_active 0
 255set diff_active 0
 256set last_clicked {}
 257
 258set disable_on_lock [list]
 259set index_lock_type none
 260
 261proc lock_index {type} {
 262        global index_lock_type disable_on_lock
 263
 264        if {$index_lock_type eq {none}} {
 265                set index_lock_type $type
 266                foreach w $disable_on_lock {
 267                        uplevel #0 $w disabled
 268                }
 269                return 1
 270        } elseif {$index_lock_type eq "begin-$type"} {
 271                set index_lock_type $type
 272                return 1
 273        }
 274        return 0
 275}
 276
 277proc unlock_index {} {
 278        global index_lock_type disable_on_lock
 279
 280        set index_lock_type none
 281        foreach w $disable_on_lock {
 282                uplevel #0 $w normal
 283        }
 284}
 285
 286######################################################################
 287##
 288## status
 289
 290proc repository_state {ctvar hdvar mhvar} {
 291        global current_branch
 292        upvar $ctvar ct $hdvar hd $mhvar mh
 293
 294        set mh [list]
 295
 296        if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
 297                set current_branch {}
 298        } else {
 299                regsub ^refs/((heads|tags|remotes)/)? \
 300                        $current_branch \
 301                        {} \
 302                        current_branch
 303        }
 304
 305        if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
 306                set hd {}
 307                set ct initial
 308                return
 309        }
 310
 311        set merge_head [gitdir MERGE_HEAD]
 312        if {[file exists $merge_head]} {
 313                set ct merge
 314                set fd_mh [open $merge_head r]
 315                while {[gets $fd_mh line] >= 0} {
 316                        lappend mh $line
 317                }
 318                close $fd_mh
 319                return
 320        }
 321
 322        set ct normal
 323}
 324
 325proc PARENT {} {
 326        global PARENT empty_tree
 327
 328        set p [lindex $PARENT 0]
 329        if {$p ne {}} {
 330                return $p
 331        }
 332        if {$empty_tree eq {}} {
 333                set empty_tree [exec git mktree << {}]
 334        }
 335        return $empty_tree
 336}
 337
 338proc rescan {after {honor_trustmtime 1}} {
 339        global HEAD PARENT MERGE_HEAD commit_type
 340        global ui_index ui_workdir ui_status_value ui_comm
 341        global rescan_active file_states
 342        global repo_config
 343
 344        if {$rescan_active > 0 || ![lock_index read]} return
 345
 346        repository_state newType newHEAD newMERGE_HEAD
 347        if {[string match amend* $commit_type]
 348                && $newType eq {normal}
 349                && $newHEAD eq $HEAD} {
 350        } else {
 351                set HEAD $newHEAD
 352                set PARENT $newHEAD
 353                set MERGE_HEAD $newMERGE_HEAD
 354                set commit_type $newType
 355        }
 356
 357        array unset file_states
 358
 359        if {![$ui_comm edit modified]
 360                || [string trim [$ui_comm get 0.0 end]] eq {}} {
 361                if {[load_message GITGUI_MSG]} {
 362                } elseif {[load_message MERGE_MSG]} {
 363                } elseif {[load_message SQUASH_MSG]} {
 364                }
 365                $ui_comm edit reset
 366                $ui_comm edit modified false
 367        }
 368
 369        if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
 370                rescan_stage2 {} $after
 371        } else {
 372                set rescan_active 1
 373                set ui_status_value {Refreshing file status...}
 374                set cmd [list git update-index]
 375                lappend cmd -q
 376                lappend cmd --unmerged
 377                lappend cmd --ignore-missing
 378                lappend cmd --refresh
 379                set fd_rf [open "| $cmd" r]
 380                fconfigure $fd_rf -blocking 0 -translation binary
 381                fileevent $fd_rf readable \
 382                        [list rescan_stage2 $fd_rf $after]
 383        }
 384}
 385
 386proc rescan_stage2 {fd after} {
 387        global ui_status_value
 388        global rescan_active buf_rdi buf_rdf buf_rlo
 389
 390        if {$fd ne {}} {
 391                read $fd
 392                if {![eof $fd]} return
 393                close $fd
 394        }
 395
 396        set ls_others [list | git ls-files --others -z \
 397                --exclude-per-directory=.gitignore]
 398        set info_exclude [gitdir info exclude]
 399        if {[file readable $info_exclude]} {
 400                lappend ls_others "--exclude-from=$info_exclude"
 401        }
 402
 403        set buf_rdi {}
 404        set buf_rdf {}
 405        set buf_rlo {}
 406
 407        set rescan_active 3
 408        set ui_status_value {Scanning for modified files ...}
 409        set fd_di [open "| git diff-index --cached -z [PARENT]" r]
 410        set fd_df [open "| git diff-files -z" r]
 411        set fd_lo [open $ls_others r]
 412
 413        fconfigure $fd_di -blocking 0 -translation binary -encoding binary
 414        fconfigure $fd_df -blocking 0 -translation binary -encoding binary
 415        fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
 416        fileevent $fd_di readable [list read_diff_index $fd_di $after]
 417        fileevent $fd_df readable [list read_diff_files $fd_df $after]
 418        fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
 419}
 420
 421proc load_message {file} {
 422        global ui_comm
 423
 424        set f [gitdir $file]
 425        if {[file isfile $f]} {
 426                if {[catch {set fd [open $f r]}]} {
 427                        return 0
 428                }
 429                set content [string trim [read $fd]]
 430                close $fd
 431                regsub -all -line {[ \r\t]+$} $content {} content
 432                $ui_comm delete 0.0 end
 433                $ui_comm insert end $content
 434                return 1
 435        }
 436        return 0
 437}
 438
 439proc read_diff_index {fd after} {
 440        global buf_rdi
 441
 442        append buf_rdi [read $fd]
 443        set c 0
 444        set n [string length $buf_rdi]
 445        while {$c < $n} {
 446                set z1 [string first "\0" $buf_rdi $c]
 447                if {$z1 == -1} break
 448                incr z1
 449                set z2 [string first "\0" $buf_rdi $z1]
 450                if {$z2 == -1} break
 451
 452                incr c
 453                set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
 454                set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
 455                merge_state \
 456                        [encoding convertfrom $p] \
 457                        [lindex $i 4]? \
 458                        [list [lindex $i 0] [lindex $i 2]] \
 459                        [list]
 460                set c $z2
 461                incr c
 462        }
 463        if {$c < $n} {
 464                set buf_rdi [string range $buf_rdi $c end]
 465        } else {
 466                set buf_rdi {}
 467        }
 468
 469        rescan_done $fd buf_rdi $after
 470}
 471
 472proc read_diff_files {fd after} {
 473        global buf_rdf
 474
 475        append buf_rdf [read $fd]
 476        set c 0
 477        set n [string length $buf_rdf]
 478        while {$c < $n} {
 479                set z1 [string first "\0" $buf_rdf $c]
 480                if {$z1 == -1} break
 481                incr z1
 482                set z2 [string first "\0" $buf_rdf $z1]
 483                if {$z2 == -1} break
 484
 485                incr c
 486                set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
 487                set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
 488                merge_state \
 489                        [encoding convertfrom $p] \
 490                        ?[lindex $i 4] \
 491                        [list] \
 492                        [list [lindex $i 0] [lindex $i 2]]
 493                set c $z2
 494                incr c
 495        }
 496        if {$c < $n} {
 497                set buf_rdf [string range $buf_rdf $c end]
 498        } else {
 499                set buf_rdf {}
 500        }
 501
 502        rescan_done $fd buf_rdf $after
 503}
 504
 505proc read_ls_others {fd after} {
 506        global buf_rlo
 507
 508        append buf_rlo [read $fd]
 509        set pck [split $buf_rlo "\0"]
 510        set buf_rlo [lindex $pck end]
 511        foreach p [lrange $pck 0 end-1] {
 512                merge_state [encoding convertfrom $p] ?O
 513        }
 514        rescan_done $fd buf_rlo $after
 515}
 516
 517proc rescan_done {fd buf after} {
 518        global rescan_active
 519        global file_states repo_config
 520        upvar $buf to_clear
 521
 522        if {![eof $fd]} return
 523        set to_clear {}
 524        close $fd
 525        if {[incr rescan_active -1] > 0} return
 526
 527        prune_selection
 528        unlock_index
 529        display_all_files
 530        reshow_diff
 531        uplevel #0 $after
 532}
 533
 534proc prune_selection {} {
 535        global file_states selected_paths
 536
 537        foreach path [array names selected_paths] {
 538                if {[catch {set still_here $file_states($path)}]} {
 539                        unset selected_paths($path)
 540                }
 541        }
 542}
 543
 544######################################################################
 545##
 546## diff
 547
 548proc clear_diff {} {
 549        global ui_diff current_diff_path current_diff_header
 550        global ui_index ui_workdir
 551
 552        $ui_diff conf -state normal
 553        $ui_diff delete 0.0 end
 554        $ui_diff conf -state disabled
 555
 556        set current_diff_path {}
 557        set current_diff_header {}
 558
 559        $ui_index tag remove in_diff 0.0 end
 560        $ui_workdir tag remove in_diff 0.0 end
 561}
 562
 563proc reshow_diff {} {
 564        global ui_status_value file_states file_lists
 565        global current_diff_path current_diff_side
 566
 567        set p $current_diff_path
 568        if {$p eq {}
 569                || $current_diff_side eq {}
 570                || [catch {set s $file_states($p)}]
 571                || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
 572                clear_diff
 573        } else {
 574                show_diff $p $current_diff_side
 575        }
 576}
 577
 578proc handle_empty_diff {} {
 579        global current_diff_path file_states file_lists
 580
 581        set path $current_diff_path
 582        set s $file_states($path)
 583        if {[lindex $s 0] ne {_M}} return
 584
 585        info_popup "No differences detected.
 586
 587[short_path $path] has no changes.
 588
 589The modification date of this file was updated
 590by another application, but the content within
 591the file was not changed.
 592
 593A rescan will be automatically started to find
 594other files which may have the same state."
 595
 596        clear_diff
 597        display_file $path __
 598        rescan {set ui_status_value {Ready.}} 0
 599}
 600
 601proc show_diff {path w {lno {}}} {
 602        global file_states file_lists
 603        global is_3way_diff diff_active repo_config
 604        global ui_diff ui_status_value ui_index ui_workdir
 605        global current_diff_path current_diff_side current_diff_header
 606
 607        if {$diff_active || ![lock_index read]} return
 608
 609        clear_diff
 610        if {$lno == {}} {
 611                set lno [lsearch -sorted -exact $file_lists($w) $path]
 612                if {$lno >= 0} {
 613                        incr lno
 614                }
 615        }
 616        if {$lno >= 1} {
 617                $w tag add in_diff $lno.0 [expr {$lno + 1}].0
 618        }
 619
 620        set s $file_states($path)
 621        set m [lindex $s 0]
 622        set is_3way_diff 0
 623        set diff_active 1
 624        set current_diff_path $path
 625        set current_diff_side $w
 626        set current_diff_header {}
 627        set ui_status_value "Loading diff of [escape_path $path]..."
 628
 629        # - Git won't give us the diff, there's nothing to compare to!
 630        #
 631        if {$m eq {_O}} {
 632                set max_sz [expr {128 * 1024}]
 633                if {[catch {
 634                                set fd [open $path r]
 635                                set content [read $fd $max_sz]
 636                                close $fd
 637                                set sz [file size $path]
 638                        } err ]} {
 639                        set diff_active 0
 640                        unlock_index
 641                        set ui_status_value "Unable to display [escape_path $path]"
 642                        error_popup "Error loading file:\n\n$err"
 643                        return
 644                }
 645                $ui_diff conf -state normal
 646                if {![catch {set type [exec file $path]}]} {
 647                        set n [string length $path]
 648                        if {[string equal -length $n $path $type]} {
 649                                set type [string range $type $n end]
 650                                regsub {^:?\s*} $type {} type
 651                        }
 652                        $ui_diff insert end "* $type\n" d_@
 653                }
 654                if {[string first "\0" $content] != -1} {
 655                        $ui_diff insert end \
 656                                "* Binary file (not showing content)." \
 657                                d_@
 658                } else {
 659                        if {$sz > $max_sz} {
 660                                $ui_diff insert end \
 661"* Untracked file is $sz bytes.
 662* Showing only first $max_sz bytes.
 663" d_@
 664                        }
 665                        $ui_diff insert end $content
 666                        if {$sz > $max_sz} {
 667                                $ui_diff insert end "
 668* Untracked file clipped here by [appname].
 669* To see the entire file, use an external editor.
 670" d_@
 671                        }
 672                }
 673                $ui_diff conf -state disabled
 674                set diff_active 0
 675                unlock_index
 676                set ui_status_value {Ready.}
 677                return
 678        }
 679
 680        set cmd [list | git]
 681        if {$w eq $ui_index} {
 682                lappend cmd diff-index
 683                lappend cmd --cached
 684        } elseif {$w eq $ui_workdir} {
 685                if {[string index $m 0] eq {U}} {
 686                        lappend cmd diff
 687                } else {
 688                        lappend cmd diff-files
 689                }
 690        }
 691
 692        lappend cmd -p
 693        lappend cmd --no-color
 694        if {$repo_config(gui.diffcontext) > 0} {
 695                lappend cmd "-U$repo_config(gui.diffcontext)"
 696        }
 697        if {$w eq $ui_index} {
 698                lappend cmd [PARENT]
 699        }
 700        lappend cmd --
 701        lappend cmd $path
 702
 703        if {[catch {set fd [open $cmd r]} err]} {
 704                set diff_active 0
 705                unlock_index
 706                set ui_status_value "Unable to display [escape_path $path]"
 707                error_popup "Error loading diff:\n\n$err"
 708                return
 709        }
 710
 711        fconfigure $fd \
 712                -blocking 0 \
 713                -encoding binary \
 714                -translation binary
 715        fileevent $fd readable [list read_diff $fd]
 716}
 717
 718proc read_diff {fd} {
 719        global ui_diff ui_status_value diff_active
 720        global is_3way_diff current_diff_header
 721
 722        $ui_diff conf -state normal
 723        while {[gets $fd line] >= 0} {
 724                # -- Cleanup uninteresting diff header lines.
 725                #
 726                if {   [string match {diff --git *}      $line]
 727                        || [string match {diff --cc *}       $line]
 728                        || [string match {diff --combined *} $line]
 729                        || [string match {--- *}             $line]
 730                        || [string match {+++ *}             $line]} {
 731                        append current_diff_header $line "\n"
 732                        continue
 733                }
 734                if {[string match {index *} $line]} continue
 735                if {$line eq {deleted file mode 120000}} {
 736                        set line "deleted symlink"
 737                }
 738
 739                # -- Automatically detect if this is a 3 way diff.
 740                #
 741                if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 742
 743                if {[string match {mode *} $line]
 744                        || [string match {new file *} $line]
 745                        || [string match {deleted file *} $line]
 746                        || [string match {Binary files * and * differ} $line]
 747                        || $line eq {\ No newline at end of file}
 748                        || [regexp {^\* Unmerged path } $line]} {
 749                        set tags {}
 750                } elseif {$is_3way_diff} {
 751                        set op [string range $line 0 1]
 752                        switch -- $op {
 753                        {  } {set tags {}}
 754                        {@@} {set tags d_@}
 755                        { +} {set tags d_s+}
 756                        { -} {set tags d_s-}
 757                        {+ } {set tags d_+s}
 758                        {- } {set tags d_-s}
 759                        {--} {set tags d_--}
 760                        {++} {
 761                                if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
 762                                        set line [string replace $line 0 1 {  }]
 763                                        set tags d$op
 764                                } else {
 765                                        set tags d_++
 766                                }
 767                        }
 768                        default {
 769                                puts "error: Unhandled 3 way diff marker: {$op}"
 770                                set tags {}
 771                        }
 772                        }
 773                } else {
 774                        set op [string index $line 0]
 775                        switch -- $op {
 776                        { } {set tags {}}
 777                        {@} {set tags d_@}
 778                        {-} {set tags d_-}
 779                        {+} {
 780                                if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
 781                                        set line [string replace $line 0 0 { }]
 782                                        set tags d$op
 783                                } else {
 784                                        set tags d_+
 785                                }
 786                        }
 787                        default {
 788                                puts "error: Unhandled 2 way diff marker: {$op}"
 789                                set tags {}
 790                        }
 791                        }
 792                }
 793                $ui_diff insert end $line $tags
 794                if {[string index $line end] eq "\r"} {
 795                        $ui_diff tag add d_cr {end - 2c}
 796                }
 797                $ui_diff insert end "\n" $tags
 798        }
 799        $ui_diff conf -state disabled
 800
 801        if {[eof $fd]} {
 802                close $fd
 803                set diff_active 0
 804                unlock_index
 805                set ui_status_value {Ready.}
 806
 807                if {[$ui_diff index end] eq {2.0}} {
 808                        handle_empty_diff
 809                }
 810        }
 811}
 812
 813proc apply_hunk {x y} {
 814        global current_diff_path current_diff_header current_diff_side
 815        global ui_diff ui_index file_states
 816
 817        if {$current_diff_path eq {} || $current_diff_header eq {}} return
 818        if {![lock_index apply_hunk]} return
 819
 820        set apply_cmd {git apply --cached --whitespace=nowarn}
 821        set mi [lindex $file_states($current_diff_path) 0]
 822        if {$current_diff_side eq $ui_index} {
 823                set mode unstage
 824                lappend apply_cmd --reverse
 825                if {[string index $mi 0] ne {M}} {
 826                        unlock_index
 827                        return
 828                }
 829        } else {
 830                set mode stage
 831                if {[string index $mi 1] ne {M}} {
 832                        unlock_index
 833                        return
 834                }
 835        }
 836
 837        set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
 838        set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
 839        if {$s_lno eq {}} {
 840                unlock_index
 841                return
 842        }
 843
 844        set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
 845        if {$e_lno eq {}} {
 846                set e_lno end
 847        }
 848
 849        if {[catch {
 850                set p [open "| $apply_cmd" w]
 851                fconfigure $p -translation binary -encoding binary
 852                puts -nonewline $p $current_diff_header
 853                puts -nonewline $p [$ui_diff get $s_lno $e_lno]
 854                close $p} err]} {
 855                error_popup "Failed to $mode selected hunk.\n\n$err"
 856                unlock_index
 857                return
 858        }
 859
 860        $ui_diff conf -state normal
 861        $ui_diff delete $s_lno $e_lno
 862        $ui_diff conf -state disabled
 863
 864        if {[$ui_diff get 1.0 end] eq "\n"} {
 865                set o _
 866        } else {
 867                set o ?
 868        }
 869
 870        if {$current_diff_side eq $ui_index} {
 871                set mi ${o}M
 872        } elseif {[string index $mi 0] eq {_}} {
 873                set mi M$o
 874        } else {
 875                set mi ?$o
 876        }
 877        unlock_index
 878        display_file $current_diff_path $mi
 879        if {$o eq {_}} {
 880                clear_diff
 881        }
 882}
 883
 884######################################################################
 885##
 886## commit
 887
 888proc load_last_commit {} {
 889        global HEAD PARENT MERGE_HEAD commit_type ui_comm
 890        global repo_config
 891
 892        if {[llength $PARENT] == 0} {
 893                error_popup {There is nothing to amend.
 894
 895You are about to create the initial commit.
 896There is no commit before this to amend.
 897}
 898                return
 899        }
 900
 901        repository_state curType curHEAD curMERGE_HEAD
 902        if {$curType eq {merge}} {
 903                error_popup {Cannot amend while merging.
 904
 905You are currently in the middle of a merge that
 906has not been fully completed.  You cannot amend
 907the prior commit unless you first abort the
 908current merge activity.
 909}
 910                return
 911        }
 912
 913        set msg {}
 914        set parents [list]
 915        if {[catch {
 916                        set fd [open "| git cat-file commit $curHEAD" r]
 917                        fconfigure $fd -encoding binary -translation lf
 918                        if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 919                                set enc utf-8
 920                        }
 921                        while {[gets $fd line] > 0} {
 922                                if {[string match {parent *} $line]} {
 923                                        lappend parents [string range $line 7 end]
 924                                } elseif {[string match {encoding *} $line]} {
 925                                        set enc [string tolower [string range $line 9 end]]
 926                                }
 927                        }
 928                        fconfigure $fd -encoding $enc
 929                        set msg [string trim [read $fd]]
 930                        close $fd
 931                } err]} {
 932                error_popup "Error loading commit data for amend:\n\n$err"
 933                return
 934        }
 935
 936        set HEAD $curHEAD
 937        set PARENT $parents
 938        set MERGE_HEAD [list]
 939        switch -- [llength $parents] {
 940        0       {set commit_type amend-initial}
 941        1       {set commit_type amend}
 942        default {set commit_type amend-merge}
 943        }
 944
 945        $ui_comm delete 0.0 end
 946        $ui_comm insert end $msg
 947        $ui_comm edit reset
 948        $ui_comm edit modified false
 949        rescan {set ui_status_value {Ready.}}
 950}
 951
 952proc create_new_commit {} {
 953        global commit_type ui_comm
 954
 955        set commit_type normal
 956        $ui_comm delete 0.0 end
 957        $ui_comm edit reset
 958        $ui_comm edit modified false
 959        rescan {set ui_status_value {Ready.}}
 960}
 961
 962set GIT_COMMITTER_IDENT {}
 963
 964proc committer_ident {} {
 965        global GIT_COMMITTER_IDENT
 966
 967        if {$GIT_COMMITTER_IDENT eq {}} {
 968                if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
 969                        error_popup "Unable to obtain your identity:\n\n$err"
 970                        return {}
 971                }
 972                if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
 973                        $me me GIT_COMMITTER_IDENT]} {
 974                        error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
 975                        return {}
 976                }
 977        }
 978
 979        return $GIT_COMMITTER_IDENT
 980}
 981
 982proc commit_tree {} {
 983        global HEAD commit_type file_states ui_comm repo_config
 984        global ui_status_value pch_error
 985
 986        if {[committer_ident] eq {}} return
 987        if {![lock_index update]} return
 988
 989        # -- Our in memory state should match the repository.
 990        #
 991        repository_state curType curHEAD curMERGE_HEAD
 992        if {[string match amend* $commit_type]
 993                && $curType eq {normal}
 994                && $curHEAD eq $HEAD} {
 995        } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
 996                info_popup {Last scanned state does not match repository state.
 997
 998Another Git program has modified this repository
 999since the last scan.  A rescan must be performed
1000before another commit can be created.
1001
1002The rescan will be automatically started now.
1003}
1004                unlock_index
1005                rescan {set ui_status_value {Ready.}}
1006                return
1007        }
1008
1009        # -- At least one file should differ in the index.
1010        #
1011        set files_ready 0
1012        foreach path [array names file_states] {
1013                switch -glob -- [lindex $file_states($path) 0] {
1014                _? {continue}
1015                A? -
1016                D? -
1017                M? {set files_ready 1}
1018                U? {
1019                        error_popup "Unmerged files cannot be committed.
1020
1021File [short_path $path] has merge conflicts.
1022You must resolve them and add the file before committing.
1023"
1024                        unlock_index
1025                        return
1026                }
1027                default {
1028                        error_popup "Unknown file state [lindex $s 0] detected.
1029
1030File [short_path $path] cannot be committed by this program.
1031"
1032                }
1033                }
1034        }
1035        if {!$files_ready} {
1036                info_popup {No changes to commit.
1037
1038You must add at least 1 file before you can commit.
1039}
1040                unlock_index
1041                return
1042        }
1043
1044        # -- A message is required.
1045        #
1046        set msg [string trim [$ui_comm get 1.0 end]]
1047        regsub -all -line {[ \t\r]+$} $msg {} msg
1048        if {$msg eq {}} {
1049                error_popup {Please supply a commit message.
1050
1051A good commit message has the following format:
1052
1053- First line: Describe in one sentance what you did.
1054- Second line: Blank
1055- Remaining lines: Describe why this change is good.
1056}
1057                unlock_index
1058                return
1059        }
1060
1061        # -- Run the pre-commit hook.
1062        #
1063        set pchook [gitdir hooks pre-commit]
1064
1065        # On Cygwin [file executable] might lie so we need to ask
1066        # the shell if the hook is executable.  Yes that's annoying.
1067        #
1068        if {[is_Windows] && [file isfile $pchook]} {
1069                set pchook [list sh -c [concat \
1070                        "if test -x \"$pchook\";" \
1071                        "then exec \"$pchook\" 2>&1;" \
1072                        "fi"]]
1073        } elseif {[file executable $pchook]} {
1074                set pchook [list $pchook |& cat]
1075        } else {
1076                commit_writetree $curHEAD $msg
1077                return
1078        }
1079
1080        set ui_status_value {Calling pre-commit hook...}
1081        set pch_error {}
1082        set fd_ph [open "| $pchook" r]
1083        fconfigure $fd_ph -blocking 0 -translation binary
1084        fileevent $fd_ph readable \
1085                [list commit_prehook_wait $fd_ph $curHEAD $msg]
1086}
1087
1088proc commit_prehook_wait {fd_ph curHEAD msg} {
1089        global pch_error ui_status_value
1090
1091        append pch_error [read $fd_ph]
1092        fconfigure $fd_ph -blocking 1
1093        if {[eof $fd_ph]} {
1094                if {[catch {close $fd_ph}]} {
1095                        set ui_status_value {Commit declined by pre-commit hook.}
1096                        hook_failed_popup pre-commit $pch_error
1097                        unlock_index
1098                } else {
1099                        commit_writetree $curHEAD $msg
1100                }
1101                set pch_error {}
1102                return
1103        }
1104        fconfigure $fd_ph -blocking 0
1105}
1106
1107proc commit_writetree {curHEAD msg} {
1108        global ui_status_value
1109
1110        set ui_status_value {Committing changes...}
1111        set fd_wt [open "| git write-tree" r]
1112        fileevent $fd_wt readable \
1113                [list commit_committree $fd_wt $curHEAD $msg]
1114}
1115
1116proc commit_committree {fd_wt curHEAD msg} {
1117        global HEAD PARENT MERGE_HEAD commit_type
1118        global single_commit all_heads current_branch
1119        global ui_status_value ui_comm selected_commit_type
1120        global file_states selected_paths rescan_active
1121        global repo_config
1122
1123        gets $fd_wt tree_id
1124        if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1125                error_popup "write-tree failed:\n\n$err"
1126                set ui_status_value {Commit failed.}
1127                unlock_index
1128                return
1129        }
1130
1131        # -- Build the message.
1132        #
1133        set msg_p [gitdir COMMIT_EDITMSG]
1134        set msg_wt [open $msg_p w]
1135        if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
1136                set enc utf-8
1137        }
1138        fconfigure $msg_wt -encoding $enc -translation binary
1139        puts -nonewline $msg_wt $msg
1140        close $msg_wt
1141
1142        # -- Create the commit.
1143        #
1144        set cmd [list git commit-tree $tree_id]
1145        set parents [concat $PARENT $MERGE_HEAD]
1146        if {[llength $parents] > 0} {
1147                foreach p $parents {
1148                        lappend cmd -p $p
1149                }
1150        } else {
1151                # git commit-tree writes to stderr during initial commit.
1152                lappend cmd 2>/dev/null
1153        }
1154        lappend cmd <$msg_p
1155        if {[catch {set cmt_id [eval exec $cmd]} err]} {
1156                error_popup "commit-tree failed:\n\n$err"
1157                set ui_status_value {Commit failed.}
1158                unlock_index
1159                return
1160        }
1161
1162        # -- Update the HEAD ref.
1163        #
1164        set reflogm commit
1165        if {$commit_type ne {normal}} {
1166                append reflogm " ($commit_type)"
1167        }
1168        set i [string first "\n" $msg]
1169        if {$i >= 0} {
1170                append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1171        } else {
1172                append reflogm {: } $msg
1173        }
1174        set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1175        if {[catch {eval exec $cmd} err]} {
1176                error_popup "update-ref failed:\n\n$err"
1177                set ui_status_value {Commit failed.}
1178                unlock_index
1179                return
1180        }
1181
1182        # -- Make sure our current branch exists.
1183        #
1184        if {$commit_type eq {initial}} {
1185                lappend all_heads $current_branch
1186                set all_heads [lsort -unique $all_heads]
1187                populate_branch_menu
1188        }
1189
1190        # -- Cleanup after ourselves.
1191        #
1192        catch {file delete $msg_p}
1193        catch {file delete [gitdir MERGE_HEAD]}
1194        catch {file delete [gitdir MERGE_MSG]}
1195        catch {file delete [gitdir SQUASH_MSG]}
1196        catch {file delete [gitdir GITGUI_MSG]}
1197
1198        # -- Let rerere do its thing.
1199        #
1200        if {[file isdirectory [gitdir rr-cache]]} {
1201                catch {exec git rerere}
1202        }
1203
1204        # -- Run the post-commit hook.
1205        #
1206        set pchook [gitdir hooks post-commit]
1207        if {[is_Windows] && [file isfile $pchook]} {
1208                set pchook [list sh -c [concat \
1209                        "if test -x \"$pchook\";" \
1210                        "then exec \"$pchook\";" \
1211                        "fi"]]
1212        } elseif {![file executable $pchook]} {
1213                set pchook {}
1214        }
1215        if {$pchook ne {}} {
1216                catch {exec $pchook &}
1217        }
1218
1219        $ui_comm delete 0.0 end
1220        $ui_comm edit reset
1221        $ui_comm edit modified false
1222
1223        if {$single_commit} do_quit
1224
1225        # -- Update in memory status
1226        #
1227        set selected_commit_type new
1228        set commit_type normal
1229        set HEAD $cmt_id
1230        set PARENT $cmt_id
1231        set MERGE_HEAD [list]
1232
1233        foreach path [array names file_states] {
1234                set s $file_states($path)
1235                set m [lindex $s 0]
1236                switch -glob -- $m {
1237                _O -
1238                _M -
1239                _D {continue}
1240                __ -
1241                A_ -
1242                M_ -
1243                D_ {
1244                        unset file_states($path)
1245                        catch {unset selected_paths($path)}
1246                }
1247                DO {
1248                        set file_states($path) [list _O [lindex $s 1] {} {}]
1249                }
1250                AM -
1251                AD -
1252                MM -
1253                MD {
1254                        set file_states($path) [list \
1255                                _[string index $m 1] \
1256                                [lindex $s 1] \
1257                                [lindex $s 3] \
1258                                {}]
1259                }
1260                }
1261        }
1262
1263        display_all_files
1264        unlock_index
1265        reshow_diff
1266        set ui_status_value \
1267                "Changes committed as [string range $cmt_id 0 7]."
1268}
1269
1270######################################################################
1271##
1272## fetch push
1273
1274proc fetch_from {remote} {
1275        set w [new_console \
1276                "fetch $remote" \
1277                "Fetching new changes from $remote"]
1278        set cmd [list git fetch]
1279        lappend cmd $remote
1280        console_exec $w $cmd console_done
1281}
1282
1283proc push_to {remote} {
1284        set w [new_console \
1285                "push $remote" \
1286                "Pushing changes to $remote"]
1287        set cmd [list git push]
1288        lappend cmd -v
1289        lappend cmd $remote
1290        console_exec $w $cmd console_done
1291}
1292
1293######################################################################
1294##
1295## ui helpers
1296
1297proc mapicon {w state path} {
1298        global all_icons
1299
1300        if {[catch {set r $all_icons($state$w)}]} {
1301                puts "error: no icon for $w state={$state} $path"
1302                return file_plain
1303        }
1304        return $r
1305}
1306
1307proc mapdesc {state path} {
1308        global all_descs
1309
1310        if {[catch {set r $all_descs($state)}]} {
1311                puts "error: no desc for state={$state} $path"
1312                return $state
1313        }
1314        return $r
1315}
1316
1317proc escape_path {path} {
1318        regsub -all "\n" $path "\\n" path
1319        return $path
1320}
1321
1322proc short_path {path} {
1323        return [escape_path [lindex [file split $path] end]]
1324}
1325
1326set next_icon_id 0
1327set null_sha1 [string repeat 0 40]
1328
1329proc merge_state {path new_state {head_info {}} {index_info {}}} {
1330        global file_states next_icon_id null_sha1
1331
1332        set s0 [string index $new_state 0]
1333        set s1 [string index $new_state 1]
1334
1335        if {[catch {set info $file_states($path)}]} {
1336                set state __
1337                set icon n[incr next_icon_id]
1338        } else {
1339                set state [lindex $info 0]
1340                set icon [lindex $info 1]
1341                if {$head_info eq {}}  {set head_info  [lindex $info 2]}
1342                if {$index_info eq {}} {set index_info [lindex $info 3]}
1343        }
1344
1345        if     {$s0 eq {?}} {set s0 [string index $state 0]} \
1346        elseif {$s0 eq {_}} {set s0 _}
1347
1348        if     {$s1 eq {?}} {set s1 [string index $state 1]} \
1349        elseif {$s1 eq {_}} {set s1 _}
1350
1351        if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1352                set head_info [list 0 $null_sha1]
1353        } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1354                && $head_info eq {}} {
1355                set head_info $index_info
1356        }
1357
1358        set file_states($path) [list $s0$s1 $icon \
1359                $head_info $index_info \
1360                ]
1361        return $state
1362}
1363
1364proc display_file_helper {w path icon_name old_m new_m} {
1365        global file_lists
1366
1367        if {$new_m eq {_}} {
1368                set lno [lsearch -sorted -exact $file_lists($w) $path]
1369                if {$lno >= 0} {
1370                        set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1371                        incr lno
1372                        $w conf -state normal
1373                        $w delete $lno.0 [expr {$lno + 1}].0
1374                        $w conf -state disabled
1375                }
1376        } elseif {$old_m eq {_} && $new_m ne {_}} {
1377                lappend file_lists($w) $path
1378                set file_lists($w) [lsort -unique $file_lists($w)]
1379                set lno [lsearch -sorted -exact $file_lists($w) $path]
1380                incr lno
1381                $w conf -state normal
1382                $w image create $lno.0 \
1383                        -align center -padx 5 -pady 1 \
1384                        -name $icon_name \
1385                        -image [mapicon $w $new_m $path]
1386                $w insert $lno.1 "[escape_path $path]\n"
1387                $w conf -state disabled
1388        } elseif {$old_m ne $new_m} {
1389                $w conf -state normal
1390                $w image conf $icon_name -image [mapicon $w $new_m $path]
1391                $w conf -state disabled
1392        }
1393}
1394
1395proc display_file {path state} {
1396        global file_states selected_paths
1397        global ui_index ui_workdir
1398
1399        set old_m [merge_state $path $state]
1400        set s $file_states($path)
1401        set new_m [lindex $s 0]
1402        set icon_name [lindex $s 1]
1403
1404        set o [string index $old_m 0]
1405        set n [string index $new_m 0]
1406        if {$o eq {U}} {
1407                set o _
1408        }
1409        if {$n eq {U}} {
1410                set n _
1411        }
1412        display_file_helper     $ui_index $path $icon_name $o $n
1413
1414        if {[string index $old_m 0] eq {U}} {
1415                set o U
1416        } else {
1417                set o [string index $old_m 1]
1418        }
1419        if {[string index $new_m 0] eq {U}} {
1420                set n U
1421        } else {
1422                set n [string index $new_m 1]
1423        }
1424        display_file_helper     $ui_workdir $path $icon_name $o $n
1425
1426        if {$new_m eq {__}} {
1427                unset file_states($path)
1428                catch {unset selected_paths($path)}
1429        }
1430}
1431
1432proc display_all_files_helper {w path icon_name m} {
1433        global file_lists
1434
1435        lappend file_lists($w) $path
1436        set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1437        $w image create end \
1438                -align center -padx 5 -pady 1 \
1439                -name $icon_name \
1440                -image [mapicon $w $m $path]
1441        $w insert end "[escape_path $path]\n"
1442}
1443
1444proc display_all_files {} {
1445        global ui_index ui_workdir
1446        global file_states file_lists
1447        global last_clicked
1448
1449        $ui_index conf -state normal
1450        $ui_workdir conf -state normal
1451
1452        $ui_index delete 0.0 end
1453        $ui_workdir delete 0.0 end
1454        set last_clicked {}
1455
1456        set file_lists($ui_index) [list]
1457        set file_lists($ui_workdir) [list]
1458
1459        foreach path [lsort [array names file_states]] {
1460                set s $file_states($path)
1461                set m [lindex $s 0]
1462                set icon_name [lindex $s 1]
1463
1464                set s [string index $m 0]
1465                if {$s ne {U} && $s ne {_}} {
1466                        display_all_files_helper $ui_index $path \
1467                                $icon_name $s
1468                }
1469
1470                if {[string index $m 0] eq {U}} {
1471                        set s U
1472                } else {
1473                        set s [string index $m 1]
1474                }
1475                if {$s ne {_}} {
1476                        display_all_files_helper $ui_workdir $path \
1477                                $icon_name $s
1478                }
1479        }
1480
1481        $ui_index conf -state disabled
1482        $ui_workdir conf -state disabled
1483}
1484
1485proc update_indexinfo {msg pathList after} {
1486        global update_index_cp ui_status_value
1487
1488        if {![lock_index update]} return
1489
1490        set update_index_cp 0
1491        set pathList [lsort $pathList]
1492        set totalCnt [llength $pathList]
1493        set batch [expr {int($totalCnt * .01) + 1}]
1494        if {$batch > 25} {set batch 25}
1495
1496        set ui_status_value [format \
1497                "$msg... %i/%i files (%.2f%%)" \
1498                $update_index_cp \
1499                $totalCnt \
1500                0.0]
1501        set fd [open "| git update-index -z --index-info" w]
1502        fconfigure $fd \
1503                -blocking 0 \
1504                -buffering full \
1505                -buffersize 512 \
1506                -encoding binary \
1507                -translation binary
1508        fileevent $fd writable [list \
1509                write_update_indexinfo \
1510                $fd \
1511                $pathList \
1512                $totalCnt \
1513                $batch \
1514                $msg \
1515                $after \
1516                ]
1517}
1518
1519proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1520        global update_index_cp ui_status_value
1521        global file_states current_diff_path
1522
1523        if {$update_index_cp >= $totalCnt} {
1524                close $fd
1525                unlock_index
1526                uplevel #0 $after
1527                return
1528        }
1529
1530        for {set i $batch} \
1531                {$update_index_cp < $totalCnt && $i > 0} \
1532                {incr i -1} {
1533                set path [lindex $pathList $update_index_cp]
1534                incr update_index_cp
1535
1536                set s $file_states($path)
1537                switch -glob -- [lindex $s 0] {
1538                A? {set new _O}
1539                M? {set new _M}
1540                D_ {set new _D}
1541                D? {set new _?}
1542                ?? {continue}
1543                }
1544                set info [lindex $s 2]
1545                if {$info eq {}} continue
1546
1547                puts -nonewline $fd "$info\t[encoding convertto $path]\0"
1548                display_file $path $new
1549        }
1550
1551        set ui_status_value [format \
1552                "$msg... %i/%i files (%.2f%%)" \
1553                $update_index_cp \
1554                $totalCnt \
1555                [expr {100.0 * $update_index_cp / $totalCnt}]]
1556}
1557
1558proc update_index {msg pathList after} {
1559        global update_index_cp ui_status_value
1560
1561        if {![lock_index update]} return
1562
1563        set update_index_cp 0
1564        set pathList [lsort $pathList]
1565        set totalCnt [llength $pathList]
1566        set batch [expr {int($totalCnt * .01) + 1}]
1567        if {$batch > 25} {set batch 25}
1568
1569        set ui_status_value [format \
1570                "$msg... %i/%i files (%.2f%%)" \
1571                $update_index_cp \
1572                $totalCnt \
1573                0.0]
1574        set fd [open "| git update-index --add --remove -z --stdin" w]
1575        fconfigure $fd \
1576                -blocking 0 \
1577                -buffering full \
1578                -buffersize 512 \
1579                -encoding binary \
1580                -translation binary
1581        fileevent $fd writable [list \
1582                write_update_index \
1583                $fd \
1584                $pathList \
1585                $totalCnt \
1586                $batch \
1587                $msg \
1588                $after \
1589                ]
1590}
1591
1592proc write_update_index {fd pathList totalCnt batch msg after} {
1593        global update_index_cp ui_status_value
1594        global file_states current_diff_path
1595
1596        if {$update_index_cp >= $totalCnt} {
1597                close $fd
1598                unlock_index
1599                uplevel #0 $after
1600                return
1601        }
1602
1603        for {set i $batch} \
1604                {$update_index_cp < $totalCnt && $i > 0} \
1605                {incr i -1} {
1606                set path [lindex $pathList $update_index_cp]
1607                incr update_index_cp
1608
1609                switch -glob -- [lindex $file_states($path) 0] {
1610                AD {set new __}
1611                ?D {set new D_}
1612                _O -
1613                AM {set new A_}
1614                U? {
1615                        if {[file exists $path]} {
1616                                set new M_
1617                        } else {
1618                                set new D_
1619                        }
1620                }
1621                ?M {set new M_}
1622                ?? {continue}
1623                }
1624                puts -nonewline $fd "[encoding convertto $path]\0"
1625                display_file $path $new
1626        }
1627
1628        set ui_status_value [format \
1629                "$msg... %i/%i files (%.2f%%)" \
1630                $update_index_cp \
1631                $totalCnt \
1632                [expr {100.0 * $update_index_cp / $totalCnt}]]
1633}
1634
1635proc checkout_index {msg pathList after} {
1636        global update_index_cp ui_status_value
1637
1638        if {![lock_index update]} return
1639
1640        set update_index_cp 0
1641        set pathList [lsort $pathList]
1642        set totalCnt [llength $pathList]
1643        set batch [expr {int($totalCnt * .01) + 1}]
1644        if {$batch > 25} {set batch 25}
1645
1646        set ui_status_value [format \
1647                "$msg... %i/%i files (%.2f%%)" \
1648                $update_index_cp \
1649                $totalCnt \
1650                0.0]
1651        set cmd [list git checkout-index]
1652        lappend cmd --index
1653        lappend cmd --quiet
1654        lappend cmd --force
1655        lappend cmd -z
1656        lappend cmd --stdin
1657        set fd [open "| $cmd " w]
1658        fconfigure $fd \
1659                -blocking 0 \
1660                -buffering full \
1661                -buffersize 512 \
1662                -encoding binary \
1663                -translation binary
1664        fileevent $fd writable [list \
1665                write_checkout_index \
1666                $fd \
1667                $pathList \
1668                $totalCnt \
1669                $batch \
1670                $msg \
1671                $after \
1672                ]
1673}
1674
1675proc write_checkout_index {fd pathList totalCnt batch msg after} {
1676        global update_index_cp ui_status_value
1677        global file_states current_diff_path
1678
1679        if {$update_index_cp >= $totalCnt} {
1680                close $fd
1681                unlock_index
1682                uplevel #0 $after
1683                return
1684        }
1685
1686        for {set i $batch} \
1687                {$update_index_cp < $totalCnt && $i > 0} \
1688                {incr i -1} {
1689                set path [lindex $pathList $update_index_cp]
1690                incr update_index_cp
1691                switch -glob -- [lindex $file_states($path) 0] {
1692                U? {continue}
1693                ?M -
1694                ?D {
1695                        puts -nonewline $fd "[encoding convertto $path]\0"
1696                        display_file $path ?_
1697                }
1698                }
1699        }
1700
1701        set ui_status_value [format \
1702                "$msg... %i/%i files (%.2f%%)" \
1703                $update_index_cp \
1704                $totalCnt \
1705                [expr {100.0 * $update_index_cp / $totalCnt}]]
1706}
1707
1708######################################################################
1709##
1710## branch management
1711
1712proc is_tracking_branch {name} {
1713        global tracking_branches
1714
1715        if {![catch {set info $tracking_branches($name)}]} {
1716                return 1
1717        }
1718        foreach t [array names tracking_branches] {
1719                if {[string match {*/\*} $t] && [string match $t $name]} {
1720                        return 1
1721                }
1722        }
1723        return 0
1724}
1725
1726proc load_all_heads {} {
1727        global all_heads
1728
1729        set all_heads [list]
1730        set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
1731        while {[gets $fd line] > 0} {
1732                if {[is_tracking_branch $line]} continue
1733                if {![regsub ^refs/heads/ $line {} name]} continue
1734                lappend all_heads $name
1735        }
1736        close $fd
1737
1738        set all_heads [lsort $all_heads]
1739}
1740
1741proc populate_branch_menu {} {
1742        global all_heads disable_on_lock
1743
1744        set m .mbar.branch
1745        set last [$m index last]
1746        for {set i 0} {$i <= $last} {incr i} {
1747                if {[$m type $i] eq {separator}} {
1748                        $m delete $i last
1749                        set new_dol [list]
1750                        foreach a $disable_on_lock {
1751                                if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1752                                        lappend new_dol $a
1753                                }
1754                        }
1755                        set disable_on_lock $new_dol
1756                        break
1757                }
1758        }
1759
1760        if {$all_heads ne {}} {
1761                $m add separator
1762        }
1763        foreach b $all_heads {
1764                $m add radiobutton \
1765                        -label $b \
1766                        -command [list switch_branch $b] \
1767                        -variable current_branch \
1768                        -value $b \
1769                        -font font_ui
1770                lappend disable_on_lock \
1771                        [list $m entryconf [$m index last] -state]
1772        }
1773}
1774
1775proc all_tracking_branches {} {
1776        global tracking_branches
1777
1778        set all_trackings {}
1779        set cmd {}
1780        foreach name [array names tracking_branches] {
1781                if {[regsub {/\*$} $name {} name]} {
1782                        lappend cmd $name
1783                } else {
1784                        regsub ^refs/(heads|remotes)/ $name {} name
1785                        lappend all_trackings $name
1786                }
1787        }
1788
1789        if {$cmd ne {}} {
1790                set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
1791                while {[gets $fd name] > 0} {
1792                        regsub ^refs/(heads|remotes)/ $name {} name
1793                        lappend all_trackings $name
1794                }
1795                close $fd
1796        }
1797
1798        return [lsort -unique $all_trackings]
1799}
1800
1801proc do_create_branch_action {w} {
1802        global all_heads null_sha1 repo_config
1803        global create_branch_checkout create_branch_revtype
1804        global create_branch_head create_branch_trackinghead
1805        global create_branch_name create_branch_revexp
1806
1807        set newbranch $create_branch_name
1808        if {$newbranch eq {}
1809                || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1810                tk_messageBox \
1811                        -icon error \
1812                        -type ok \
1813                        -title [wm title $w] \
1814                        -parent $w \
1815                        -message "Please supply a branch name."
1816                focus $w.desc.name_t
1817                return
1818        }
1819        if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1820                tk_messageBox \
1821                        -icon error \
1822                        -type ok \
1823                        -title [wm title $w] \
1824                        -parent $w \
1825                        -message "Branch '$newbranch' already exists."
1826                focus $w.desc.name_t
1827                return
1828        }
1829        if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1830                tk_messageBox \
1831                        -icon error \
1832                        -type ok \
1833                        -title [wm title $w] \
1834                        -parent $w \
1835                        -message "We do not like '$newbranch' as a branch name."
1836                focus $w.desc.name_t
1837                return
1838        }
1839
1840        set rev {}
1841        switch -- $create_branch_revtype {
1842        head {set rev $create_branch_head}
1843        tracking {set rev $create_branch_trackinghead}
1844        expression {set rev $create_branch_revexp}
1845        }
1846        if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1847                tk_messageBox \
1848                        -icon error \
1849                        -type ok \
1850                        -title [wm title $w] \
1851                        -parent $w \
1852                        -message "Invalid starting revision: $rev"
1853                return
1854        }
1855        set cmd [list git update-ref]
1856        lappend cmd -m
1857        lappend cmd "branch: Created from $rev"
1858        lappend cmd "refs/heads/$newbranch"
1859        lappend cmd $cmt
1860        lappend cmd $null_sha1
1861        if {[catch {eval exec $cmd} err]} {
1862                tk_messageBox \
1863                        -icon error \
1864                        -type ok \
1865                        -title [wm title $w] \
1866                        -parent $w \
1867                        -message "Failed to create '$newbranch'.\n\n$err"
1868                return
1869        }
1870
1871        lappend all_heads $newbranch
1872        set all_heads [lsort $all_heads]
1873        populate_branch_menu
1874        destroy $w
1875        if {$create_branch_checkout} {
1876                switch_branch $newbranch
1877        }
1878}
1879
1880proc radio_selector {varname value args} {
1881        upvar #0 $varname var
1882        set var $value
1883}
1884
1885trace add variable create_branch_head write \
1886        [list radio_selector create_branch_revtype head]
1887trace add variable create_branch_trackinghead write \
1888        [list radio_selector create_branch_revtype tracking]
1889
1890trace add variable delete_branch_head write \
1891        [list radio_selector delete_branch_checktype head]
1892trace add variable delete_branch_trackinghead write \
1893        [list radio_selector delete_branch_checktype tracking]
1894
1895proc do_create_branch {} {
1896        global all_heads current_branch repo_config
1897        global create_branch_checkout create_branch_revtype
1898        global create_branch_head create_branch_trackinghead
1899        global create_branch_name create_branch_revexp
1900
1901        set w .branch_editor
1902        toplevel $w
1903        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1904
1905        label $w.header -text {Create New Branch} \
1906                -font font_uibold
1907        pack $w.header -side top -fill x
1908
1909        frame $w.buttons
1910        button $w.buttons.create -text Create \
1911                -font font_ui \
1912                -default active \
1913                -command [list do_create_branch_action $w]
1914        pack $w.buttons.create -side right
1915        button $w.buttons.cancel -text {Cancel} \
1916                -font font_ui \
1917                -command [list destroy $w]
1918        pack $w.buttons.cancel -side right -padx 5
1919        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1920
1921        labelframe $w.desc \
1922                -text {Branch Description} \
1923                -font font_ui
1924        label $w.desc.name_l -text {Name:} -font font_ui
1925        entry $w.desc.name_t \
1926                -borderwidth 1 \
1927                -relief sunken \
1928                -width 40 \
1929                -textvariable create_branch_name \
1930                -font font_ui \
1931                -validate key \
1932                -validatecommand {
1933                        if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
1934                        return 1
1935                }
1936        grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
1937        grid columnconfigure $w.desc 1 -weight 1
1938        pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1939
1940        labelframe $w.from \
1941                -text {Starting Revision} \
1942                -font font_ui
1943        radiobutton $w.from.head_r \
1944                -text {Local Branch:} \
1945                -value head \
1946                -variable create_branch_revtype \
1947                -font font_ui
1948        eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1949        grid $w.from.head_r $w.from.head_m -sticky w
1950        set all_trackings [all_tracking_branches]
1951        if {$all_trackings ne {}} {
1952                set create_branch_trackinghead [lindex $all_trackings 0]
1953                radiobutton $w.from.tracking_r \
1954                        -text {Tracking Branch:} \
1955                        -value tracking \
1956                        -variable create_branch_revtype \
1957                        -font font_ui
1958                eval tk_optionMenu $w.from.tracking_m \
1959                        create_branch_trackinghead \
1960                        $all_trackings
1961                grid $w.from.tracking_r $w.from.tracking_m -sticky w
1962        }
1963        radiobutton $w.from.exp_r \
1964                -text {Revision Expression:} \
1965                -value expression \
1966                -variable create_branch_revtype \
1967                -font font_ui
1968        entry $w.from.exp_t \
1969                -borderwidth 1 \
1970                -relief sunken \
1971                -width 50 \
1972                -textvariable create_branch_revexp \
1973                -font font_ui \
1974                -validate key \
1975                -validatecommand {
1976                        if {%d == 1 && [regexp {\s} %S]} {return 0}
1977                        if {%d == 1 && [string length %S] > 0} {
1978                                set create_branch_revtype expression
1979                        }
1980                        return 1
1981                }
1982        grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
1983        grid columnconfigure $w.from 1 -weight 1
1984        pack $w.from -anchor nw -fill x -pady 5 -padx 5
1985
1986        labelframe $w.postActions \
1987                -text {Post Creation Actions} \
1988                -font font_ui
1989        checkbutton $w.postActions.checkout \
1990                -text {Checkout after creation} \
1991                -variable create_branch_checkout \
1992                -font font_ui
1993        pack $w.postActions.checkout -anchor nw
1994        pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1995
1996        set create_branch_checkout 1
1997        set create_branch_head $current_branch
1998        set create_branch_revtype head
1999        set create_branch_name $repo_config(gui.newbranchtemplate)
2000        set create_branch_revexp {}
2001
2002        bind $w <Visibility> "
2003                grab $w
2004                $w.desc.name_t icursor end
2005                focus $w.desc.name_t
2006        "
2007        bind $w <Key-Escape> "destroy $w"
2008        bind $w <Key-Return> "do_create_branch_action $w;break"
2009        wm title $w "[appname] ([reponame]): Create Branch"
2010        tkwait window $w
2011}
2012
2013proc do_delete_branch_action {w} {
2014        global all_heads
2015        global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2016
2017        set check_rev {}
2018        switch -- $delete_branch_checktype {
2019        head {set check_rev $delete_branch_head}
2020        tracking {set check_rev $delete_branch_trackinghead}
2021        always {set check_rev {:none}}
2022        }
2023        if {$check_rev eq {:none}} {
2024                set check_cmt {}
2025        } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
2026                tk_messageBox \
2027                        -icon error \
2028                        -type ok \
2029                        -title [wm title $w] \
2030                        -parent $w \
2031                        -message "Invalid check revision: $check_rev"
2032                return
2033        }
2034
2035        set to_delete [list]
2036        set not_merged [list]
2037        foreach i [$w.list.l curselection] {
2038                set b [$w.list.l get $i]
2039                if {[catch {set o [exec git rev-parse --verify $b]}]} continue
2040                if {$check_cmt ne {}} {
2041                        if {$b eq $check_rev} continue
2042                        if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
2043                        if {$o ne $m} {
2044                                lappend not_merged $b
2045                                continue
2046                        }
2047                }
2048                lappend to_delete [list $b $o]
2049        }
2050        if {$not_merged ne {}} {
2051                set msg "The following branches are not completely merged into $check_rev:
2052
2053 - [join $not_merged "\n - "]"
2054                tk_messageBox \
2055                        -icon info \
2056                        -type ok \
2057                        -title [wm title $w] \
2058                        -parent $w \
2059                        -message $msg
2060        }
2061        if {$to_delete eq {}} return
2062        if {$delete_branch_checktype eq {always}} {
2063                set msg {Recovering deleted branches is difficult.
2064
2065Delete the selected branches?}
2066                if {[tk_messageBox \
2067                        -icon warning \
2068                        -type yesno \
2069                        -title [wm title $w] \
2070                        -parent $w \
2071                        -message $msg] ne yes} {
2072                        return
2073                }
2074        }
2075
2076        set failed {}
2077        foreach i $to_delete {
2078                set b [lindex $i 0]
2079                set o [lindex $i 1]
2080                if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
2081                        append failed " - $b: $err\n"
2082                } else {
2083                        set x [lsearch -sorted -exact $all_heads $b]
2084                        if {$x >= 0} {
2085                                set all_heads [lreplace $all_heads $x $x]
2086                        }
2087                }
2088        }
2089
2090        if {$failed ne {}} {
2091                tk_messageBox \
2092                        -icon error \
2093                        -type ok \
2094                        -title [wm title $w] \
2095                        -parent $w \
2096                        -message "Failed to delete branches:\n$failed"
2097        }
2098
2099        set all_heads [lsort $all_heads]
2100        populate_branch_menu
2101        destroy $w
2102}
2103
2104proc do_delete_branch {} {
2105        global all_heads tracking_branches current_branch
2106        global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2107
2108        set w .branch_editor
2109        toplevel $w
2110        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2111
2112        label $w.header -text {Delete Local Branch} \
2113                -font font_uibold
2114        pack $w.header -side top -fill x
2115
2116        frame $w.buttons
2117        button $w.buttons.create -text Delete \
2118                -font font_ui \
2119                -command [list do_delete_branch_action $w]
2120        pack $w.buttons.create -side right
2121        button $w.buttons.cancel -text {Cancel} \
2122                -font font_ui \
2123                -command [list destroy $w]
2124        pack $w.buttons.cancel -side right -padx 5
2125        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2126
2127        labelframe $w.list \
2128                -text {Local Branches} \
2129                -font font_ui
2130        listbox $w.list.l \
2131                -height 10 \
2132                -width 50 \
2133                -selectmode extended \
2134                -font font_ui
2135        foreach h $all_heads {
2136                if {$h ne $current_branch} {
2137                        $w.list.l insert end $h
2138                }
2139        }
2140        pack $w.list.l -fill both -pady 5 -padx 5
2141        pack $w.list -fill both -pady 5 -padx 5
2142
2143        labelframe $w.validate \
2144                -text {Delete Only If} \
2145                -font font_ui
2146        radiobutton $w.validate.head_r \
2147                -text {Merged Into Local Branch:} \
2148                -value head \
2149                -variable delete_branch_checktype \
2150                -font font_ui
2151        eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2152        grid $w.validate.head_r $w.validate.head_m -sticky w
2153        set all_trackings [all_tracking_branches]
2154        if {$all_trackings ne {}} {
2155                set delete_branch_trackinghead [lindex $all_trackings 0]
2156                radiobutton $w.validate.tracking_r \
2157                        -text {Merged Into Tracking Branch:} \
2158                        -value tracking \
2159                        -variable delete_branch_checktype \
2160                        -font font_ui
2161                eval tk_optionMenu $w.validate.tracking_m \
2162                        delete_branch_trackinghead \
2163                        $all_trackings
2164                grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2165        }
2166        radiobutton $w.validate.always_r \
2167                -text {Always (Do not perform merge checks)} \
2168                -value always \
2169                -variable delete_branch_checktype \
2170                -font font_ui
2171        grid $w.validate.always_r -columnspan 2 -sticky w
2172        grid columnconfigure $w.validate 1 -weight 1
2173        pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2174
2175        set delete_branch_head $current_branch
2176        set delete_branch_checktype head
2177
2178        bind $w <Visibility> "grab $w; focus $w"
2179        bind $w <Key-Escape> "destroy $w"
2180        wm title $w "[appname] ([reponame]): Delete Branch"
2181        tkwait window $w
2182}
2183
2184proc switch_branch {new_branch} {
2185        global HEAD commit_type current_branch repo_config
2186
2187        if {![lock_index switch]} return
2188
2189        # -- Our in memory state should match the repository.
2190        #
2191        repository_state curType curHEAD curMERGE_HEAD
2192        if {[string match amend* $commit_type]
2193                && $curType eq {normal}
2194                && $curHEAD eq $HEAD} {
2195        } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2196                info_popup {Last scanned state does not match repository state.
2197
2198Another Git program has modified this repository
2199since the last scan.  A rescan must be performed
2200before the current branch can be changed.
2201
2202The rescan will be automatically started now.
2203}
2204                unlock_index
2205                rescan {set ui_status_value {Ready.}}
2206                return
2207        }
2208
2209        # -- Don't do a pointless switch.
2210        #
2211        if {$current_branch eq $new_branch} {
2212                unlock_index
2213                return
2214        }
2215
2216        if {$repo_config(gui.trustmtime) eq {true}} {
2217                switch_branch_stage2 {} $new_branch
2218        } else {
2219                set ui_status_value {Refreshing file status...}
2220                set cmd [list git update-index]
2221                lappend cmd -q
2222                lappend cmd --unmerged
2223                lappend cmd --ignore-missing
2224                lappend cmd --refresh
2225                set fd_rf [open "| $cmd" r]
2226                fconfigure $fd_rf -blocking 0 -translation binary
2227                fileevent $fd_rf readable \
2228                        [list switch_branch_stage2 $fd_rf $new_branch]
2229        }
2230}
2231
2232proc switch_branch_stage2 {fd_rf new_branch} {
2233        global ui_status_value HEAD
2234
2235        if {$fd_rf ne {}} {
2236                read $fd_rf
2237                if {![eof $fd_rf]} return
2238                close $fd_rf
2239        }
2240
2241        set ui_status_value "Updating working directory to '$new_branch'..."
2242        set cmd [list git read-tree]
2243        lappend cmd -m
2244        lappend cmd -u
2245        lappend cmd --exclude-per-directory=.gitignore
2246        lappend cmd $HEAD
2247        lappend cmd $new_branch
2248        set fd_rt [open "| $cmd" r]
2249        fconfigure $fd_rt -blocking 0 -translation binary
2250        fileevent $fd_rt readable \
2251                [list switch_branch_readtree_wait $fd_rt $new_branch]
2252}
2253
2254proc switch_branch_readtree_wait {fd_rt new_branch} {
2255        global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
2256        global current_branch
2257        global ui_comm ui_status_value
2258
2259        # -- We never get interesting output on stdout; only stderr.
2260        #
2261        read $fd_rt
2262        fconfigure $fd_rt -blocking 1
2263        if {![eof $fd_rt]} {
2264                fconfigure $fd_rt -blocking 0
2265                return
2266        }
2267
2268        # -- The working directory wasn't in sync with the index and
2269        #    we'd have to overwrite something to make the switch. A
2270        #    merge is required.
2271        #
2272        if {[catch {close $fd_rt} err]} {
2273                regsub {^fatal: } $err {} err
2274                warn_popup "File level merge required.
2275
2276$err
2277
2278Staying on branch '$current_branch'."
2279                set ui_status_value "Aborted checkout of '$new_branch' (file level merging is required)."
2280                unlock_index
2281                return
2282        }
2283
2284        # -- Update the symbolic ref.  Core git doesn't even check for failure
2285        #    here, it Just Works(tm).  If it doesn't we are in some really ugly
2286        #    state that is difficult to recover from within git-gui.
2287        #
2288        if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
2289                error_popup "Failed to set current branch.
2290
2291This working directory is only partially switched.
2292We successfully updated your files, but failed to
2293update an internal Git file.
2294
2295This should not have occurred.  [appname] will now
2296close and give up.
2297
2298$err"
2299                do_quit
2300                return
2301        }
2302
2303        # -- Update our repository state.  If we were previously in amend mode
2304        #    we need to toss the current buffer and do a full rescan to update
2305        #    our file lists.  If we weren't in amend mode our file lists are
2306        #    accurate and we can avoid the rescan.
2307        #
2308        unlock_index
2309        set selected_commit_type new
2310        if {[string match amend* $commit_type]} {
2311                $ui_comm delete 0.0 end
2312                $ui_comm edit reset
2313                $ui_comm edit modified false
2314                rescan {set ui_status_value "Checked out branch '$current_branch'."}
2315        } else {
2316                repository_state commit_type HEAD MERGE_HEAD
2317                set PARENT $HEAD
2318                set ui_status_value "Checked out branch '$current_branch'."
2319        }
2320}
2321
2322######################################################################
2323##
2324## remote management
2325
2326proc load_all_remotes {} {
2327        global repo_config
2328        global all_remotes tracking_branches
2329
2330        set all_remotes [list]
2331        array unset tracking_branches
2332
2333        set rm_dir [gitdir remotes]
2334        if {[file isdirectory $rm_dir]} {
2335                set all_remotes [glob \
2336                        -types f \
2337                        -tails \
2338                        -nocomplain \
2339                        -directory $rm_dir *]
2340
2341                foreach name $all_remotes {
2342                        catch {
2343                                set fd [open [file join $rm_dir $name] r]
2344                                while {[gets $fd line] >= 0} {
2345                                        if {![regexp {^Pull:[   ]*([^:]+):(.+)$} \
2346                                                $line line src dst]} continue
2347                                        if {![regexp ^refs/ $dst]} {
2348                                                set dst "refs/heads/$dst"
2349                                        }
2350                                        set tracking_branches($dst) [list $name $src]
2351                                }
2352                                close $fd
2353                        }
2354                }
2355        }
2356
2357        foreach line [array names repo_config remote.*.url] {
2358                if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2359                lappend all_remotes $name
2360
2361                if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2362                        set fl {}
2363                }
2364                foreach line $fl {
2365                        if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2366                        if {![regexp ^refs/ $dst]} {
2367                                set dst "refs/heads/$dst"
2368                        }
2369                        set tracking_branches($dst) [list $name $src]
2370                }
2371        }
2372
2373        set all_remotes [lsort -unique $all_remotes]
2374}
2375
2376proc populate_fetch_menu {} {
2377        global all_remotes repo_config
2378
2379        set m .mbar.fetch
2380        foreach r $all_remotes {
2381                set enable 0
2382                if {![catch {set a $repo_config(remote.$r.url)}]} {
2383                        if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2384                                set enable 1
2385                        }
2386                } else {
2387                        catch {
2388                                set fd [open [gitdir remotes $r] r]
2389                                while {[gets $fd n] >= 0} {
2390                                        if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2391                                                set enable 1
2392                                                break
2393                                        }
2394                                }
2395                                close $fd
2396                        }
2397                }
2398
2399                if {$enable} {
2400                        $m add command \
2401                                -label "Fetch from $r..." \
2402                                -command [list fetch_from $r] \
2403                                -font font_ui
2404                }
2405        }
2406}
2407
2408proc populate_push_menu {} {
2409        global all_remotes repo_config
2410
2411        set m .mbar.push
2412        set fast_count 0
2413        foreach r $all_remotes {
2414                set enable 0
2415                if {![catch {set a $repo_config(remote.$r.url)}]} {
2416                        if {![catch {set a $repo_config(remote.$r.push)}]} {
2417                                set enable 1
2418                        }
2419                } else {
2420                        catch {
2421                                set fd [open [gitdir remotes $r] r]
2422                                while {[gets $fd n] >= 0} {
2423                                        if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2424                                                set enable 1
2425                                                break
2426                                        }
2427                                }
2428                                close $fd
2429                        }
2430                }
2431
2432                if {$enable} {
2433                        if {!$fast_count} {
2434                                $m add separator
2435                        }
2436                        $m add command \
2437                                -label "Push to $r..." \
2438                                -command [list push_to $r] \
2439                                -font font_ui
2440                        incr fast_count
2441                }
2442        }
2443}
2444
2445proc start_push_anywhere_action {w} {
2446        global push_urltype push_remote push_url push_thin push_tags
2447
2448        set r_url {}
2449        switch -- $push_urltype {
2450        remote {set r_url $push_remote}
2451        url {set r_url $push_url}
2452        }
2453        if {$r_url eq {}} return
2454
2455        set cmd [list git push]
2456        lappend cmd -v
2457        if {$push_thin} {
2458                lappend cmd --thin
2459        }
2460        if {$push_tags} {
2461                lappend cmd --tags
2462        }
2463        lappend cmd $r_url
2464        set cnt 0
2465        foreach i [$w.source.l curselection] {
2466                set b [$w.source.l get $i]
2467                lappend cmd "refs/heads/$b:refs/heads/$b"
2468                incr cnt
2469        }
2470        if {$cnt == 0} {
2471                return
2472        } elseif {$cnt == 1} {
2473                set unit branch
2474        } else {
2475                set unit branches
2476        }
2477
2478        set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
2479        console_exec $cons $cmd console_done
2480        destroy $w
2481}
2482
2483trace add variable push_remote write \
2484        [list radio_selector push_urltype remote]
2485
2486proc do_push_anywhere {} {
2487        global all_heads all_remotes current_branch
2488        global push_urltype push_remote push_url push_thin push_tags
2489
2490        set w .push_setup
2491        toplevel $w
2492        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2493
2494        label $w.header -text {Push Branches} -font font_uibold
2495        pack $w.header -side top -fill x
2496
2497        frame $w.buttons
2498        button $w.buttons.create -text Push \
2499                -font font_ui \
2500                -command [list start_push_anywhere_action $w]
2501        pack $w.buttons.create -side right
2502        button $w.buttons.cancel -text {Cancel} \
2503                -font font_ui \
2504                -command [list destroy $w]
2505        pack $w.buttons.cancel -side right -padx 5
2506        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2507
2508        labelframe $w.source \
2509                -text {Source Branches} \
2510                -font font_ui
2511        listbox $w.source.l \
2512                -height 10 \
2513                -width 50 \
2514                -selectmode extended \
2515                -font font_ui
2516        foreach h $all_heads {
2517                $w.source.l insert end $h
2518                if {$h eq $current_branch} {
2519                        $w.source.l select set end
2520                }
2521        }
2522        pack $w.source.l -fill both -pady 5 -padx 5
2523        pack $w.source -fill both -pady 5 -padx 5
2524
2525        labelframe $w.dest \
2526                -text {Destination Repository} \
2527                -font font_ui
2528        if {$all_remotes ne {}} {
2529                radiobutton $w.dest.remote_r \
2530                        -text {Remote:} \
2531                        -value remote \
2532                        -variable push_urltype \
2533                        -font font_ui
2534                eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
2535                grid $w.dest.remote_r $w.dest.remote_m -sticky w
2536                if {[lsearch -sorted -exact $all_remotes origin] != -1} {
2537                        set push_remote origin
2538                } else {
2539                        set push_remote [lindex $all_remotes 0]
2540                }
2541                set push_urltype remote
2542        } else {
2543                set push_urltype url
2544        }
2545        radiobutton $w.dest.url_r \
2546                -text {Arbitrary URL:} \
2547                -value url \
2548                -variable push_urltype \
2549                -font font_ui
2550        entry $w.dest.url_t \
2551                -borderwidth 1 \
2552                -relief sunken \
2553                -width 50 \
2554                -textvariable push_url \
2555                -font font_ui \
2556                -validate key \
2557                -validatecommand {
2558                        if {%d == 1 && [regexp {\s} %S]} {return 0}
2559                        if {%d == 1 && [string length %S] > 0} {
2560                                set push_urltype url
2561                        }
2562                        return 1
2563                }
2564        grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
2565        grid columnconfigure $w.dest 1 -weight 1
2566        pack $w.dest -anchor nw -fill x -pady 5 -padx 5
2567
2568        labelframe $w.options \
2569                -text {Transfer Options} \
2570                -font font_ui
2571        checkbutton $w.options.thin \
2572                -text {Use thin pack (for slow network connections)} \
2573                -variable push_thin \
2574                -font font_ui
2575        grid $w.options.thin -columnspan 2 -sticky w
2576        checkbutton $w.options.tags \
2577                -text {Include tags} \
2578                -variable push_tags \
2579                -font font_ui
2580        grid $w.options.tags -columnspan 2 -sticky w
2581        grid columnconfigure $w.options 1 -weight 1
2582        pack $w.options -anchor nw -fill x -pady 5 -padx 5
2583
2584        set push_url {}
2585        set push_thin 0
2586        set push_tags 0
2587
2588        bind $w <Visibility> "grab $w"
2589        bind $w <Key-Escape> "destroy $w"
2590        wm title $w "[appname] ([reponame]): Push"
2591        tkwait window $w
2592}
2593
2594######################################################################
2595##
2596## merge
2597
2598proc can_merge {} {
2599        global HEAD commit_type file_states
2600
2601        if {[string match amend* $commit_type]} {
2602                info_popup {Cannot merge while amending.
2603
2604You must finish amending this commit before
2605starting any type of merge.
2606}
2607                return 0
2608        }
2609
2610        if {[committer_ident] eq {}} {return 0}
2611        if {![lock_index merge]} {return 0}
2612
2613        # -- Our in memory state should match the repository.
2614        #
2615        repository_state curType curHEAD curMERGE_HEAD
2616        if {$commit_type ne $curType || $HEAD ne $curHEAD} {
2617                info_popup {Last scanned state does not match repository state.
2618
2619Another Git program has modified this repository
2620since the last scan.  A rescan must be performed
2621before a merge can be performed.
2622
2623The rescan will be automatically started now.
2624}
2625                unlock_index
2626                rescan {set ui_status_value {Ready.}}
2627                return 0
2628        }
2629
2630        foreach path [array names file_states] {
2631                switch -glob -- [lindex $file_states($path) 0] {
2632                U? {
2633                        error_popup "You are in the middle of a conflicted merge.
2634
2635File [short_path $path] has merge conflicts.
2636
2637You must resolve them, add the file, and commit to
2638complete the current merge.  Only then can you
2639begin another merge.
2640"
2641                        unlock_index
2642                        return 0
2643                }
2644                }
2645        }
2646
2647        return 1
2648}
2649
2650proc visualize_local_merge {w} {
2651        set revs {}
2652        foreach i [$w.source.l curselection] {
2653                lappend revs [$w.source.l get $i]
2654        }
2655        if {$revs eq {}} return
2656        lappend revs --not HEAD
2657        do_gitk $revs
2658}
2659
2660proc start_local_merge_action {w} {
2661        global HEAD
2662
2663        set cmd [list git merge]
2664        set names {}
2665        set revcnt 0
2666        foreach i [$w.source.l curselection] {
2667                set b [$w.source.l get $i]
2668                lappend cmd $b
2669                lappend names $b
2670                incr revcnt
2671        }
2672
2673        if {$revcnt == 0} {
2674                return
2675        } elseif {$revcnt == 1} {
2676                set unit branch
2677        } elseif {$revcnt <= 15} {
2678                set unit branches
2679        } else {
2680                tk_messageBox \
2681                        -icon error \
2682                        -type ok \
2683                        -title [wm title $w] \
2684                        -parent $w \
2685                        -message "Too many branches selected.
2686
2687You have requested to merge $revcnt branches
2688in an octopus merge.  This exceeds Git's
2689internal limit of 15 branches per merge.
2690
2691Please select fewer branches.  To merge more
2692than 15 branches, merge the branches in batches.
2693"
2694                return
2695        }
2696
2697        set cons [new_console "Merge" "Merging [join $names {, }]"]
2698        console_exec $cons $cmd finish_merge
2699        bind $w <Destroy> {}
2700        destroy $w
2701}
2702
2703proc finish_merge {w ok} {
2704        console_done $w $ok
2705        if {$ok} {
2706                set msg {Merge completed successfully.}
2707        } else {
2708                set msg {Merge failed.  Conflict resolution is required.}
2709        }
2710        unlock_index
2711        rescan [list set ui_status_value $msg]
2712}
2713
2714proc do_local_merge {} {
2715        global current_branch
2716
2717        if {![can_merge]} return
2718
2719        set w .merge_setup
2720        toplevel $w
2721        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2722
2723        label $w.header \
2724                -text "Merge Into $current_branch" \
2725                -font font_uibold
2726        pack $w.header -side top -fill x
2727
2728        frame $w.buttons
2729        button $w.buttons.visualize -text Visualize \
2730                -font font_ui \
2731                -command [list visualize_local_merge $w]
2732        pack $w.buttons.visualize -side left
2733        button $w.buttons.create -text Merge \
2734                -font font_ui \
2735                -command [list start_local_merge_action $w]
2736        pack $w.buttons.create -side right
2737        button $w.buttons.cancel -text {Cancel} \
2738                -font font_ui \
2739                -command [list destroy $w]
2740        pack $w.buttons.cancel -side right -padx 5
2741        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2742
2743        labelframe $w.source \
2744                -text {Source Branches} \
2745                -font font_ui
2746        listbox $w.source.l \
2747                -height 10 \
2748                -width 25 \
2749                -selectmode extended \
2750                -yscrollcommand [list $w.source.sby set] \
2751                -font font_ui
2752        scrollbar $w.source.sby -command [list $w.source.l yview]
2753        pack $w.source.sby -side right -fill y
2754        pack $w.source.l -side left -fill both -expand 1
2755        pack $w.source -fill both -expand 1 -pady 5 -padx 5
2756
2757        set cmd [list git for-each-ref]
2758        lappend cmd {--format=%(objectname) %(refname)}
2759        lappend cmd refs/heads
2760        lappend cmd refs/remotes
2761        set fr_fd [open "| $cmd" r]
2762        fconfigure $fr_fd -translation binary
2763        while {[gets $fr_fd line] > 0} {
2764                set line [split $line { }]
2765                set sha1([lindex $line 0]) [lindex $line 1]
2766        }
2767        close $fr_fd
2768
2769        set to_show {}
2770        set fr_fd [open "| git rev-list --all --not HEAD"]
2771        while {[gets $fr_fd line] > 0} {
2772                if {[catch {set ref $sha1($line)}]} continue
2773                regsub ^refs/(heads|remotes)/ $ref {} ref
2774                lappend to_show $ref
2775        }
2776        close $fr_fd
2777
2778        foreach ref [lsort -unique $to_show] {
2779                $w.source.l insert end $ref
2780        }
2781
2782        bind $w <Visibility> "grab $w"
2783        bind $w <Key-Escape> "unlock_index;destroy $w"
2784        bind $w <Destroy> unlock_index
2785        wm title $w "[appname] ([reponame]): Merge"
2786        tkwait window $w
2787}
2788
2789######################################################################
2790##
2791## icons
2792
2793set filemask {
2794#define mask_width 14
2795#define mask_height 15
2796static unsigned char mask_bits[] = {
2797   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2798   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2799   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2800}
2801
2802image create bitmap file_plain -background white -foreground black -data {
2803#define plain_width 14
2804#define plain_height 15
2805static unsigned char plain_bits[] = {
2806   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2807   0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2808   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2809} -maskdata $filemask
2810
2811image create bitmap file_mod -background white -foreground blue -data {
2812#define mod_width 14
2813#define mod_height 15
2814static unsigned char mod_bits[] = {
2815   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2816   0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2817   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2818} -maskdata $filemask
2819
2820image create bitmap file_fulltick -background white -foreground "#007000" -data {
2821#define file_fulltick_width 14
2822#define file_fulltick_height 15
2823static unsigned char file_fulltick_bits[] = {
2824   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2825   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2826   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2827} -maskdata $filemask
2828
2829image create bitmap file_parttick -background white -foreground "#005050" -data {
2830#define parttick_width 14
2831#define parttick_height 15
2832static unsigned char parttick_bits[] = {
2833   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2834   0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2835   0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2836} -maskdata $filemask
2837
2838image create bitmap file_question -background white -foreground black -data {
2839#define file_question_width 14
2840#define file_question_height 15
2841static unsigned char file_question_bits[] = {
2842   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2843   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2844   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2845} -maskdata $filemask
2846
2847image create bitmap file_removed -background white -foreground red -data {
2848#define file_removed_width 14
2849#define file_removed_height 15
2850static unsigned char file_removed_bits[] = {
2851   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2852   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2853   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2854} -maskdata $filemask
2855
2856image create bitmap file_merge -background white -foreground blue -data {
2857#define file_merge_width 14
2858#define file_merge_height 15
2859static unsigned char file_merge_bits[] = {
2860   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2861   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2862   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2863} -maskdata $filemask
2864
2865set ui_index .vpane.files.index.list
2866set ui_workdir .vpane.files.workdir.list
2867
2868set all_icons(_$ui_index)   file_plain
2869set all_icons(A$ui_index)   file_fulltick
2870set all_icons(M$ui_index)   file_fulltick
2871set all_icons(D$ui_index)   file_removed
2872set all_icons(U$ui_index)   file_merge
2873
2874set all_icons(_$ui_workdir) file_plain
2875set all_icons(M$ui_workdir) file_mod
2876set all_icons(D$ui_workdir) file_question
2877set all_icons(U$ui_workdir) file_merge
2878set all_icons(O$ui_workdir) file_plain
2879
2880set max_status_desc 0
2881foreach i {
2882                {__ "Unmodified"}
2883
2884                {_M "Modified, not staged"}
2885                {M_ "Staged for commit"}
2886                {MM "Portions staged for commit"}
2887                {MD "Staged for commit, missing"}
2888
2889                {_O "Untracked, not staged"}
2890                {A_ "Staged for commit"}
2891                {AM "Portions staged for commit"}
2892                {AD "Staged for commit, missing"}
2893
2894                {_D "Missing"}
2895                {D_ "Staged for removal"}
2896                {DO "Staged for removal, still present"}
2897
2898                {U_ "Requires merge resolution"}
2899                {UU "Requires merge resolution"}
2900                {UM "Requires merge resolution"}
2901                {UD "Requires merge resolution"}
2902        } {
2903        if {$max_status_desc < [string length [lindex $i 1]]} {
2904                set max_status_desc [string length [lindex $i 1]]
2905        }
2906        set all_descs([lindex $i 0]) [lindex $i 1]
2907}
2908unset i
2909
2910######################################################################
2911##
2912## util
2913
2914proc is_MacOSX {} {
2915        global tcl_platform tk_library
2916        if {[tk windowingsystem] eq {aqua}} {
2917                return 1
2918        }
2919        return 0
2920}
2921
2922proc is_Windows {} {
2923        global tcl_platform
2924        if {$tcl_platform(platform) eq {windows}} {
2925                return 1
2926        }
2927        return 0
2928}
2929
2930proc bind_button3 {w cmd} {
2931        bind $w <Any-Button-3> $cmd
2932        if {[is_MacOSX]} {
2933                bind $w <Control-Button-1> $cmd
2934        }
2935}
2936
2937proc incr_font_size {font {amt 1}} {
2938        set sz [font configure $font -size]
2939        incr sz $amt
2940        font configure $font -size $sz
2941        font configure ${font}bold -size $sz
2942}
2943
2944proc hook_failed_popup {hook msg} {
2945        set w .hookfail
2946        toplevel $w
2947
2948        frame $w.m
2949        label $w.m.l1 -text "$hook hook failed:" \
2950                -anchor w \
2951                -justify left \
2952                -font font_uibold
2953        text $w.m.t \
2954                -background white -borderwidth 1 \
2955                -relief sunken \
2956                -width 80 -height 10 \
2957                -font font_diff \
2958                -yscrollcommand [list $w.m.sby set]
2959        label $w.m.l2 \
2960                -text {You must correct the above errors before committing.} \
2961                -anchor w \
2962                -justify left \
2963                -font font_uibold
2964        scrollbar $w.m.sby -command [list $w.m.t yview]
2965        pack $w.m.l1 -side top -fill x
2966        pack $w.m.l2 -side bottom -fill x
2967        pack $w.m.sby -side right -fill y
2968        pack $w.m.t -side left -fill both -expand 1
2969        pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2970
2971        $w.m.t insert 1.0 $msg
2972        $w.m.t conf -state disabled
2973
2974        button $w.ok -text OK \
2975                -width 15 \
2976                -font font_ui \
2977                -command "destroy $w"
2978        pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2979
2980        bind $w <Visibility> "grab $w; focus $w"
2981        bind $w <Key-Return> "destroy $w"
2982        wm title $w "[appname] ([reponame]): error"
2983        tkwait window $w
2984}
2985
2986set next_console_id 0
2987
2988proc new_console {short_title long_title} {
2989        global next_console_id console_data
2990        set w .console[incr next_console_id]
2991        set console_data($w) [list $short_title $long_title]
2992        return [console_init $w]
2993}
2994
2995proc console_init {w} {
2996        global console_cr console_data M1B
2997
2998        set console_cr($w) 1.0
2999        toplevel $w
3000        frame $w.m
3001        label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
3002                -anchor w \
3003                -justify left \
3004                -font font_uibold
3005        text $w.m.t \
3006                -background white -borderwidth 1 \
3007                -relief sunken \
3008                -width 80 -height 10 \
3009                -font font_diff \
3010                -state disabled \
3011                -yscrollcommand [list $w.m.sby set]
3012        label $w.m.s -text {Working... please wait...} \
3013                -anchor w \
3014                -justify left \
3015                -font font_uibold
3016        scrollbar $w.m.sby -command [list $w.m.t yview]
3017        pack $w.m.l1 -side top -fill x
3018        pack $w.m.s -side bottom -fill x
3019        pack $w.m.sby -side right -fill y
3020        pack $w.m.t -side left -fill both -expand 1
3021        pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3022
3023        menu $w.ctxm -tearoff 0
3024        $w.ctxm add command -label "Copy" \
3025                -font font_ui \
3026                -command "tk_textCopy $w.m.t"
3027        $w.ctxm add command -label "Select All" \
3028                -font font_ui \
3029                -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3030        $w.ctxm add command -label "Copy All" \
3031                -font font_ui \
3032                -command "
3033                        $w.m.t tag add sel 0.0 end
3034                        tk_textCopy $w.m.t
3035                        $w.m.t tag remove sel 0.0 end
3036                "
3037
3038        button $w.ok -text {Close} \
3039                -font font_ui \
3040                -state disabled \
3041                -command "destroy $w"
3042        pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3043
3044        bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
3045        bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
3046        bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
3047        bind $w <Visibility> "focus $w"
3048        wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
3049        return $w
3050}
3051
3052proc console_exec {w cmd after} {
3053        # -- Windows tosses the enviroment when we exec our child.
3054        #    But most users need that so we have to relogin. :-(
3055        #
3056        if {[is_Windows]} {
3057                set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
3058        }
3059
3060        # -- Tcl won't let us redirect both stdout and stderr to
3061        #    the same pipe.  So pass it through cat...
3062        #
3063        set cmd [concat | $cmd |& cat]
3064
3065        set fd_f [open $cmd r]
3066        fconfigure $fd_f -blocking 0 -translation binary
3067        fileevent $fd_f readable [list console_read $w $fd_f $after]
3068}
3069
3070proc console_read {w fd after} {
3071        global console_cr
3072
3073        set buf [read $fd]
3074        if {$buf ne {}} {
3075                if {![winfo exists $w]} {console_init $w}
3076                $w.m.t conf -state normal
3077                set c 0
3078                set n [string length $buf]
3079                while {$c < $n} {
3080                        set cr [string first "\r" $buf $c]
3081                        set lf [string first "\n" $buf $c]
3082                        if {$cr < 0} {set cr [expr {$n + 1}]}
3083                        if {$lf < 0} {set lf [expr {$n + 1}]}
3084
3085                        if {$lf < $cr} {
3086                                $w.m.t insert end [string range $buf $c $lf]
3087                                set console_cr($w) [$w.m.t index {end -1c}]
3088                                set c $lf
3089                                incr c
3090                        } else {
3091                                $w.m.t delete $console_cr($w) end
3092                                $w.m.t insert end "\n"
3093                                $w.m.t insert end [string range $buf $c $cr]
3094                                set c $cr
3095                                incr c
3096                        }
3097                }
3098                $w.m.t conf -state disabled
3099                $w.m.t see end
3100        }
3101
3102        fconfigure $fd -blocking 1
3103        if {[eof $fd]} {
3104                if {[catch {close $fd}]} {
3105                        set ok 0
3106                } else {
3107                        set ok 1
3108                }
3109                uplevel #0 $after $w $ok
3110                return
3111        }
3112        fconfigure $fd -blocking 0
3113}
3114
3115proc console_chain {cmdlist w {ok 1}} {
3116        if {$ok} {
3117                if {[llength $cmdlist] == 0} {
3118                        console_done $w $ok
3119                        return
3120                }
3121
3122                set cmd [lindex $cmdlist 0]
3123                set cmdlist [lrange $cmdlist 1 end]
3124
3125                if {[lindex $cmd 0] eq {console_exec}} {
3126                        console_exec $w \
3127                                [lindex $cmd 1] \
3128                                [list console_chain $cmdlist]
3129                } else {
3130                        uplevel #0 $cmd $cmdlist $w $ok
3131                }
3132        } else {
3133                console_done $w $ok
3134        }
3135}
3136
3137proc console_done {args} {
3138        global console_cr console_data
3139
3140        switch -- [llength $args] {
3141        2 {
3142                set w [lindex $args 0]
3143                set ok [lindex $args 1]
3144        }
3145        3 {
3146                set w [lindex $args 1]
3147                set ok [lindex $args 2]
3148        }
3149        default {
3150                error "wrong number of args: console_done ?ignored? w ok"
3151        }
3152        }
3153
3154        if {$ok} {
3155                if {[winfo exists $w]} {
3156                        $w.m.s conf -background green -text {Success}
3157                        $w.ok conf -state normal
3158                }
3159        } else {
3160                if {![winfo exists $w]} {
3161                        console_init $w
3162                }
3163                $w.m.s conf -background red -text {Error: Command Failed}
3164                $w.ok conf -state normal
3165        }
3166
3167        array unset console_cr $w
3168        array unset console_data $w
3169}
3170
3171######################################################################
3172##
3173## ui commands
3174
3175set starting_gitk_msg {Starting gitk... please wait...}
3176
3177proc do_gitk {revs} {
3178        global ui_status_value starting_gitk_msg
3179
3180        set cmd gitk
3181        if {$revs ne {}} {
3182                append cmd { }
3183                append cmd $revs
3184        }
3185        if {[is_Windows]} {
3186                set cmd "sh -c \"exec $cmd\""
3187        }
3188        append cmd { &}
3189
3190        if {[catch {eval exec $cmd} err]} {
3191                error_popup "Failed to start gitk:\n\n$err"
3192        } else {
3193                set ui_status_value $starting_gitk_msg
3194                after 10000 {
3195                        if {$ui_status_value eq $starting_gitk_msg} {
3196                                set ui_status_value {Ready.}
3197                        }
3198                }
3199        }
3200}
3201
3202proc do_stats {} {
3203        set fd [open "| git count-objects -v" r]
3204        while {[gets $fd line] > 0} {
3205                if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
3206                        set stats($name) $value
3207                }
3208        }
3209        close $fd
3210
3211        set packed_sz 0
3212        foreach p [glob -directory [gitdir objects pack] \
3213                -type f \
3214                -nocomplain -- *] {
3215                incr packed_sz [file size $p]
3216        }
3217        if {$packed_sz > 0} {
3218                set stats(size-pack) [expr {$packed_sz / 1024}]
3219        }
3220
3221        set w .stats_view
3222        toplevel $w
3223        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3224
3225        label $w.header -text {Database Statistics} \
3226                -font font_uibold
3227        pack $w.header -side top -fill x
3228
3229        frame $w.buttons -border 1
3230        button $w.buttons.close -text Close \
3231                -font font_ui \
3232                -command [list destroy $w]
3233        button $w.buttons.gc -text {Compress Database} \
3234                -font font_ui \
3235                -command "destroy $w;do_gc"
3236        pack $w.buttons.close -side right
3237        pack $w.buttons.gc -side left
3238        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3239
3240        frame $w.stat -borderwidth 1 -relief solid
3241        foreach s {
3242                {count           {Number of loose objects}}
3243                {size            {Disk space used by loose objects} { KiB}}
3244                {in-pack         {Number of packed objects}}
3245                {packs           {Number of packs}}
3246                {size-pack       {Disk space used by packed objects} { KiB}}
3247                {prune-packable  {Packed objects waiting for pruning}}
3248                {garbage         {Garbage files}}
3249                } {
3250                set name [lindex $s 0]
3251                set label [lindex $s 1]
3252                if {[catch {set value $stats($name)}]} continue
3253                if {[llength $s] > 2} {
3254                        set value "$value[lindex $s 2]"
3255                }
3256
3257                label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
3258                label $w.stat.v_$name -text $value -anchor w -font font_ui
3259                grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
3260        }
3261        pack $w.stat -pady 10 -padx 10
3262
3263        bind $w <Visibility> "grab $w; focus $w"
3264        bind $w <Key-Escape> [list destroy $w]
3265        bind $w <Key-Return> [list destroy $w]
3266        wm title $w "[appname] ([reponame]): Database Statistics"
3267        tkwait window $w
3268}
3269
3270proc do_gc {} {
3271        set w [new_console {gc} {Compressing the object database}]
3272        console_chain {
3273                {console_exec {git pack-refs --prune}}
3274                {console_exec {git reflog expire --all}}
3275                {console_exec {git repack -a -d -l}}
3276                {console_exec {git rerere gc}}
3277        } $w
3278}
3279
3280proc do_fsck_objects {} {
3281        set w [new_console {fsck-objects} \
3282                {Verifying the object database with fsck-objects}]
3283        set cmd [list git fsck-objects]
3284        lappend cmd --full
3285        lappend cmd --cache
3286        lappend cmd --strict
3287        console_exec $w $cmd console_done
3288}
3289
3290set is_quitting 0
3291
3292proc do_quit {} {
3293        global ui_comm is_quitting repo_config commit_type
3294
3295        if {$is_quitting} return
3296        set is_quitting 1
3297
3298        # -- Stash our current commit buffer.
3299        #
3300        set save [gitdir GITGUI_MSG]
3301        set msg [string trim [$ui_comm get 0.0 end]]
3302        regsub -all -line {[ \r\t]+$} $msg {} msg
3303        if {(![string match amend* $commit_type]
3304                || [$ui_comm edit modified])
3305                && $msg ne {}} {
3306                catch {
3307                        set fd [open $save w]
3308                        puts -nonewline $fd $msg
3309                        close $fd
3310                }
3311        } else {
3312                catch {file delete $save}
3313        }
3314
3315        # -- Stash our current window geometry into this repository.
3316        #
3317        set cfg_geometry [list]
3318        lappend cfg_geometry [wm geometry .]
3319        lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
3320        lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
3321        if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
3322                set rc_geometry {}
3323        }
3324        if {$cfg_geometry ne $rc_geometry} {
3325                catch {exec git repo-config gui.geometry $cfg_geometry}
3326        }
3327
3328        destroy .
3329}
3330
3331proc do_rescan {} {
3332        rescan {set ui_status_value {Ready.}}
3333}
3334
3335proc unstage_helper {txt paths} {
3336        global file_states current_diff_path
3337
3338        if {![lock_index begin-update]} return
3339
3340        set pathList [list]
3341        set after {}
3342        foreach path $paths {
3343                switch -glob -- [lindex $file_states($path) 0] {
3344                A? -
3345                M? -
3346                D? {
3347                        lappend pathList $path
3348                        if {$path eq $current_diff_path} {
3349                                set after {reshow_diff;}
3350                        }
3351                }
3352                }
3353        }
3354        if {$pathList eq {}} {
3355                unlock_index
3356        } else {
3357                update_indexinfo \
3358                        $txt \
3359                        $pathList \
3360                        [concat $after {set ui_status_value {Ready.}}]
3361        }
3362}
3363
3364proc do_unstage_selection {} {
3365        global current_diff_path selected_paths
3366
3367        if {[array size selected_paths] > 0} {
3368                unstage_helper \
3369                        {Unstaging selected files from commit} \
3370                        [array names selected_paths]
3371        } elseif {$current_diff_path ne {}} {
3372                unstage_helper \
3373                        "Unstaging [short_path $current_diff_path] from commit" \
3374                        [list $current_diff_path]
3375        }
3376}
3377
3378proc add_helper {txt paths} {
3379        global file_states current_diff_path
3380
3381        if {![lock_index begin-update]} return
3382
3383        set pathList [list]
3384        set after {}
3385        foreach path $paths {
3386                switch -glob -- [lindex $file_states($path) 0] {
3387                _O -
3388                ?M -
3389                ?D -
3390                U? {
3391                        lappend pathList $path
3392                        if {$path eq $current_diff_path} {
3393                                set after {reshow_diff;}
3394                        }
3395                }
3396                }
3397        }
3398        if {$pathList eq {}} {
3399                unlock_index
3400        } else {
3401                update_index \
3402                        $txt \
3403                        $pathList \
3404                        [concat $after {set ui_status_value {Ready to commit.}}]
3405        }
3406}
3407
3408proc do_add_selection {} {
3409        global current_diff_path selected_paths
3410
3411        if {[array size selected_paths] > 0} {
3412                add_helper \
3413                        {Adding selected files} \
3414                        [array names selected_paths]
3415        } elseif {$current_diff_path ne {}} {
3416                add_helper \
3417                        "Adding [short_path $current_diff_path]" \
3418                        [list $current_diff_path]
3419        }
3420}
3421
3422proc do_add_all {} {
3423        global file_states
3424
3425        set paths [list]
3426        foreach path [array names file_states] {
3427                switch -glob -- [lindex $file_states($path) 0] {
3428                U? {continue}
3429                ?M -
3430                ?D {lappend paths $path}
3431                }
3432        }
3433        add_helper {Adding all changed files} $paths
3434}
3435
3436proc revert_helper {txt paths} {
3437        global file_states current_diff_path
3438
3439        if {![lock_index begin-update]} return
3440
3441        set pathList [list]
3442        set after {}
3443        foreach path $paths {
3444                switch -glob -- [lindex $file_states($path) 0] {
3445                U? {continue}
3446                ?M -
3447                ?D {
3448                        lappend pathList $path
3449                        if {$path eq $current_diff_path} {
3450                                set after {reshow_diff;}
3451                        }
3452                }
3453                }
3454        }
3455
3456        set n [llength $pathList]
3457        if {$n == 0} {
3458                unlock_index
3459                return
3460        } elseif {$n == 1} {
3461                set s "[short_path [lindex $pathList]]"
3462        } else {
3463                set s "these $n files"
3464        }
3465
3466        set reply [tk_dialog \
3467                .confirm_revert \
3468                "[appname] ([reponame])" \
3469                "Revert changes in $s?
3470
3471Any unadded changes will be permanently lost by the revert." \
3472                question \
3473                1 \
3474                {Do Nothing} \
3475                {Revert Changes} \
3476                ]
3477        if {$reply == 1} {
3478                checkout_index \
3479                        $txt \
3480                        $pathList \
3481                        [concat $after {set ui_status_value {Ready.}}]
3482        } else {
3483                unlock_index
3484        }
3485}
3486
3487proc do_revert_selection {} {
3488        global current_diff_path selected_paths
3489
3490        if {[array size selected_paths] > 0} {
3491                revert_helper \
3492                        {Reverting selected files} \
3493                        [array names selected_paths]
3494        } elseif {$current_diff_path ne {}} {
3495                revert_helper \
3496                        "Reverting [short_path $current_diff_path]" \
3497                        [list $current_diff_path]
3498        }
3499}
3500
3501proc do_signoff {} {
3502        global ui_comm
3503
3504        set me [committer_ident]
3505        if {$me eq {}} return
3506
3507        set sob "Signed-off-by: $me"
3508        set last [$ui_comm get {end -1c linestart} {end -1c}]
3509        if {$last ne $sob} {
3510                $ui_comm edit separator
3511                if {$last ne {}
3512                        && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
3513                        $ui_comm insert end "\n"
3514                }
3515                $ui_comm insert end "\n$sob"
3516                $ui_comm edit separator
3517                $ui_comm see end
3518        }
3519}
3520
3521proc do_select_commit_type {} {
3522        global commit_type selected_commit_type
3523
3524        if {$selected_commit_type eq {new}
3525                && [string match amend* $commit_type]} {
3526                create_new_commit
3527        } elseif {$selected_commit_type eq {amend}
3528                && ![string match amend* $commit_type]} {
3529                load_last_commit
3530
3531                # The amend request was rejected...
3532                #
3533                if {![string match amend* $commit_type]} {
3534                        set selected_commit_type new
3535                }
3536        }
3537}
3538
3539proc do_commit {} {
3540        commit_tree
3541}
3542
3543proc do_about {} {
3544        global appvers copyright
3545        global tcl_patchLevel tk_patchLevel
3546
3547        set w .about_dialog
3548        toplevel $w
3549        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3550
3551        label $w.header -text "About [appname]" \
3552                -font font_uibold
3553        pack $w.header -side top -fill x
3554
3555        frame $w.buttons
3556        button $w.buttons.close -text {Close} \
3557                -font font_ui \
3558                -command [list destroy $w]
3559        pack $w.buttons.close -side right
3560        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3561
3562        label $w.desc \
3563                -text "[appname] - a commit creation tool for Git.
3564$copyright" \
3565                -padx 5 -pady 5 \
3566                -justify left \
3567                -anchor w \
3568                -borderwidth 1 \
3569                -relief solid \
3570                -font font_ui
3571        pack $w.desc -side top -fill x -padx 5 -pady 5
3572
3573        set v {}
3574        append v "[appname] version $appvers\n"
3575        append v "[exec git version]\n"
3576        append v "\n"
3577        if {$tcl_patchLevel eq $tk_patchLevel} {
3578                append v "Tcl/Tk version $tcl_patchLevel"
3579        } else {
3580                append v "Tcl version $tcl_patchLevel"
3581                append v ", Tk version $tk_patchLevel"
3582        }
3583
3584        label $w.vers \
3585                -text $v \
3586                -padx 5 -pady 5 \
3587                -justify left \
3588                -anchor w \
3589                -borderwidth 1 \
3590                -relief solid \
3591                -font font_ui
3592        pack $w.vers -side top -fill x -padx 5 -pady 5
3593
3594        menu $w.ctxm -tearoff 0
3595        $w.ctxm add command \
3596                -label {Copy} \
3597                -font font_ui \
3598                -command "
3599                clipboard clear
3600                clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
3601        "
3602
3603        bind $w <Visibility> "grab $w; focus $w"
3604        bind $w <Key-Escape> "destroy $w"
3605        bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
3606        wm title $w "About [appname]"
3607        tkwait window $w
3608}
3609
3610proc do_options {} {
3611        global repo_config global_config font_descs
3612        global repo_config_new global_config_new
3613
3614        array unset repo_config_new
3615        array unset global_config_new
3616        foreach name [array names repo_config] {
3617                set repo_config_new($name) $repo_config($name)
3618        }
3619        load_config 1
3620        foreach name [array names repo_config] {
3621                switch -- $name {
3622                gui.diffcontext {continue}
3623                }
3624                set repo_config_new($name) $repo_config($name)
3625        }
3626        foreach name [array names global_config] {
3627                set global_config_new($name) $global_config($name)
3628        }
3629
3630        set w .options_editor
3631        toplevel $w
3632        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3633
3634        label $w.header -text "[appname] Options" \
3635                -font font_uibold
3636        pack $w.header -side top -fill x
3637
3638        frame $w.buttons
3639        button $w.buttons.restore -text {Restore Defaults} \
3640                -font font_ui \
3641                -command do_restore_defaults
3642        pack $w.buttons.restore -side left
3643        button $w.buttons.save -text Save \
3644                -font font_ui \
3645                -command [list do_save_config $w]
3646        pack $w.buttons.save -side right
3647        button $w.buttons.cancel -text {Cancel} \
3648                -font font_ui \
3649                -command [list destroy $w]
3650        pack $w.buttons.cancel -side right -padx 5
3651        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3652
3653        labelframe $w.repo -text "[reponame] Repository" \
3654                -font font_ui
3655        labelframe $w.global -text {Global (All Repositories)} \
3656                -font font_ui
3657        pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
3658        pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
3659
3660        foreach option {
3661                {b pullsummary {Show Pull Summary}}
3662                {b trustmtime  {Trust File Modification Timestamps}}
3663                {i diffcontext {Number of Diff Context Lines}}
3664                {t newbranchtemplate {New Branch Name Template}}
3665                } {
3666                set type [lindex $option 0]
3667                set name [lindex $option 1]
3668                set text [lindex $option 2]
3669                foreach f {repo global} {
3670                        switch $type {
3671                        b {
3672                                checkbutton $w.$f.$name -text $text \
3673                                        -variable ${f}_config_new(gui.$name) \
3674                                        -onvalue true \
3675                                        -offvalue false \
3676                                        -font font_ui
3677                                pack $w.$f.$name -side top -anchor w
3678                        }
3679                        i {
3680                                frame $w.$f.$name
3681                                label $w.$f.$name.l -text "$text:" -font font_ui
3682                                pack $w.$f.$name.l -side left -anchor w -fill x
3683                                spinbox $w.$f.$name.v \
3684                                        -textvariable ${f}_config_new(gui.$name) \
3685                                        -from 1 -to 99 -increment 1 \
3686                                        -width 3 \
3687                                        -font font_ui
3688                                bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
3689                                pack $w.$f.$name.v -side right -anchor e -padx 5
3690                                pack $w.$f.$name -side top -anchor w -fill x
3691                        }
3692                        t {
3693                                frame $w.$f.$name
3694                                label $w.$f.$name.l -text "$text:" -font font_ui
3695                                entry $w.$f.$name.v \
3696                                        -borderwidth 1 \
3697                                        -relief sunken \
3698                                        -width 20 \
3699                                        -textvariable ${f}_config_new(gui.$name) \
3700                                        -font font_ui
3701                                pack $w.$f.$name.l -side left -anchor w
3702                                pack $w.$f.$name.v -side left -anchor w \
3703                                        -fill x -expand 1 \
3704                                        -padx 5
3705                                pack $w.$f.$name -side top -anchor w -fill x
3706                        }
3707                        }
3708                }
3709        }
3710
3711        set all_fonts [lsort [font families]]
3712        foreach option $font_descs {
3713                set name [lindex $option 0]
3714                set font [lindex $option 1]
3715                set text [lindex $option 2]
3716
3717                set global_config_new(gui.$font^^family) \
3718                        [font configure $font -family]
3719                set global_config_new(gui.$font^^size) \
3720                        [font configure $font -size]
3721
3722                frame $w.global.$name
3723                label $w.global.$name.l -text "$text:" -font font_ui
3724                pack $w.global.$name.l -side left -anchor w -fill x
3725                eval tk_optionMenu $w.global.$name.family \
3726                        global_config_new(gui.$font^^family) \
3727                        $all_fonts
3728                spinbox $w.global.$name.size \
3729                        -textvariable global_config_new(gui.$font^^size) \
3730                        -from 2 -to 80 -increment 1 \
3731                        -width 3 \
3732                        -font font_ui
3733                bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
3734                pack $w.global.$name.size -side right -anchor e
3735                pack $w.global.$name.family -side right -anchor e
3736                pack $w.global.$name -side top -anchor w -fill x
3737        }
3738
3739        bind $w <Visibility> "grab $w; focus $w"
3740        bind $w <Key-Escape> "destroy $w"
3741        wm title $w "[appname] ([reponame]): Options"
3742        tkwait window $w
3743}
3744
3745proc do_restore_defaults {} {
3746        global font_descs default_config repo_config
3747        global repo_config_new global_config_new
3748
3749        foreach name [array names default_config] {
3750                set repo_config_new($name) $default_config($name)
3751                set global_config_new($name) $default_config($name)
3752        }
3753
3754        foreach option $font_descs {
3755                set name [lindex $option 0]
3756                set repo_config(gui.$name) $default_config(gui.$name)
3757        }
3758        apply_config
3759
3760        foreach option $font_descs {
3761                set name [lindex $option 0]
3762                set font [lindex $option 1]
3763                set global_config_new(gui.$font^^family) \
3764                        [font configure $font -family]
3765                set global_config_new(gui.$font^^size) \
3766                        [font configure $font -size]
3767        }
3768}
3769
3770proc do_save_config {w} {
3771        if {[catch {save_config} err]} {
3772                error_popup "Failed to completely save options:\n\n$err"
3773        }
3774        reshow_diff
3775        destroy $w
3776}
3777
3778proc do_windows_shortcut {} {
3779        global argv0
3780
3781        if {[catch {
3782                set desktop [exec cygpath \
3783                        --windows \
3784                        --absolute \
3785                        --long-name \
3786                        --desktop]
3787                }]} {
3788                        set desktop .
3789        }
3790        set fn [tk_getSaveFile \
3791                -parent . \
3792                -title "[appname] ([reponame]): Create Desktop Icon" \
3793                -initialdir $desktop \
3794                -initialfile "Git [reponame].bat"]
3795        if {$fn != {}} {
3796                if {[catch {
3797                                set fd [open $fn w]
3798                                set sh [exec cygpath \
3799                                        --windows \
3800                                        --absolute \
3801                                        /bin/sh]
3802                                set me [exec cygpath \
3803                                        --unix \
3804                                        --absolute \
3805                                        $argv0]
3806                                set gd [exec cygpath \
3807                                        --unix \
3808                                        --absolute \
3809                                        [gitdir]]
3810                                set gw [exec cygpath \
3811                                        --windows \
3812                                        --absolute \
3813                                        [file dirname [gitdir]]]
3814                                regsub -all ' $me "'\\''" me
3815                                regsub -all ' $gd "'\\''" gd
3816                                puts $fd "@ECHO Entering $gw"
3817                                puts $fd "@ECHO Starting git-gui... please wait..."
3818                                puts -nonewline $fd "@\"$sh\" --login -c \""
3819                                puts -nonewline $fd "GIT_DIR='$gd'"
3820                                puts -nonewline $fd " '$me'"
3821                                puts $fd "&\""
3822                                close $fd
3823                        } err]} {
3824                        error_popup "Cannot write script:\n\n$err"
3825                }
3826        }
3827}
3828
3829proc do_macosx_app {} {
3830        global argv0 env
3831
3832        set fn [tk_getSaveFile \
3833                -parent . \
3834                -title "[appname] ([reponame]): Create Desktop Icon" \
3835                -initialdir [file join $env(HOME) Desktop] \
3836                -initialfile "Git [reponame].app"]
3837        if {$fn != {}} {
3838                if {[catch {
3839                                set Contents [file join $fn Contents]
3840                                set MacOS [file join $Contents MacOS]
3841                                set exe [file join $MacOS git-gui]
3842
3843                                file mkdir $MacOS
3844
3845                                set fd [open [file join $Contents Info.plist] w]
3846                                puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3847<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3848<plist version="1.0">
3849<dict>
3850        <key>CFBundleDevelopmentRegion</key>
3851        <string>English</string>
3852        <key>CFBundleExecutable</key>
3853        <string>git-gui</string>
3854        <key>CFBundleIdentifier</key>
3855        <string>org.spearce.git-gui</string>
3856        <key>CFBundleInfoDictionaryVersion</key>
3857        <string>6.0</string>
3858        <key>CFBundlePackageType</key>
3859        <string>APPL</string>
3860        <key>CFBundleSignature</key>
3861        <string>????</string>
3862        <key>CFBundleVersion</key>
3863        <string>1.0</string>
3864        <key>NSPrincipalClass</key>
3865        <string>NSApplication</string>
3866</dict>
3867</plist>}
3868                                close $fd
3869
3870                                set fd [open $exe w]
3871                                set gd [file normalize [gitdir]]
3872                                set ep [file normalize [exec git --exec-path]]
3873                                regsub -all ' $gd "'\\''" gd
3874                                regsub -all ' $ep "'\\''" ep
3875                                puts $fd "#!/bin/sh"
3876                                foreach name [array names env] {
3877                                        if {[string match GIT_* $name]} {
3878                                                regsub -all ' $env($name) "'\\''" v
3879                                                puts $fd "export $name='$v'"
3880                                        }
3881                                }
3882                                puts $fd "export PATH='$ep':\$PATH"
3883                                puts $fd "export GIT_DIR='$gd'"
3884                                puts $fd "exec [file normalize $argv0]"
3885                                close $fd
3886
3887                                file attributes $exe -permissions u+x,g+x,o+x
3888                        } err]} {
3889                        error_popup "Cannot write icon:\n\n$err"
3890                }
3891        }
3892}
3893
3894proc toggle_or_diff {w x y} {
3895        global file_states file_lists current_diff_path ui_index ui_workdir
3896        global last_clicked selected_paths
3897
3898        set pos [split [$w index @$x,$y] .]
3899        set lno [lindex $pos 0]
3900        set col [lindex $pos 1]
3901        set path [lindex $file_lists($w) [expr {$lno - 1}]]
3902        if {$path eq {}} {
3903                set last_clicked {}
3904                return
3905        }
3906
3907        set last_clicked [list $w $lno]
3908        array unset selected_paths
3909        $ui_index tag remove in_sel 0.0 end
3910        $ui_workdir tag remove in_sel 0.0 end
3911
3912        if {$col == 0} {
3913                if {$current_diff_path eq $path} {
3914                        set after {reshow_diff;}
3915                } else {
3916                        set after {}
3917                }
3918                if {$w eq $ui_index} {
3919                        update_indexinfo \
3920                                "Unstaging [short_path $path] from commit" \
3921                                [list $path] \
3922                                [concat $after {set ui_status_value {Ready.}}]
3923                } elseif {$w eq $ui_workdir} {
3924                        update_index \
3925                                "Adding [short_path $path]" \
3926                                [list $path] \
3927                                [concat $after {set ui_status_value {Ready.}}]
3928                }
3929        } else {
3930                show_diff $path $w $lno
3931        }
3932}
3933
3934proc add_one_to_selection {w x y} {
3935        global file_lists last_clicked selected_paths
3936
3937        set lno [lindex [split [$w index @$x,$y] .] 0]
3938        set path [lindex $file_lists($w) [expr {$lno - 1}]]
3939        if {$path eq {}} {
3940                set last_clicked {}
3941                return
3942        }
3943
3944        if {$last_clicked ne {}
3945                && [lindex $last_clicked 0] ne $w} {
3946                array unset selected_paths
3947                [lindex $last_clicked 0] tag remove in_sel 0.0 end
3948        }
3949
3950        set last_clicked [list $w $lno]
3951        if {[catch {set in_sel $selected_paths($path)}]} {
3952                set in_sel 0
3953        }
3954        if {$in_sel} {
3955                unset selected_paths($path)
3956                $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3957        } else {
3958                set selected_paths($path) 1
3959                $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3960        }
3961}
3962
3963proc add_range_to_selection {w x y} {
3964        global file_lists last_clicked selected_paths
3965
3966        if {[lindex $last_clicked 0] ne $w} {
3967                toggle_or_diff $w $x $y
3968                return
3969        }
3970
3971        set lno [lindex [split [$w index @$x,$y] .] 0]
3972        set lc [lindex $last_clicked 1]
3973        if {$lc < $lno} {
3974                set begin $lc
3975                set end $lno
3976        } else {
3977                set begin $lno
3978                set end $lc
3979        }
3980
3981        foreach path [lrange $file_lists($w) \
3982                [expr {$begin - 1}] \
3983                [expr {$end - 1}]] {
3984                set selected_paths($path) 1
3985        }
3986        $w tag add in_sel $begin.0 [expr {$end + 1}].0
3987}
3988
3989######################################################################
3990##
3991## config defaults
3992
3993set cursor_ptr arrow
3994font create font_diff -family Courier -size 10
3995font create font_ui
3996catch {
3997        label .dummy
3998        eval font configure font_ui [font actual [.dummy cget -font]]
3999        destroy .dummy
4000}
4001
4002font create font_uibold
4003font create font_diffbold
4004
4005if {[is_Windows]} {
4006        set M1B Control
4007        set M1T Ctrl
4008} elseif {[is_MacOSX]} {
4009        set M1B M1
4010        set M1T Cmd
4011} else {
4012        set M1B M1
4013        set M1T M1
4014}
4015
4016proc apply_config {} {
4017        global repo_config font_descs
4018
4019        foreach option $font_descs {
4020                set name [lindex $option 0]
4021                set font [lindex $option 1]
4022                if {[catch {
4023                        foreach {cn cv} $repo_config(gui.$name) {
4024                                font configure $font $cn $cv
4025                        }
4026                        } err]} {
4027                        error_popup "Invalid font specified in gui.$name:\n\n$err"
4028                }
4029                foreach {cn cv} [font configure $font] {
4030                        font configure ${font}bold $cn $cv
4031                }
4032                font configure ${font}bold -weight bold
4033        }
4034}
4035
4036set default_config(gui.trustmtime) false
4037set default_config(gui.pullsummary) true
4038set default_config(gui.diffcontext) 5
4039set default_config(gui.newbranchtemplate) {}
4040set default_config(gui.fontui) [font configure font_ui]
4041set default_config(gui.fontdiff) [font configure font_diff]
4042set font_descs {
4043        {fontui   font_ui   {Main Font}}
4044        {fontdiff font_diff {Diff/Console Font}}
4045}
4046load_config 0
4047apply_config
4048
4049######################################################################
4050##
4051## ui construction
4052
4053# -- Menu Bar
4054#
4055menu .mbar -tearoff 0
4056.mbar add cascade -label Repository -menu .mbar.repository
4057.mbar add cascade -label Edit -menu .mbar.edit
4058if {!$single_commit} {
4059        .mbar add cascade -label Branch -menu .mbar.branch
4060}
4061.mbar add cascade -label Commit -menu .mbar.commit
4062if {!$single_commit} {
4063        .mbar add cascade -label Merge -menu .mbar.merge
4064        .mbar add cascade -label Fetch -menu .mbar.fetch
4065        .mbar add cascade -label Push -menu .mbar.push
4066}
4067. configure -menu .mbar
4068
4069# -- Repository Menu
4070#
4071menu .mbar.repository
4072.mbar.repository add command \
4073        -label {Visualize Current Branch} \
4074        -command {do_gitk {}} \
4075        -font font_ui
4076.mbar.repository add command \
4077        -label {Visualize All Branches} \
4078        -command {do_gitk {--all}} \
4079        -font font_ui
4080.mbar.repository add separator
4081
4082if {!$single_commit} {
4083        .mbar.repository add command -label {Database Statistics} \
4084                -command do_stats \
4085                -font font_ui
4086
4087        .mbar.repository add command -label {Compress Database} \
4088                -command do_gc \
4089                -font font_ui
4090
4091        .mbar.repository add command -label {Verify Database} \
4092                -command do_fsck_objects \
4093                -font font_ui
4094
4095        .mbar.repository add separator
4096
4097        if {[is_Windows]} {
4098                .mbar.repository add command \
4099                        -label {Create Desktop Icon} \
4100                        -command do_windows_shortcut \
4101                        -font font_ui
4102        } elseif {[is_MacOSX]} {
4103                .mbar.repository add command \
4104                        -label {Create Desktop Icon} \
4105                        -command do_macosx_app \
4106                        -font font_ui
4107        }
4108}
4109
4110.mbar.repository add command -label Quit \
4111        -command do_quit \
4112        -accelerator $M1T-Q \
4113        -font font_ui
4114
4115# -- Edit Menu
4116#
4117menu .mbar.edit
4118.mbar.edit add command -label Undo \
4119        -command {catch {[focus] edit undo}} \
4120        -accelerator $M1T-Z \
4121        -font font_ui
4122.mbar.edit add command -label Redo \
4123        -command {catch {[focus] edit redo}} \
4124        -accelerator $M1T-Y \
4125        -font font_ui
4126.mbar.edit add separator
4127.mbar.edit add command -label Cut \
4128        -command {catch {tk_textCut [focus]}} \
4129        -accelerator $M1T-X \
4130        -font font_ui
4131.mbar.edit add command -label Copy \
4132        -command {catch {tk_textCopy [focus]}} \
4133        -accelerator $M1T-C \
4134        -font font_ui
4135.mbar.edit add command -label Paste \
4136        -command {catch {tk_textPaste [focus]; [focus] see insert}} \
4137        -accelerator $M1T-V \
4138        -font font_ui
4139.mbar.edit add command -label Delete \
4140        -command {catch {[focus] delete sel.first sel.last}} \
4141        -accelerator Del \
4142        -font font_ui
4143.mbar.edit add separator
4144.mbar.edit add command -label {Select All} \
4145        -command {catch {[focus] tag add sel 0.0 end}} \
4146        -accelerator $M1T-A \
4147        -font font_ui
4148
4149# -- Branch Menu
4150#
4151if {!$single_commit} {
4152        menu .mbar.branch
4153
4154        .mbar.branch add command -label {Create...} \
4155                -command do_create_branch \
4156                -accelerator $M1T-N \
4157                -font font_ui
4158        lappend disable_on_lock [list .mbar.branch entryconf \
4159                [.mbar.branch index last] -state]
4160
4161        .mbar.branch add command -label {Delete...} \
4162                -command do_delete_branch \
4163                -font font_ui
4164        lappend disable_on_lock [list .mbar.branch entryconf \
4165                [.mbar.branch index last] -state]
4166}
4167
4168# -- Commit Menu
4169#
4170menu .mbar.commit
4171
4172.mbar.commit add radiobutton \
4173        -label {New Commit} \
4174        -command do_select_commit_type \
4175        -variable selected_commit_type \
4176        -value new \
4177        -font font_ui
4178lappend disable_on_lock \
4179        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4180
4181.mbar.commit add radiobutton \
4182        -label {Amend Last Commit} \
4183        -command do_select_commit_type \
4184        -variable selected_commit_type \
4185        -value amend \
4186        -font font_ui
4187lappend disable_on_lock \
4188        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4189
4190.mbar.commit add separator
4191
4192.mbar.commit add command -label Rescan \
4193        -command do_rescan \
4194        -accelerator F5 \
4195        -font font_ui
4196lappend disable_on_lock \
4197        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4198
4199.mbar.commit add command -label {Add To Commit} \
4200        -command do_add_selection \
4201        -font font_ui
4202lappend disable_on_lock \
4203        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4204
4205.mbar.commit add command -label {Add All To Commit} \
4206        -command do_add_all \
4207        -accelerator $M1T-I \
4208        -font font_ui
4209lappend disable_on_lock \
4210        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4211
4212.mbar.commit add command -label {Unstage From Commit} \
4213        -command do_unstage_selection \
4214        -font font_ui
4215lappend disable_on_lock \
4216        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4217
4218.mbar.commit add command -label {Revert Changes} \
4219        -command do_revert_selection \
4220        -font font_ui
4221lappend disable_on_lock \
4222        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4223
4224.mbar.commit add separator
4225
4226.mbar.commit add command -label {Sign Off} \
4227        -command do_signoff \
4228        -accelerator $M1T-S \
4229        -font font_ui
4230
4231.mbar.commit add command -label Commit \
4232        -command do_commit \
4233        -accelerator $M1T-Return \
4234        -font font_ui
4235lappend disable_on_lock \
4236        [list .mbar.commit entryconf [.mbar.commit index last] -state]
4237
4238if {[is_MacOSX]} {
4239        # -- Apple Menu (Mac OS X only)
4240        #
4241        .mbar add cascade -label Apple -menu .mbar.apple
4242        menu .mbar.apple
4243
4244        .mbar.apple add command -label "About [appname]" \
4245                -command do_about \
4246                -font font_ui
4247        .mbar.apple add command -label "[appname] Options..." \
4248                -command do_options \
4249                -font font_ui
4250} else {
4251        # -- Edit Menu
4252        #
4253        .mbar.edit add separator
4254        .mbar.edit add command -label {Options...} \
4255                -command do_options \
4256                -font font_ui
4257
4258        # -- Tools Menu
4259        #
4260        if {[file exists /usr/local/miga/lib/gui-miga]
4261                && [file exists .pvcsrc]} {
4262        proc do_miga {} {
4263                global ui_status_value
4264                if {![lock_index update]} return
4265                set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
4266                set miga_fd [open "|$cmd" r]
4267                fconfigure $miga_fd -blocking 0
4268                fileevent $miga_fd readable [list miga_done $miga_fd]
4269                set ui_status_value {Running miga...}
4270        }
4271        proc miga_done {fd} {
4272                read $fd 512
4273                if {[eof $fd]} {
4274                        close $fd
4275                        unlock_index
4276                        rescan [list set ui_status_value {Ready.}]
4277                }
4278        }
4279        .mbar add cascade -label Tools -menu .mbar.tools
4280        menu .mbar.tools
4281        .mbar.tools add command -label "Migrate" \
4282                -command do_miga \
4283                -font font_ui
4284        lappend disable_on_lock \
4285                [list .mbar.tools entryconf [.mbar.tools index last] -state]
4286        }
4287
4288        # -- Help Menu
4289        #
4290        .mbar add cascade -label Help -menu .mbar.help
4291        menu .mbar.help
4292
4293        .mbar.help add command -label "About [appname]" \
4294                -command do_about \
4295                -font font_ui
4296}
4297
4298
4299# -- Branch Control
4300#
4301frame .branch \
4302        -borderwidth 1 \
4303        -relief sunken
4304label .branch.l1 \
4305        -text {Current Branch:} \
4306        -anchor w \
4307        -justify left \
4308        -font font_ui
4309label .branch.cb \
4310        -textvariable current_branch \
4311        -anchor w \
4312        -justify left \
4313        -font font_ui
4314pack .branch.l1 -side left
4315pack .branch.cb -side left -fill x
4316pack .branch -side top -fill x
4317
4318if {!$single_commit} {
4319        menu .mbar.merge
4320        .mbar.merge add command -label {Local Merge...} \
4321                -command do_local_merge \
4322                -font font_ui
4323        lappend disable_on_lock \
4324                [list .mbar.merge entryconf [.mbar.merge index last] -state]
4325
4326        menu .mbar.fetch
4327
4328        menu .mbar.push
4329        .mbar.push add command -label {Push...} \
4330                -command do_push_anywhere \
4331                -font font_ui
4332}
4333
4334# -- Main Window Layout
4335#
4336panedwindow .vpane -orient vertical
4337panedwindow .vpane.files -orient horizontal
4338.vpane add .vpane.files -sticky nsew -height 100 -width 200
4339pack .vpane -anchor n -side top -fill both -expand 1
4340
4341# -- Index File List
4342#
4343frame .vpane.files.index -height 100 -width 200
4344label .vpane.files.index.title -text {Changes To Be Committed} \
4345        -background green \
4346        -font font_ui
4347text $ui_index -background white -borderwidth 0 \
4348        -width 20 -height 10 \
4349        -wrap none \
4350        -font font_ui \
4351        -cursor $cursor_ptr \
4352        -xscrollcommand {.vpane.files.index.sx set} \
4353        -yscrollcommand {.vpane.files.index.sy set} \
4354        -state disabled
4355scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
4356scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
4357pack .vpane.files.index.title -side top -fill x
4358pack .vpane.files.index.sx -side bottom -fill x
4359pack .vpane.files.index.sy -side right -fill y
4360pack $ui_index -side left -fill both -expand 1
4361.vpane.files add .vpane.files.index -sticky nsew
4362
4363# -- Working Directory File List
4364#
4365frame .vpane.files.workdir -height 100 -width 200
4366label .vpane.files.workdir.title -text {Changed But Not Updated} \
4367        -background red \
4368        -font font_ui
4369text $ui_workdir -background white -borderwidth 0 \
4370        -width 20 -height 10 \
4371        -wrap none \
4372        -font font_ui \
4373        -cursor $cursor_ptr \
4374        -xscrollcommand {.vpane.files.workdir.sx set} \
4375        -yscrollcommand {.vpane.files.workdir.sy set} \
4376        -state disabled
4377scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
4378scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
4379pack .vpane.files.workdir.title -side top -fill x
4380pack .vpane.files.workdir.sx -side bottom -fill x
4381pack .vpane.files.workdir.sy -side right -fill y
4382pack $ui_workdir -side left -fill both -expand 1
4383.vpane.files add .vpane.files.workdir -sticky nsew
4384
4385foreach i [list $ui_index $ui_workdir] {
4386        $i tag conf in_diff -font font_uibold
4387        $i tag conf in_sel \
4388                -background [$i cget -foreground] \
4389                -foreground [$i cget -background]
4390}
4391unset i
4392
4393# -- Diff and Commit Area
4394#
4395frame .vpane.lower -height 300 -width 400
4396frame .vpane.lower.commarea
4397frame .vpane.lower.diff -relief sunken -borderwidth 1
4398pack .vpane.lower.commarea -side top -fill x
4399pack .vpane.lower.diff -side bottom -fill both -expand 1
4400.vpane add .vpane.lower -sticky nsew
4401
4402# -- Commit Area Buttons
4403#
4404frame .vpane.lower.commarea.buttons
4405label .vpane.lower.commarea.buttons.l -text {} \
4406        -anchor w \
4407        -justify left \
4408        -font font_ui
4409pack .vpane.lower.commarea.buttons.l -side top -fill x
4410pack .vpane.lower.commarea.buttons -side left -fill y
4411
4412button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
4413        -command do_rescan \
4414        -font font_ui
4415pack .vpane.lower.commarea.buttons.rescan -side top -fill x
4416lappend disable_on_lock \
4417        {.vpane.lower.commarea.buttons.rescan conf -state}
4418
4419button .vpane.lower.commarea.buttons.incall -text {Add All} \
4420        -command do_add_all \
4421        -font font_ui
4422pack .vpane.lower.commarea.buttons.incall -side top -fill x
4423lappend disable_on_lock \
4424        {.vpane.lower.commarea.buttons.incall conf -state}
4425
4426button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
4427        -command do_signoff \
4428        -font font_ui
4429pack .vpane.lower.commarea.buttons.signoff -side top -fill x
4430
4431button .vpane.lower.commarea.buttons.commit -text {Commit} \
4432        -command do_commit \
4433        -font font_ui
4434pack .vpane.lower.commarea.buttons.commit -side top -fill x
4435lappend disable_on_lock \
4436        {.vpane.lower.commarea.buttons.commit conf -state}
4437
4438# -- Commit Message Buffer
4439#
4440frame .vpane.lower.commarea.buffer
4441frame .vpane.lower.commarea.buffer.header
4442set ui_comm .vpane.lower.commarea.buffer.t
4443set ui_coml .vpane.lower.commarea.buffer.header.l
4444radiobutton .vpane.lower.commarea.buffer.header.new \
4445        -text {New Commit} \
4446        -command do_select_commit_type \
4447        -variable selected_commit_type \
4448        -value new \
4449        -font font_ui
4450lappend disable_on_lock \
4451        [list .vpane.lower.commarea.buffer.header.new conf -state]
4452radiobutton .vpane.lower.commarea.buffer.header.amend \
4453        -text {Amend Last Commit} \
4454        -command do_select_commit_type \
4455        -variable selected_commit_type \
4456        -value amend \
4457        -font font_ui
4458lappend disable_on_lock \
4459        [list .vpane.lower.commarea.buffer.header.amend conf -state]
4460label $ui_coml \
4461        -anchor w \
4462        -justify left \
4463        -font font_ui
4464proc trace_commit_type {varname args} {
4465        global ui_coml commit_type
4466        switch -glob -- $commit_type {
4467        initial       {set txt {Initial Commit Message:}}
4468        amend         {set txt {Amended Commit Message:}}
4469        amend-initial {set txt {Amended Initial Commit Message:}}
4470        amend-merge   {set txt {Amended Merge Commit Message:}}
4471        merge         {set txt {Merge Commit Message:}}
4472        *             {set txt {Commit Message:}}
4473        }
4474        $ui_coml conf -text $txt
4475}
4476trace add variable commit_type write trace_commit_type
4477pack $ui_coml -side left -fill x
4478pack .vpane.lower.commarea.buffer.header.amend -side right
4479pack .vpane.lower.commarea.buffer.header.new -side right
4480
4481text $ui_comm -background white -borderwidth 1 \
4482        -undo true \
4483        -maxundo 20 \
4484        -autoseparators true \
4485        -relief sunken \
4486        -width 75 -height 9 -wrap none \
4487        -font font_diff \
4488        -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
4489scrollbar .vpane.lower.commarea.buffer.sby \
4490        -command [list $ui_comm yview]
4491pack .vpane.lower.commarea.buffer.header -side top -fill x
4492pack .vpane.lower.commarea.buffer.sby -side right -fill y
4493pack $ui_comm -side left -fill y
4494pack .vpane.lower.commarea.buffer -side left -fill y
4495
4496# -- Commit Message Buffer Context Menu
4497#
4498set ctxm .vpane.lower.commarea.buffer.ctxm
4499menu $ctxm -tearoff 0
4500$ctxm add command \
4501        -label {Cut} \
4502        -font font_ui \
4503        -command {tk_textCut $ui_comm}
4504$ctxm add command \
4505        -label {Copy} \
4506        -font font_ui \
4507        -command {tk_textCopy $ui_comm}
4508$ctxm add command \
4509        -label {Paste} \
4510        -font font_ui \
4511        -command {tk_textPaste $ui_comm}
4512$ctxm add command \
4513        -label {Delete} \
4514        -font font_ui \
4515        -command {$ui_comm delete sel.first sel.last}
4516$ctxm add separator
4517$ctxm add command \
4518        -label {Select All} \
4519        -font font_ui \
4520        -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
4521$ctxm add command \
4522        -label {Copy All} \
4523        -font font_ui \
4524        -command {
4525                $ui_comm tag add sel 0.0 end
4526                tk_textCopy $ui_comm
4527                $ui_comm tag remove sel 0.0 end
4528        }
4529$ctxm add separator
4530$ctxm add command \
4531        -label {Sign Off} \
4532        -font font_ui \
4533        -command do_signoff
4534bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
4535
4536# -- Diff Header
4537#
4538set current_diff_path {}
4539set current_diff_side {}
4540set diff_actions [list]
4541proc trace_current_diff_path {varname args} {
4542        global current_diff_path diff_actions file_states
4543        if {$current_diff_path eq {}} {
4544                set s {}
4545                set f {}
4546                set p {}
4547                set o disabled
4548        } else {
4549                set p $current_diff_path
4550                set s [mapdesc [lindex $file_states($p) 0] $p]
4551                set f {File:}
4552                set p [escape_path $p]
4553                set o normal
4554        }
4555
4556        .vpane.lower.diff.header.status configure -text $s
4557        .vpane.lower.diff.header.file configure -text $f
4558        .vpane.lower.diff.header.path configure -text $p
4559        foreach w $diff_actions {
4560                uplevel #0 $w $o
4561        }
4562}
4563trace add variable current_diff_path write trace_current_diff_path
4564
4565frame .vpane.lower.diff.header -background orange
4566label .vpane.lower.diff.header.status \
4567        -background orange \
4568        -width $max_status_desc \
4569        -anchor w \
4570        -justify left \
4571        -font font_ui
4572label .vpane.lower.diff.header.file \
4573        -background orange \
4574        -anchor w \
4575        -justify left \
4576        -font font_ui
4577label .vpane.lower.diff.header.path \
4578        -background orange \
4579        -anchor w \
4580        -justify left \
4581        -font font_ui
4582pack .vpane.lower.diff.header.status -side left
4583pack .vpane.lower.diff.header.file -side left
4584pack .vpane.lower.diff.header.path -fill x
4585set ctxm .vpane.lower.diff.header.ctxm
4586menu $ctxm -tearoff 0
4587$ctxm add command \
4588        -label {Copy} \
4589        -font font_ui \
4590        -command {
4591                clipboard clear
4592                clipboard append \
4593                        -format STRING \
4594                        -type STRING \
4595                        -- $current_diff_path
4596        }
4597lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4598bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
4599
4600# -- Diff Body
4601#
4602frame .vpane.lower.diff.body
4603set ui_diff .vpane.lower.diff.body.t
4604text $ui_diff -background white -borderwidth 0 \
4605        -width 80 -height 15 -wrap none \
4606        -font font_diff \
4607        -xscrollcommand {.vpane.lower.diff.body.sbx set} \
4608        -yscrollcommand {.vpane.lower.diff.body.sby set} \
4609        -state disabled
4610scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
4611        -command [list $ui_diff xview]
4612scrollbar .vpane.lower.diff.body.sby -orient vertical \
4613        -command [list $ui_diff yview]
4614pack .vpane.lower.diff.body.sbx -side bottom -fill x
4615pack .vpane.lower.diff.body.sby -side right -fill y
4616pack $ui_diff -side left -fill both -expand 1
4617pack .vpane.lower.diff.header -side top -fill x
4618pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4619
4620$ui_diff tag conf d_cr -elide true
4621$ui_diff tag conf d_@ -foreground blue -font font_diffbold
4622$ui_diff tag conf d_+ -foreground {#00a000}
4623$ui_diff tag conf d_- -foreground red
4624
4625$ui_diff tag conf d_++ -foreground {#00a000}
4626$ui_diff tag conf d_-- -foreground red
4627$ui_diff tag conf d_+s \
4628        -foreground {#00a000} \
4629        -background {#e2effa}
4630$ui_diff tag conf d_-s \
4631        -foreground red \
4632        -background {#e2effa}
4633$ui_diff tag conf d_s+ \
4634        -foreground {#00a000} \
4635        -background ivory1
4636$ui_diff tag conf d_s- \
4637        -foreground red \
4638        -background ivory1
4639
4640$ui_diff tag conf d<<<<<<< \
4641        -foreground orange \
4642        -font font_diffbold
4643$ui_diff tag conf d======= \
4644        -foreground orange \
4645        -font font_diffbold
4646$ui_diff tag conf d>>>>>>> \
4647        -foreground orange \
4648        -font font_diffbold
4649
4650$ui_diff tag raise sel
4651
4652# -- Diff Body Context Menu
4653#
4654set ctxm .vpane.lower.diff.body.ctxm
4655menu $ctxm -tearoff 0
4656$ctxm add command \
4657        -label {Refresh} \
4658        -font font_ui \
4659        -command reshow_diff
4660lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4661$ctxm add command \
4662        -label {Copy} \
4663        -font font_ui \
4664        -command {tk_textCopy $ui_diff}
4665lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4666$ctxm add command \
4667        -label {Select All} \
4668        -font font_ui \
4669        -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
4670lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4671$ctxm add command \
4672        -label {Copy All} \
4673        -font font_ui \
4674        -command {
4675                $ui_diff tag add sel 0.0 end
4676                tk_textCopy $ui_diff
4677                $ui_diff tag remove sel 0.0 end
4678        }
4679lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4680$ctxm add separator
4681$ctxm add command \
4682        -label {Apply/Reverse Hunk} \
4683        -font font_ui \
4684        -command {apply_hunk $cursorX $cursorY}
4685set ui_diff_applyhunk [$ctxm index last]
4686lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
4687$ctxm add separator
4688$ctxm add command \
4689        -label {Decrease Font Size} \
4690        -font font_ui \
4691        -command {incr_font_size font_diff -1}
4692lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4693$ctxm add command \
4694        -label {Increase Font Size} \
4695        -font font_ui \
4696        -command {incr_font_size font_diff 1}
4697lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4698$ctxm add separator
4699$ctxm add command \
4700        -label {Show Less Context} \
4701        -font font_ui \
4702        -command {if {$repo_config(gui.diffcontext) >= 2} {
4703                incr repo_config(gui.diffcontext) -1
4704                reshow_diff
4705        }}
4706lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4707$ctxm add command \
4708        -label {Show More Context} \
4709        -font font_ui \
4710        -command {
4711                incr repo_config(gui.diffcontext)
4712                reshow_diff
4713        }
4714lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4715$ctxm add separator
4716$ctxm add command -label {Options...} \
4717        -font font_ui \
4718        -command do_options
4719bind_button3 $ui_diff "
4720        set cursorX %x
4721        set cursorY %y
4722        if {\$ui_index eq \$current_diff_side} {
4723                $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
4724        } else {
4725                $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
4726        }
4727        tk_popup $ctxm %X %Y
4728"
4729unset ui_diff_applyhunk
4730
4731# -- Status Bar
4732#
4733set ui_status_value {Initializing...}
4734label .status -textvariable ui_status_value \
4735        -anchor w \
4736        -justify left \
4737        -borderwidth 1 \
4738        -relief sunken \
4739        -font font_ui
4740pack .status -anchor w -side bottom -fill x
4741
4742# -- Load geometry
4743#
4744catch {
4745set gm $repo_config(gui.geometry)
4746wm geometry . [lindex $gm 0]
4747.vpane sash place 0 \
4748        [lindex [.vpane sash coord 0] 0] \
4749        [lindex $gm 1]
4750.vpane.files sash place 0 \
4751        [lindex $gm 2] \
4752        [lindex [.vpane.files sash coord 0] 1]
4753unset gm
4754}
4755
4756# -- Key Bindings
4757#
4758bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4759bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4760bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4761bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4762bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4763bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4764bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4765bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4766bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4767bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4768bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4769
4770bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4771bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4772bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4773bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4774bind $ui_diff <$M1B-Key-v> {break}
4775bind $ui_diff <$M1B-Key-V> {break}
4776bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4777bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4778bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
4779bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
4780bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
4781bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
4782bind $ui_diff <Button-1>   {focus %W}
4783
4784if {!$single_commit} {
4785        bind . <$M1B-Key-n> do_create_branch
4786        bind . <$M1B-Key-N> do_create_branch
4787}
4788
4789bind .   <Destroy> do_quit
4790bind all <Key-F5> do_rescan
4791bind all <$M1B-Key-r> do_rescan
4792bind all <$M1B-Key-R> do_rescan
4793bind .   <$M1B-Key-s> do_signoff
4794bind .   <$M1B-Key-S> do_signoff
4795bind .   <$M1B-Key-i> do_add_all
4796bind .   <$M1B-Key-I> do_add_all
4797bind .   <$M1B-Key-Return> do_commit
4798bind all <$M1B-Key-q> do_quit
4799bind all <$M1B-Key-Q> do_quit
4800bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4801bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4802foreach i [list $ui_index $ui_workdir] {
4803        bind $i <Button-1>       "toggle_or_diff         $i %x %y; break"
4804        bind $i <$M1B-Button-1>  "add_one_to_selection   $i %x %y; break"
4805        bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
4806}
4807unset i
4808
4809set file_lists($ui_index) [list]
4810set file_lists($ui_workdir) [list]
4811
4812set HEAD {}
4813set PARENT {}
4814set MERGE_HEAD [list]
4815set commit_type {}
4816set empty_tree {}
4817set current_branch {}
4818set current_diff_path {}
4819set selected_commit_type new
4820
4821wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
4822focus -force $ui_comm
4823
4824# -- Warn the user about environmental problems.  Cygwin's Tcl
4825#    does *not* pass its env array onto any processes it spawns.
4826#    This means that git processes get none of our environment.
4827#
4828if {[is_Windows]} {
4829        set ignored_env 0
4830        set suggest_user {}
4831        set msg "Possible environment issues exist.
4832
4833The following environment variables are probably
4834going to be ignored by any Git subprocess run
4835by [appname]:
4836
4837"
4838        foreach name [array names env] {
4839                switch -regexp -- $name {
4840                {^GIT_INDEX_FILE$} -
4841                {^GIT_OBJECT_DIRECTORY$} -
4842                {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4843                {^GIT_DIFF_OPTS$} -
4844                {^GIT_EXTERNAL_DIFF$} -
4845                {^GIT_PAGER$} -
4846                {^GIT_TRACE$} -
4847                {^GIT_CONFIG$} -
4848                {^GIT_CONFIG_LOCAL$} -
4849                {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4850                        append msg " - $name\n"
4851                        incr ignored_env
4852                }
4853                {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4854                        append msg " - $name\n"
4855                        incr ignored_env
4856                        set suggest_user $name
4857                }
4858                }
4859        }
4860        if {$ignored_env > 0} {
4861                append msg "
4862This is due to a known issue with the
4863Tcl binary distributed by Cygwin."
4864
4865                if {$suggest_user ne {}} {
4866                        append msg "
4867
4868A good replacement for $suggest_user
4869is placing values for the user.name and
4870user.email settings into your personal
4871~/.gitconfig file.
4872"
4873                }
4874                warn_popup $msg
4875        }
4876        unset ignored_env msg suggest_user name
4877}
4878
4879# -- Only initialize complex UI if we are going to stay running.
4880#
4881if {!$single_commit} {
4882        load_all_remotes
4883        load_all_heads
4884
4885        populate_branch_menu
4886        populate_fetch_menu
4887        populate_push_menu
4888}
4889
4890# -- Only suggest a gc run if we are going to stay running.
4891#
4892if {!$single_commit} {
4893        set object_limit 2000
4894        if {[is_Windows]} {set object_limit 200}
4895        regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4896        if {$objects_current >= $object_limit} {
4897                if {[ask_popup \
4898                        "This repository currently has $objects_current loose objects.
4899
4900To maintain optimal performance it is strongly
4901recommended that you compress the database
4902when more than $object_limit loose objects exist.
4903
4904Compress the database now?"] eq yes} {
4905                        do_gc
4906                }
4907        }
4908        unset object_limit _junk objects_current
4909}
4910
4911lock_index begin-read
4912after 1 do_rescan