git-gui.sh

   1 #!/bin/sh
   2 # Tcl ignores the next line -*- tcl -*- \
   3 exec wish "$0" -- "$@"
   4
   5 set appvers {@@GIT_VERSION@@}
   6 set copyright {
   7 Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
   8
   9 This program is free software; you can redistribute it and/or modify
  10 it under the terms of the GNU General Public License as published by
  11 the Free Software Foundation; either version 2 of the License, or
  12 (at your option) any later version.
  13
  14 This program is distributed in the hope that it will be useful,
  15 but WITHOUT ANY WARRANTY; without even the implied warranty of
  16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  17 GNU General Public License for more details.
  18
  19 You should have received a copy of the GNU General Public License
  20 along with this program; if not, write to the Free Software
  21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}
  22
  23 ######################################################################
  24 ##
  25 ## read only globals
  26
  27 set _appname [lindex [file split $argv0] end]
  28 set _gitdir {}
  29 set _reponame {}
  30
  31 proc appname {} {
  32         global _appname
  33         return $_appname
  34 }
  35
  36 proc gitdir {args} {
  37         global _gitdir
  38         if {$args eq {}} {
  39                 return $_gitdir
  40         }
  41         return [eval [concat [list file join $_gitdir] $args]]
  42 }
  43
  44 proc reponame {} {
  45         global _reponame
  46         return $_reponame
  47 }
  48
  49 ######################################################################
  50 ##
  51 ## config
  52
  53 proc is_many_config {name} {
  54         switch -glob -- $name {
  55         remote.*.fetch -
  56         remote.*.push
  57                 {return 1}
  58         *
  59                 {return 0}
  60         }
  61 }
  62
  63 proc 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
 108 proc 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
 158 proc 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
 174 proc 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
 190 proc 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
 203 proc 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
 220 if {   [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 }
 226 if {![file isdirectory $_gitdir]} {
 227         catch {wm withdraw .}
 228         error_popup "Git directory not found:\n\n$_gitdir"
 229         exit 1
 230 }
 231 if {[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 }
 236 if {[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 }
 241 set _reponame [lindex [file split \
 242         [file normalize [file dirname $_gitdir]]] \
 243         end]
 244
 245 set single_commit 0
 246 if {[appname] eq {git-citool}} {
 247         set single_commit 1
 248 }
 249
 250 ######################################################################
 251 ##
 252 ## task management
 253
 254 set rescan_active 0
 255 set diff_active 0
 256 set last_clicked {}
 257
 258 set disable_on_lock [list]
 259 set index_lock_type none
 260
 261 proc 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
 277 proc 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
 290 proc 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
 325 proc 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
 338 proc 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
 386 proc 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
 421 proc 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
 439 proc 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
 472 proc 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
 505 proc 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
 517 proc 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
 534 proc 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
 548 proc 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
 563 proc 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
 578 proc 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
 589 The modification date of this file was updated
 590 by another application, but the content within
 591 the file was not changed.
 592
 593 A rescan will be automatically started to find
 594 other 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
 601 proc 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
 718 proc 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
 813 proc 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
 888 proc 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
 895 You are about to create the initial commit.
 896 There 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
 905 You are currently in the middle of a merge that
 906 has not been fully completed.  You cannot amend
 907 the prior commit unless you first abort the
 908 current 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
 952 proc 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
 962 set GIT_COMMITTER_IDENT {}
 963
 964 proc 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
 982 proc 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
 998 Another Git program has modified this repository
 999 since the last scan.  A rescan must be performed
1000 before another commit can be created.
1001
1002 The 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
1021 File [short_path $path] has merge conflicts.
1022 You 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
1030 File [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
1038 You 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
1051 A 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
1088 proc 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
1107 proc 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
1116 proc 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
1274 proc 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
1283 proc 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
1297 proc 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
1307 proc 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
1317 proc escape_path {path} {
1318         regsub -all "\n" $path "\\n" path
1319         return $path
1320 }
1321
1322 proc short_path {path} {
1323         return [escape_path [lindex [file split $path] end]]
1324 }
1325
1326 set next_icon_id 0
1327 set null_sha1 [string repeat 0 40]
1328
1329 proc 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
1364 proc 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
1395 proc 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
1432 proc 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
1444 proc 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
1485 proc 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
1519 proc 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
1558 proc 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
1592 proc 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
1635 proc 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
1675 proc 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
1712 proc 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
1726 proc 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
1741 proc 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
1775 proc 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
1801 proc 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
1880 proc radio_selector {varname value args} {
1881         upvar #0 $varname var
1882         set var $value
1883 }
1884
1885 trace add variable create_branch_head write \
1886         [list radio_selector create_branch_revtype head]
1887 trace add variable create_branch_trackinghead write \
1888         [list radio_selector create_branch_revtype tracking]
1889
1890 trace add variable delete_branch_head write \
1891         [list radio_selector delete_branch_checktype head]
1892 trace add variable delete_branch_trackinghead write \
1893         [list radio_selector delete_branch_checktype tracking]
1894
1895 proc 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
2013 proc 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
2065 Delete 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
2104 proc 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
2184 proc 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
2198 Another Git program has modified this repository
2199 since the last scan.  A rescan must be performed
2200 before the current branch can be changed.
2201
2202 The 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
2232 proc 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
2254 proc 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
2278 Staying 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
2291 This working directory is only partially switched.
2292 We successfully updated your files, but failed to
2293 update an internal Git file.
2294
2295 This should not have occurred.  [appname] will now
2296 close 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
2326 proc 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
2376 proc 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
2408 proc 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
2445 proc 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
2483 trace add variable push_remote write \
2484         [list radio_selector push_urltype remote]
2485
2486 proc 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
2598 proc 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
2604 You must finish amending this commit before
2605 starting 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
2619 Another Git program has modified this repository
2620 since the last scan.  A rescan must be performed
2621 before a merge can be performed.
2622
2623 The 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
2635 File [short_path $path] has merge conflicts.
2636
2637 You must resolve them, add the file, and commit to
2638 complete the current merge.  Only then can you
2639 begin another merge.
2640 "
2641                         unlock_index
2642                         return 0
2643                 }
2644                 }
2645         }
2646
2647         return 1
2648 }
2649
2650 proc 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
2660 proc 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
2687 You have requested to merge $revcnt branches
2688 in an octopus merge.  This exceeds Git's
2689 internal limit of 15 branches per merge.
2690
2691 Please select fewer branches.  To merge more
2692 than 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
2703 proc 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
2714 proc 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 proc do_reset_hard {} {
2790         global HEAD commit_type file_states
2791
2792         if {[string match amend* $commit_type]} {
2793                 info_popup {Cannot abort while amending.
2794
2795 You must finish amending this commit.
2796 }
2797                 return
2798         }
2799
2800         if {![lock_index abort]} return
2801
2802         if {[string match *merge* $commit_type]} {
2803                 set op merge
2804         } else {
2805                 set op commit
2806         }
2807
2808         if {[ask_popup "Abort $op?
2809
2810 Aborting the current $op will cause
2811 *ALL* uncommitted changes to be lost.
2812
2813 Continue with aborting the current $op?"] eq {yes}} {
2814                 set fd [open "| git read-tree --reset -u HEAD" r]
2815                 fconfigure $fd -blocking 0 -translation binary
2816                 fileevent $fd readable [list reset_hard_wait $fd]
2817                 set ui_status_value {Aborting... please wait...}
2818         } else {
2819                 unlock_index
2820         }
2821 }
2822
2823 proc reset_hard_wait {fd} {
2824         global ui_comm
2825
2826         read $fd
2827         if {[eof $fd]} {
2828                 close $fd
2829                 unlock_index
2830
2831                 $ui_comm delete 0.0 end
2832                 $ui_comm edit modified false
2833
2834                 catch {file delete [gitdir MERGE_HEAD]}
2835                 catch {file delete [gitdir rr-cache MERGE_RR]}
2836                 catch {file delete [gitdir SQUASH_MSG]}
2837                 catch {file delete [gitdir MERGE_MSG]}
2838                 catch {file delete [gitdir GITGUI_MSG]}
2839
2840                 rescan {set ui_status_value {Abort completed.  Ready.}}
2841         }
2842 }
2843
2844 ######################################################################
2845 ##
2846 ## icons
2847
2848 set filemask {
2849 #define mask_width 14
2850 #define mask_height 15
2851 static unsigned char mask_bits[] = {
2852    0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2853    0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2854    0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2855 }
2856
2857 image create bitmap file_plain -background white -foreground black -data {
2858 #define plain_width 14
2859 #define plain_height 15
2860 static unsigned char plain_bits[] = {
2861    0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2862    0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2863    0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2864 } -maskdata $filemask
2865
2866 image create bitmap file_mod -background white -foreground blue -data {
2867 #define mod_width 14
2868 #define mod_height 15
2869 static unsigned char mod_bits[] = {
2870    0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2871    0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2872    0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2873 } -maskdata $filemask
2874
2875 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2876 #define file_fulltick_width 14
2877 #define file_fulltick_height 15
2878 static unsigned char file_fulltick_bits[] = {
2879    0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2880    0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2881    0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2882 } -maskdata $filemask
2883
2884 image create bitmap file_parttick -background white -foreground "#005050" -data {
2885 #define parttick_width 14
2886 #define parttick_height 15
2887 static unsigned char parttick_bits[] = {
2888    0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2889    0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2890    0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2891 } -maskdata $filemask
2892
2893 image create bitmap file_question -background white -foreground black -data {
2894 #define file_question_width 14
2895 #define file_question_height 15
2896 static unsigned char file_question_bits[] = {
2897    0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2898    0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2899    0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2900 } -maskdata $filemask
2901
2902 image create bitmap file_removed -background white -foreground red -data {
2903 #define file_removed_width 14
2904 #define file_removed_height 15
2905 static unsigned char file_removed_bits[] = {
2906    0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2907    0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2908    0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2909 } -maskdata $filemask
2910
2911 image create bitmap file_merge -background white -foreground blue -data {
2912 #define file_merge_width 14
2913 #define file_merge_height 15
2914 static unsigned char file_merge_bits[] = {
2915    0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2916    0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2917    0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2918 } -maskdata $filemask
2919
2920 set ui_index .vpane.files.index.list
2921 set ui_workdir .vpane.files.workdir.list
2922
2923 set all_icons(_$ui_index)   file_plain
2924 set all_icons(A$ui_index)   file_fulltick
2925 set all_icons(M$ui_index)   file_fulltick
2926 set all_icons(D$ui_index)   file_removed
2927 set all_icons(U$ui_index)   file_merge
2928
2929 set all_icons(_$ui_workdir) file_plain
2930 set all_icons(M$ui_workdir) file_mod
2931 set all_icons(D$ui_workdir) file_question
2932 set all_icons(U$ui_workdir) file_merge
2933 set all_icons(O$ui_workdir) file_plain
2934
2935 set max_status_desc 0
2936 foreach i {
2937                 {__ "Unmodified"}
2938
2939                 {_M "Modified, not staged"}
2940                 {M_ "Staged for commit"}
2941                 {MM "Portions staged for commit"}
2942                 {MD "Staged for commit, missing"}
2943
2944                 {_O "Untracked, not staged"}
2945                 {A_ "Staged for commit"}
2946                 {AM "Portions staged for commit"}
2947                 {AD "Staged for commit, missing"}
2948
2949                 {_D "Missing"}
2950                 {D_ "Staged for removal"}
2951                 {DO "Staged for removal, still present"}
2952
2953                 {U_ "Requires merge resolution"}
2954                 {UU "Requires merge resolution"}
2955                 {UM "Requires merge resolution"}
2956                 {UD "Requires merge resolution"}
2957         } {
2958         if {$max_status_desc < [string length [lindex $i 1]]} {
2959                 set max_status_desc [string length [lindex $i 1]]
2960         }
2961         set all_descs([lindex $i 0]) [lindex $i 1]
2962 }
2963 unset i
2964
2965 ######################################################################
2966 ##
2967 ## util
2968
2969 proc is_MacOSX {} {
2970         global tcl_platform tk_library
2971         if {[tk windowingsystem] eq {aqua}} {
2972                 return 1
2973         }
2974         return 0
2975 }
2976
2977 proc is_Windows {} {
2978         global tcl_platform
2979         if {$tcl_platform(platform) eq {windows}} {
2980                 return 1
2981         }
2982         return 0
2983 }
2984
2985 proc bind_button3 {w cmd} {
2986         bind $w <Any-Button-3> $cmd
2987         if {[is_MacOSX]} {
2988                 bind $w <Control-Button-1> $cmd
2989         }
2990 }
2991
2992 proc incr_font_size {font {amt 1}} {
2993         set sz [font configure $font -size]
2994         incr sz $amt
2995         font configure $font -size $sz
2996         font configure ${font}bold -size $sz
2997 }
2998
2999 proc hook_failed_popup {hook msg} {
3000         set w .hookfail
3001         toplevel $w
3002
3003         frame $w.m
3004         label $w.m.l1 -text "$hook hook failed:" \
3005                 -anchor w \
3006                 -justify left \
3007                 -font font_uibold
3008         text $w.m.t \
3009                 -background white -borderwidth 1 \
3010                 -relief sunken \
3011                 -width 80 -height 10 \
3012                 -font font_diff \
3013                 -yscrollcommand [list $w.m.sby set]
3014         label $w.m.l2 \
3015                 -text {You must correct the above errors before committing.} \
3016                 -anchor w \
3017                 -justify left \
3018                 -font font_uibold
3019         scrollbar $w.m.sby -command [list $w.m.t yview]
3020         pack $w.m.l1 -side top -fill x
3021         pack $w.m.l2 -side bottom -fill x
3022         pack $w.m.sby -side right -fill y
3023         pack $w.m.t -side left -fill both -expand 1
3024         pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3025
3026         $w.m.t insert 1.0 $msg
3027         $w.m.t conf -state disabled
3028
3029         button $w.ok -text OK \
3030                 -width 15 \
3031                 -font font_ui \
3032                 -command "destroy $w"
3033         pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3034
3035         bind $w <Visibility> "grab $w; focus $w"
3036         bind $w <Key-Return> "destroy $w"
3037         wm title $w "[appname] ([reponame]): error"
3038         tkwait window $w
3039 }
3040
3041 set next_console_id 0
3042
3043 proc new_console {short_title long_title} {
3044         global next_console_id console_data
3045         set w .console[incr next_console_id]
3046         set console_data($w) [list $short_title $long_title]
3047         return [console_init $w]
3048 }
3049
3050 proc console_init {w} {
3051         global console_cr console_data M1B
3052
3053         set console_cr($w) 1.0
3054         toplevel $w
3055         frame $w.m
3056         label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
3057                 -anchor w \
3058                 -justify left \
3059                 -font font_uibold
3060         text $w.m.t \
3061                 -background white -borderwidth 1 \
3062                 -relief sunken \
3063                 -width 80 -height 10 \
3064                 -font font_diff \
3065                 -state disabled \
3066                 -yscrollcommand [list $w.m.sby set]
3067         label $w.m.s -text {Working... please wait...} \
3068                 -anchor w \
3069                 -justify left \
3070                 -font font_uibold
3071         scrollbar $w.m.sby -command [list $w.m.t yview]
3072         pack $w.m.l1 -side top -fill x
3073         pack $w.m.s -side bottom -fill x
3074         pack $w.m.sby -side right -fill y
3075         pack $w.m.t -side left -fill both -expand 1
3076         pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3077
3078         menu $w.ctxm -tearoff 0
3079         $w.ctxm add command -label "Copy" \
3080                 -font font_ui \
3081                 -command "tk_textCopy $w.m.t"
3082         $w.ctxm add command -label "Select All" \
3083                 -font font_ui \
3084                 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3085         $w.ctxm add command -label "Copy All" \
3086                 -font font_ui \
3087                 -command "
3088                         $w.m.t tag add sel 0.0 end
3089                         tk_textCopy $w.m.t
3090                         $w.m.t tag remove sel 0.0 end
3091                 "
3092
3093         button $w.ok -text {Close} \
3094                 -font font_ui \
3095                 -state disabled \
3096                 -command "destroy $w"
3097         pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3098
3099         bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
3100         bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
3101         bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
3102         bind $w <Visibility> "focus $w"
3103         wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
3104         return $w
3105 }
3106
3107 proc console_exec {w cmd after} {
3108         # -- Windows tosses the enviroment when we exec our child.
3109         #    But most users need that so we have to relogin. :-(
3110         #
3111         if {[is_Windows]} {
3112                 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
3113         }
3114
3115         # -- Tcl won't let us redirect both stdout and stderr to
3116         #    the same pipe.  So pass it through cat...
3117         #
3118         set cmd [concat | $cmd |& cat]
3119
3120         set fd_f [open $cmd r]
3121         fconfigure $fd_f -blocking 0 -translation binary
3122         fileevent $fd_f readable [list console_read $w $fd_f $after]
3123 }
3124
3125 proc console_read {w fd after} {
3126         global console_cr
3127
3128         set buf [read $fd]
3129         if {$buf ne {}} {
3130                 if {![winfo exists $w]} {console_init $w}
3131                 $w.m.t conf -state normal
3132                 set c 0
3133                 set n [string length $buf]
3134                 while {$c < $n} {
3135                         set cr [string first "\r" $buf $c]
3136                         set lf [string first "\n" $buf $c]
3137                         if {$cr < 0} {set cr [expr {$n + 1}]}
3138                         if {$lf < 0} {set lf [expr {$n + 1}]}
3139
3140                         if {$lf < $cr} {
3141                                 $w.m.t insert end [string range $buf $c $lf]
3142                                 set console_cr($w) [$w.m.t index {end -1c}]
3143                                 set c $lf
3144                                 incr c
3145                         } else {
3146                                 $w.m.t delete $console_cr($w) end
3147                                 $w.m.t insert end "\n"
3148                                 $w.m.t insert end [string range $buf $c $cr]
3149                                 set c $cr
3150                                 incr c
3151                         }
3152                 }
3153                 $w.m.t conf -state disabled
3154                 $w.m.t see end
3155         }
3156
3157         fconfigure $fd -blocking 1
3158         if {[eof $fd]} {
3159                 if {[catch {close $fd}]} {
3160                         set ok 0
3161                 } else {
3162                         set ok 1
3163                 }
3164                 uplevel #0 $after $w $ok
3165                 return
3166         }
3167         fconfigure $fd -blocking 0
3168 }
3169
3170 proc console_chain {cmdlist w {ok 1}} {
3171         if {$ok} {
3172                 if {[llength $cmdlist] == 0} {
3173                         console_done $w $ok
3174                         return
3175                 }
3176
3177                 set cmd [lindex $cmdlist 0]
3178                 set cmdlist [lrange $cmdlist 1 end]
3179
3180                 if {[lindex $cmd 0] eq {console_exec}} {
3181                         console_exec $w \
3182                                 [lindex $cmd 1] \
3183                                 [list console_chain $cmdlist]
3184                 } else {
3185                         uplevel #0 $cmd $cmdlist $w $ok
3186                 }
3187         } else {
3188                 console_done $w $ok
3189         }
3190 }
3191
3192 proc console_done {args} {
3193         global console_cr console_data
3194
3195         switch -- [llength $args] {
3196         2 {
3197                 set w [lindex $args 0]
3198                 set ok [lindex $args 1]
3199         }
3200         3 {
3201                 set w [lindex $args 1]
3202                 set ok [lindex $args 2]
3203         }
3204         default {
3205                 error "wrong number of args: console_done ?ignored? w ok"
3206         }
3207         }
3208
3209         if {$ok} {
3210                 if {[winfo exists $w]} {
3211                         $w.m.s conf -background green -text {Success}
3212                         $w.ok conf -state normal
3213                 }
3214         } else {
3215                 if {![winfo exists $w]} {
3216                         console_init $w
3217                 }
3218                 $w.m.s conf -background red -text {Error: Command Failed}
3219                 $w.ok conf -state normal
3220         }
3221
3222         array unset console_cr $w
3223         array unset console_data $w
3224 }
3225
3226 ######################################################################
3227 ##
3228 ## ui commands
3229
3230 set starting_gitk_msg {Starting gitk... please wait...}
3231
3232 proc do_gitk {revs} {
3233         global ui_status_value starting_gitk_msg
3234
3235         set cmd gitk
3236         if {$revs ne {}} {
3237                 append cmd { }
3238                 append cmd $revs
3239         }
3240         if {[is_Windows]} {
3241                 set cmd "sh -c \"exec $cmd\""
3242         }
3243         append cmd { &}
3244
3245         if {[catch {eval exec $cmd} err]} {
3246                 error_popup "Failed to start gitk:\n\n$err"
3247         } else {
3248                 set ui_status_value $starting_gitk_msg
3249                 after 10000 {
3250                         if {$ui_status_value eq $starting_gitk_msg} {
3251                                 set ui_status_value {Ready.}
3252                         }
3253                 }
3254         }
3255 }
3256
3257 proc do_stats {} {
3258         set fd [open "| git count-objects -v" r]
3259         while {[gets $fd line] > 0} {
3260                 if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
3261                         set stats($name) $value
3262                 }
3263         }
3264         close $fd
3265
3266         set packed_sz 0
3267         foreach p [glob -directory [gitdir objects pack] \
3268                 -type f \
3269                 -nocomplain -- *] {
3270                 incr packed_sz [file size $p]
3271         }
3272         if {$packed_sz > 0} {
3273                 set stats(size-pack) [expr {$packed_sz / 1024}]
3274         }
3275
3276         set w .stats_view
3277         toplevel $w
3278         wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3279
3280         label $w.header -text {Database Statistics} \
3281                 -font font_uibold
3282         pack $w.header -side top -fill x
3283
3284         frame $w.buttons -border 1
3285         button $w.buttons.close -text Close \
3286                 -font font_ui \
3287                 -command [list destroy $w]
3288         button $w.buttons.gc -text {Compress Database} \
3289                 -font font_ui \
3290                 -command "destroy $w;do_gc"
3291         pack $w.buttons.close -side right
3292         pack $w.buttons.gc -side left
3293         pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3294
3295         frame $w.stat -borderwidth 1 -relief solid
3296         foreach s {
3297                 {count           {Number of loose objects}}
3298                 {size            {Disk space used by loose objects} { KiB}}
3299                 {in-pack         {Number of packed objects}}
3300                 {packs           {Number of packs}}
3301                 {size-pack       {Disk space used by packed objects} { KiB}}
3302                 {prune-packable  {Packed objects waiting for pruning}}
3303                 {garbage         {Garbage files}}
3304                 } {
3305                 set name [lindex $s 0]
3306                 set label [lindex $s 1]
3307                 if {[catch {set value $stats($name)}]} continue
3308                 if {[llength $s] > 2} {
3309                         set value "$value[lindex $s 2]"
3310                 }
3311
3312                 label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
3313                 label $w.stat.v_$name -text $value -anchor w -font font_ui
3314                 grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
3315         }
3316         pack $w.stat -pady 10 -padx 10
3317
3318         bind $w <Visibility> "grab $w; focus $w"
3319         bind $w <Key-Escape> [list destroy $w]
3320         bind $w <Key-Return> [list destroy $w]
3321         wm title $w "[appname] ([reponame]): Database Statistics"
3322         tkwait window $w
3323 }
3324
3325 proc do_gc {} {
3326         set w [new_console {gc} {Compressing the object database}]
3327         console_chain {
3328                 {console_exec {git pack-refs --prune}}
3329                 {console_exec {git reflog expire --all}}
3330                 {console_exec {git repack -a -d -l}}
3331                 {console_exec {git rerere gc}}
3332         } $w
3333 }
3334
3335 proc do_fsck_objects {} {
3336         set w [new_console {fsck-objects} \
3337                 {Verifying the object database with fsck-objects}]
3338         set cmd [list git fsck-objects]
3339         lappend cmd --full
3340         lappend cmd --cache
3341         lappend cmd --strict
3342         console_exec $w $cmd console_done
3343 }
3344
3345 set is_quitting 0
3346
3347 proc do_quit {} {
3348         global ui_comm is_quitting repo_config commit_type
3349
3350         if {$is_quitting} return
3351         set is_quitting 1
3352
3353         # -- Stash our current commit buffer.
3354         #
3355         set save [gitdir GITGUI_MSG]
3356         set msg [string trim [$ui_comm get 0.0 end]]
3357         regsub -all -line {[ \r\t]+$} $msg {} msg
3358         if {(![string match amend* $commit_type]
3359                 || [$ui_comm edit modified])
3360                 && $msg ne {}} {
3361                 catch {
3362                         set fd [open $save w]
3363                         puts -nonewline $fd $msg
3364                         close $fd
3365                 }
3366         } else {
3367                 catch {file delete $save}
3368         }
3369
3370         # -- Stash our current window geometry into this repository.
3371         #
3372         set cfg_geometry [list]
3373         lappend cfg_geometry [wm geometry .]
3374         lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
3375         lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
3376         if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
3377                 set rc_geometry {}
3378         }
3379         if {$cfg_geometry ne $rc_geometry} {
3380                 catch {exec git repo-config gui.geometry $cfg_geometry}
3381         }
3382
3383         destroy .
3384 }
3385
3386 proc do_rescan {} {
3387         rescan {set ui_status_value {Ready.}}
3388 }
3389
3390 proc unstage_helper {txt paths} {
3391         global file_states current_diff_path
3392
3393         if {![lock_index begin-update]} return
3394
3395         set pathList [list]
3396         set after {}
3397         foreach path $paths {
3398                 switch -glob -- [lindex $file_states($path) 0] {
3399                 A? -
3400                 M? -
3401                 D? {
3402                         lappend pathList $path
3403                         if {$path eq $current_diff_path} {
3404                                 set after {reshow_diff;}
3405                         }
3406                 }
3407                 }
3408         }
3409         if {$pathList eq {}} {
3410                 unlock_index
3411         } else {
3412                 update_indexinfo \
3413                         $txt \
3414                         $pathList \
3415                         [concat $after {set ui_status_value {Ready.}}]
3416         }
3417 }
3418
3419 proc do_unstage_selection {} {
3420         global current_diff_path selected_paths
3421
3422         if {[array size selected_paths] > 0} {
3423                 unstage_helper \
3424                         {Unstaging selected files from commit} \
3425                         [array names selected_paths]
3426         } elseif {$current_diff_path ne {}} {
3427                 unstage_helper \
3428                         "Unstaging [short_path $current_diff_path] from commit" \
3429                         [list $current_diff_path]
3430         }
3431 }
3432
3433 proc add_helper {txt paths} {
3434         global file_states current_diff_path
3435
3436         if {![lock_index begin-update]} return
3437
3438         set pathList [list]
3439         set after {}
3440         foreach path $paths {
3441                 switch -glob -- [lindex $file_states($path) 0] {
3442                 _O -
3443                 ?M -
3444                 ?D -
3445                 U? {
3446                         lappend pathList $path
3447                         if {$path eq $current_diff_path} {
3448                                 set after {reshow_diff;}
3449                         }
3450                 }
3451                 }
3452         }
3453         if {$pathList eq {}} {
3454                 unlock_index
3455         } else {
3456                 update_index \
3457                         $txt \
3458                         $pathList \
3459                         [concat $after {set ui_status_value {Ready to commit.}}]
3460         }
3461 }
3462
3463 proc do_add_selection {} {
3464         global current_diff_path selected_paths
3465
3466         if {[array size selected_paths] > 0} {
3467                 add_helper \
3468                         {Adding selected files} \
3469                         [array names selected_paths]
3470         } elseif {$current_diff_path ne {}} {
3471                 add_helper \
3472                         "Adding [short_path $current_diff_path]" \
3473                         [list $current_diff_path]
3474         }
3475 }
3476
3477 proc do_add_all {} {
3478         global file_states
3479
3480         set paths [list]
3481         foreach path [array names file_states] {
3482                 switch -glob -- [lindex $file_states($path) 0] {
3483                 U? {continue}
3484                 ?M -
3485                 ?D {lappend paths $path}
3486                 }
3487         }
3488         add_helper {Adding all changed files} $paths
3489 }
3490
3491 proc revert_helper {txt paths} {
3492         global file_states current_diff_path
3493
3494         if {![lock_index begin-update]} return
3495
3496         set pathList [list]
3497         set after {}
3498         foreach path $paths {
3499                 switch -glob -- [lindex $file_states($path) 0] {
3500                 U? {continue}
3501                 ?M -
3502                 ?D {
3503                         lappend pathList $path
3504                         if {$path eq $current_diff_path} {
3505                                 set after {reshow_diff;}
3506                         }
3507                 }
3508                 }
3509         }
3510
3511         set n [llength $pathList]
3512         if {$n == 0} {
3513                 unlock_index
3514                 return
3515         } elseif {$n == 1} {
3516                 set s "[short_path [lindex $pathList]]"
3517         } else {
3518                 set s "these $n files"
3519         }
3520
3521         set reply [tk_dialog \
3522                 .confirm_revert \
3523                 "[appname] ([reponame])" \
3524                 "Revert changes in $s?
3525
3526 Any unadded changes will be permanently lost by the revert." \
3527                 question \
3528                 1 \
3529                 {Do Nothing} \
3530                 {Revert Changes} \
3531                 ]
3532         if {$reply == 1} {
3533                 checkout_index \
3534                         $txt \
3535                         $pathList \
3536                         [concat $after {set ui_status_value {Ready.}}]
3537         } else {
3538                 unlock_index
3539         }
3540 }
3541
3542 proc do_revert_selection {} {
3543         global current_diff_path selected_paths
3544
3545         if {[array size selected_paths] > 0} {
3546                 revert_helper \
3547                         {Reverting selected files} \
3548                         [array names selected_paths]
3549         } elseif {$current_diff_path ne {}} {
3550                 revert_helper \
3551                         "Reverting [short_path $current_diff_path]" \
3552                         [list $current_diff_path]
3553         }
3554 }
3555
3556 proc do_signoff {} {
3557         global ui_comm
3558
3559         set me [committer_ident]
3560         if {$me eq {}} return
3561
3562         set sob "Signed-off-by: $me"
3563         set last [$ui_comm get {end -1c linestart} {end -1c}]
3564         if {$last ne $sob} {
3565                 $ui_comm edit separator
3566                 if {$last ne {}
3567                         && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
3568                         $ui_comm insert end "\n"
3569                 }
3570                 $ui_comm insert end "\n$sob"
3571                 $ui_comm edit separator
3572                 $ui_comm see end
3573         }
3574 }
3575
3576 proc do_select_commit_type {} {
3577         global commit_type selected_commit_type
3578
3579         if {$selected_commit_type eq {new}
3580                 && [string match amend* $commit_type]} {
3581                 create_new_commit
3582         } elseif {$selected_commit_type eq {amend}
3583                 && ![string match amend* $commit_type]} {
3584                 load_last_commit
3585
3586                 # The amend request was rejected...
3587                 #
3588                 if {![string match amend* $commit_type]} {
3589                         set selected_commit_type new
3590                 }
3591         }
3592 }
3593
3594 proc do_commit {} {
3595         commit_tree
3596 }
3597
3598 proc do_about {} {
3599         global appvers copyright
3600         global tcl_patchLevel tk_patchLevel
3601
3602         set w .about_dialog
3603         toplevel $w
3604         wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3605
3606         label $w.header -text "About [appname]" \
3607                 -font font_uibold
3608         pack $w.header -side top -fill x
3609
3610         frame $w.buttons
3611         button $w.buttons.close -text {Close} \
3612                 -font font_ui \
3613                 -command [list destroy $w]
3614         pack $w.buttons.close -side right
3615         pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3616
3617         label $w.desc \
3618                 -text "[appname] - a commit creation tool for Git.
3619 $copyright" \
3620                 -padx 5 -pady 5 \
3621                 -justify left \
3622                 -anchor w \
3623                 -borderwidth 1 \
3624                 -relief solid \
3625                 -font font_ui
3626         pack $w.desc -side top -fill x -padx 5 -pady 5
3627
3628         set v {}
3629         append v "[appname] version $appvers\n"
3630         append v "[exec git version]\n"
3631         append v "\n"
3632         if {$tcl_patchLevel eq $tk_patchLevel} {
3633                 append v "Tcl/Tk version $tcl_patchLevel"
3634         } else {
3635                 append v "Tcl version $tcl_patchLevel"
3636                 append v ", Tk version $tk_patchLevel"
3637         }
3638
3639         label $w.vers \
3640                 -text $v \
3641                 -padx 5 -pady 5 \
3642                 -justify left \
3643                 -anchor w \
3644                 -borderwidth 1 \
3645                 -relief solid \
3646                 -font font_ui
3647         pack $w.vers -side top -fill x -padx 5 -pady 5
3648
3649         menu $w.ctxm -tearoff 0
3650         $w.ctxm add command \
3651                 -label {Copy} \
3652                 -font font_ui \
3653                 -command "
3654                 clipboard clear
3655                 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
3656         "
3657
3658         bind $w <Visibility> "grab $w; focus $w"
3659         bind $w <Key-Escape> "destroy $w"
3660         bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
3661         wm title $w "About [appname]"
3662         tkwait window $w
3663 }
3664
3665 proc do_options {} {
3666         global repo_config global_config font_descs
3667         global repo_config_new global_config_new
3668
3669         array unset repo_config_new
3670         array unset global_config_new
3671         foreach name [array names repo_config] {
3672                 set repo_config_new($name) $repo_config($name)
3673         }
3674         load_config 1
3675         foreach name [array names repo_config] {
3676                 switch -- $name {
3677                 gui.diffcontext {continue}
3678                 }
3679                 set repo_config_new($name) $repo_config($name)
3680         }
3681         foreach name [array names global_config] {
3682                 set global_config_new($name) $global_config($name)
3683         }
3684
3685         set w .options_editor
3686         toplevel $w
3687         wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3688
3689         label $w.header -text "[appname] Options" \
3690                 -font font_uibold
3691         pack $w.header -side top -fill x
3692
3693         frame $w.buttons
3694         button $w.buttons.restore -text {Restore Defaults} \
3695                 -font font_ui \
3696                 -command do_restore_defaults
3697         pack $w.buttons.restore -side left
3698         button $w.buttons.save -text Save \
3699                 -font font_ui \
3700                 -command [list do_save_config $w]
3701         pack $w.buttons.save -side right
3702         button $w.buttons.cancel -text {Cancel} \
3703                 -font font_ui \
3704                 -command [list destroy $w]
3705         pack $w.buttons.cancel -side right -padx 5
3706         pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3707
3708         labelframe $w.repo -text "[reponame] Repository" \
3709                 -font font_ui
3710         labelframe $w.global -text {Global (All Repositories)} \
3711                 -font font_ui
3712         pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
3713         pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
3714
3715         foreach option {
3716                 {b pullsummary {Show Pull Summary}}
3717                 {b trustmtime  {Trust File Modification Timestamps}}
3718                 {i diffcontext {Number of Diff Context Lines}}
3719                 {t newbranchtemplate {New Branch Name Template}}
3720                 } {
3721                 set type [lindex $option 0]
3722                 set name [lindex $option 1]
3723                 set text [lindex $option 2]
3724                 foreach f {repo global} {
3725                         switch $type {
3726                         b {
3727                                 checkbutton $w.$f.$name -text $text \
3728                                         -variable ${f}_config_new(gui.$name) \
3729                                         -onvalue true \
3730                                         -offvalue false \
3731                                         -font font_ui
3732                                 pack $w.$f.$name -side top -anchor w
3733                         }
3734                         i {
3735                                 frame $w.$f.$name
3736                                 label $w.$f.$name.l -text "$text:" -font font_ui
3737                                 pack $w.$f.$name.l -side left -anchor w -fill x
3738                                 spinbox $w.$f.$name.v \
3739                                         -textvariable ${f}_config_new(gui.$name) \
3740                                         -from 1 -to 99 -increment 1 \
3741                                         -width 3 \
3742                                         -font font_ui
3743                                 bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
3744                                 pack $w.$f.$name.v -side right -anchor e -padx 5
3745                                 pack $w.$f.$name -side top -anchor w -fill x
3746                         }
3747                         t {
3748                                 frame $w.$f.$name
3749                                 label $w.$f.$name.l -text "$text:" -font font_ui
3750                                 entry $w.$f.$name.v \
3751                                         -borderwidth 1 \
3752                                         -relief sunken \
3753                                         -width 20 \
3754                                         -textvariable ${f}_config_new(gui.$name) \
3755                                         -font font_ui
3756                                 pack $w.$f.$name.l -side left -anchor w
3757                                 pack $w.$f.$name.v -side left -anchor w \
3758                                         -fill x -expand 1 \
3759                                         -padx 5
3760                                 pack $w.$f.$name -side top -anchor w -fill x
3761                         }
3762                         }
3763                 }
3764         }
3765
3766         set all_fonts [lsort [font families]]
3767         foreach option $font_descs {
3768                 set name [lindex $option 0]
3769                 set font [lindex $option 1]
3770                 set text [lindex $option 2]
3771
3772                 set global_config_new(gui.$font^^family) \
3773                         [font configure $font -family]
3774                 set global_config_new(gui.$font^^size) \
3775                         [font configure $font -size]
3776
3777                 frame $w.global.$name
3778                 label $w.global.$name.l -text "$text:" -font font_ui
3779                 pack $w.global.$name.l -side left -anchor w -fill x
3780                 eval tk_optionMenu $w.global.$name.family \
3781                         global_config_new(gui.$font^^family) \
3782                         $all_fonts
3783                 spinbox $w.global.$name.size \
3784                         -textvariable global_config_new(gui.$font^^size) \
3785                         -from 2 -to 80 -increment 1 \
3786                         -width 3 \
3787                         -font font_ui
3788                 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
3789                 pack $w.global.$name.size -side right -anchor e
3790                 pack $w.global.$name.family -side right -anchor e
3791                 pack $w.global.$name -side top -anchor w -fill x
3792         }
3793
3794         bind $w <Visibility> "grab $w; focus $w"
3795         bind $w <Key-Escape> "destroy $w"
3796         wm title $w "[appname] ([reponame]): Options"
3797         tkwait window $w
3798 }
3799
3800 proc do_restore_defaults {} {
3801         global font_descs default_config repo_config
3802         global repo_config_new global_config_new
3803
3804         foreach name [array names default_config] {
3805                 set repo_config_new($name) $default_config($name)
3806                 set global_config_new($name) $default_config($name)
3807         }
3808
3809         foreach option $font_descs {
3810                 set name [lindex $option 0]
3811                 set repo_config(gui.$name) $default_config(gui.$name)
3812         }
3813         apply_config
3814
3815         foreach option $font_descs {
3816                 set name [lindex $option 0]
3817                 set font [lindex $option 1]
3818                 set global_config_new(gui.$font^^family) \
3819                         [font configure $font -family]
3820                 set global_config_new(gui.$font^^size) \
3821                         [font configure $font -size]
3822         }
3823 }
3824
3825 proc do_save_config {w} {
3826         if {[catch {save_config} err]} {
3827                 error_popup "Failed to completely save options:\n\n$err"
3828         }
3829         reshow_diff
3830         destroy $w
3831 }
3832
3833 proc do_windows_shortcut {} {
3834         global argv0
3835
3836         if {[catch {
3837                 set desktop [exec cygpath \
3838                         --windows \
3839                         --absolute \
3840                         --long-name \
3841                         --desktop]
3842                 }]} {
3843                         set desktop .
3844         }
3845         set fn [tk_getSaveFile \
3846                 -parent . \
3847                 -title "[appname] ([reponame]): Create Desktop Icon" \
3848                 -initialdir $desktop \
3849                 -initialfile "Git [reponame].bat"]
3850         if {$fn != {}} {
3851                 if {[catch {
3852                                 set fd [open $fn w]
3853                                 set sh [exec cygpath \
3854                                         --windows \
3855                                         --absolute \
3856                                         /bin/sh]
3857                                 set me [exec cygpath \
3858                                         --unix \
3859                                         --absolute \
3860                                         $argv0]
3861                                 set gd [exec cygpath \
3862                                         --unix \
3863                                         --absolute \
3864                                         [gitdir]]
3865                                 set gw [exec cygpath \
3866                                         --windows \
3867                                         --absolute \
3868                                         [file dirname [gitdir]]]
3869                                 regsub -all ' $me "'\\''" me
3870                                 regsub -all ' $gd "'\\''" gd
3871                                 puts $fd "@ECHO Entering $gw"
3872                                 puts $fd "@ECHO Starting git-gui... please wait..."
3873                                 puts -nonewline $fd "@\"$sh\" --login -c \""
3874                                 puts -nonewline $fd "GIT_DIR='$gd'"
3875                                 puts -nonewline $fd " '$me'"
3876                                 puts $fd "&\""
3877                                 close $fd
3878                         } err]} {
3879                         error_popup "Cannot write script:\n\n$err"
3880                 }
3881         }
3882 }
3883
3884 proc do_macosx_app {} {
3885         global argv0 env
3886
3887         set fn [tk_getSaveFile \
3888                 -parent . \
3889                 -title "[appname] ([reponame]): Create Desktop Icon" \
3890                 -initialdir [file join $env(HOME) Desktop] \
3891                 -initialfile "Git [reponame].app"]
3892         if {$fn != {}} {
3893                 if {[catch {
3894                                 set Contents [file join $fn Contents]
3895                                 set MacOS [file join $Contents MacOS]
3896                                 set exe [file join $MacOS git-gui]
3897
3898                                 file mkdir $MacOS
3899
3900                                 set fd [open [file join $Contents Info.plist] w]
3901                                 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3902 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3903 <plist version="1.0">
3904 <dict>
3905         <key>CFBundleDevelopmentRegion</key>
3906         <string>English</string>
3907         <key>CFBundleExecutable</key>
3908         <string>git-gui</string>
3909         <key>CFBundleIdentifier</key>
3910         <string>org.spearce.git-gui</string>
3911         <key>CFBundleInfoDictionaryVersion</key>
3912         <string>6.0</string>
3913         <key>CFBundlePackageType</key>
3914         <string>APPL</string>
3915         <key>CFBundleSignature</key>
3916         <string>????</string>
3917         <key>CFBundleVersion</key>
3918         <string>1.0</string>
3919         <key>NSPrincipalClass</key>
3920         <string>NSApplication</string>
3921 </dict>
3922 </plist>}
3923                                 close $fd
3924
3925                                 set fd [open $exe w]
3926                                 set gd [file normalize [gitdir]]
3927                                 set ep [file normalize [exec git --exec-path]]
3928                                 regsub -all ' $gd "'\\''" gd
3929                                 regsub -all ' $ep "'\\''" ep
3930                                 puts $fd "#!/bin/sh"
3931                                 foreach name [array names env] {
3932                                         if {[string match GIT_* $name]} {
3933                                                 regsub -all ' $env($name) "'\\''" v
3934                                                 puts $fd "export $name='$v'"
3935                                         }
3936                                 }
3937                                 puts $fd "export PATH='$ep':\$PATH"
3938                                 puts $fd "export GIT_DIR='$gd'"
3939                                 puts $fd "exec [file normalize $argv0]"
3940                                 close $fd
3941
3942                                 file attributes $exe -permissions u+x,g+x,o+x
3943                         } err]} {
3944                         error_popup "Cannot write icon:\n\n$err"
3945                 }
3946         }
3947 }
3948
3949 proc toggle_or_diff {w x y} {
3950         global file_states file_lists current_diff_path ui_index ui_workdir
3951         global last_clicked selected_paths
3952
3953         set pos [split [$w index @$x,$y] .]
3954         set lno [lindex $pos 0]
3955         set col [lindex $pos 1]
3956         set path [lindex $file_lists($w) [expr {$lno - 1}]]
3957         if {$path eq {}} {
3958                 set last_clicked {}
3959                 return
3960         }
3961
3962         set last_clicked [list $w $lno]
3963         array unset selected_paths
3964         $ui_index tag remove in_sel 0.0 end
3965         $ui_workdir tag remove in_sel 0.0 end
3966
3967         if {$col == 0} {
3968                 if {$current_diff_path eq $path} {
3969                         set after {reshow_diff;}
3970                 } else {
3971                         set after {}
3972                 }
3973                 if {$w eq $ui_index} {
3974                         update_indexinfo \
3975                                 "Unstaging [short_path $path] from commit" \
3976                                 [list $path] \
3977                                 [concat $after {set ui_status_value {Ready.}}]
3978                 } elseif {$w eq $ui_workdir} {
3979                         update_index \
3980                                 "Adding [short_path $path]" \
3981                                 [list $path] \
3982                                 [concat $after {set ui_status_value {Ready.}}]
3983                 }
3984         } else {
3985                 show_diff $path $w $lno
3986         }
3987 }
3988
3989 proc add_one_to_selection {w x y} {
3990         global file_lists last_clicked selected_paths
3991
3992         set lno [lindex [split [$w index @$x,$y] .] 0]
3993         set path [lindex $file_lists($w) [expr {$lno - 1}]]
3994         if {$path eq {}} {
3995                 set last_clicked {}
3996                 return
3997         }
3998
3999         if {$last_clicked ne {}
4000                 && [lindex $last_clicked 0] ne $w} {
4001                 array unset selected_paths
4002                 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4003         }
4004
4005         set last_clicked [list $w $lno]
4006         if {[catch {set in_sel $selected_paths($path)}]} {
4007                 set in_sel 0
4008         }
4009         if {$in_sel} {
4010                 unset selected_paths($path)
4011                 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4012         } else {
4013                 set selected_paths($path) 1
4014                 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4015         }
4016 }
4017
4018 proc add_range_to_selection {w x y} {
4019         global file_lists last_clicked selected_paths
4020
4021         if {[lindex $last_clicked 0] ne $w} {
4022                 toggle_or_diff $w $x $y
4023                 return
4024         }
4025
4026         set lno [lindex [split [$w index @$x,$y] .] 0]
4027         set lc [lindex $last_clicked 1]
4028         if {$lc < $lno} {
4029                 set begin $lc
4030                 set end $lno
4031         } else {
4032                 set begin $lno
4033                 set end $lc
4034         }
4035
4036         foreach path [lrange $file_lists($w) \
4037                 [expr {$begin - 1}] \
4038                 [expr {$end - 1}]] {
4039                 set selected_paths($path) 1
4040         }
4041         $w tag add in_sel $begin.0 [expr {$end + 1}].0
4042 }
4043
4044 ######################################################################
4045 ##
4046 ## config defaults
4047
4048 set cursor_ptr arrow
4049 font create font_diff -family Courier -size 10
4050 font create font_ui
4051 catch {
4052         label .dummy
4053         eval font configure font_ui [font actual [.dummy cget -font]]
4054         destroy .dummy
4055 }
4056
4057 font create font_uibold
4058 font create font_diffbold
4059
4060 if {[is_Windows]} {
4061         set M1B Control
4062         set M1T Ctrl
4063 } elseif {[is_MacOSX]} {
4064         set M1B M1
4065         set M1T Cmd
4066 } else {
4067         set M1B M1
4068         set M1T M1
4069 }
4070
4071 proc apply_config {} {
4072         global repo_config font_descs
4073
4074         foreach option $font_descs {
4075                 set name [lindex $option 0]
4076                 set font [lindex $option 1]
4077                 if {[catch {
4078                         foreach {cn cv} $repo_config(gui.$name) {
4079                                 font configure $font $cn $cv
4080                         }
4081                         } err]} {
4082                         error_popup "Invalid font specified in gui.$name:\n\n$err"
4083                 }
4084                 foreach {cn cv} [font configure $font] {
4085                         font configure ${font}bold $cn $cv
4086                 }
4087                 font configure ${font}bold -weight bold
4088         }
4089 }
4090
4091 set default_config(gui.trustmtime) false
4092 set default_config(gui.pullsummary) true
4093 set default_config(gui.diffcontext) 5
4094 set default_config(gui.newbranchtemplate) {}
4095 set default_config(gui.fontui) [font configure font_ui]
4096 set default_config(gui.fontdiff) [font configure font_diff]
4097 set font_descs {
4098         {fontui   font_ui   {Main Font}}
4099         {fontdiff font_diff {Diff/Console Font}}
4100 }
4101 load_config 0
4102 apply_config
4103
4104 ######################################################################
4105 ##
4106 ## ui construction
4107
4108 # -- Menu Bar
4109 #
4110 menu .mbar -tearoff 0
4111 .mbar add cascade -label Repository -menu .mbar.repository
4112 .mbar add cascade -label Edit -menu .mbar.edit
4113 if {!$single_commit} {
4114         .mbar add cascade -label Branch -menu .mbar.branch
4115 }
4116 .mbar add cascade -label Commit -menu .mbar.commit
4117 if {!$single_commit} {
4118         .mbar add cascade -label Merge -menu .mbar.merge
4119         .mbar add cascade -label Fetch -menu .mbar.fetch
4120         .mbar add cascade -label Push -menu .mbar.push
4121 }
4122 . configure -menu .mbar
4123
4124 # -- Repository Menu
4125 #
4126 menu .mbar.repository
4127 .mbar.repository add command \
4128         -label {Visualize Current Branch} \
4129         -command {do_gitk {}} \
4130         -font font_ui
4131 .mbar.repository add command \
4132         -label {Visualize All Branches} \
4133         -command {do_gitk {--all}} \
4134         -font font_ui
4135 .mbar.repository add separator
4136
4137 if {!$single_commit} {
4138         .mbar.repository add command -label {Database Statistics} \
4139                 -command do_stats \
4140                 -font font_ui
4141
4142         .mbar.repository add command -label {Compress Database} \
4143                 -command do_gc \
4144                 -font font_ui
4145
4146         .mbar.repository add command -label {Verify Database} \
4147                 -command do_fsck_objects \
4148                 -font font_ui
4149
4150         .mbar.repository add separator
4151
4152         if {[is_Windows]} {
4153                 .mbar.repository add command \
4154                         -label {Create Desktop Icon} \
4155                         -command do_windows_shortcut \
4156                         -font font_ui
4157         } elseif {[is_MacOSX]} {
4158                 .mbar.repository add command \
4159                         -label {Create Desktop Icon} \
4160                         -command do_macosx_app \
4161                         -font font_ui
4162         }
4163 }
4164
4165 .mbar.repository add command -label Quit \
4166         -command do_quit \
4167         -accelerator $M1T-Q \
4168         -font font_ui
4169
4170 # -- Edit Menu
4171 #
4172 menu .mbar.edit
4173 .mbar.edit add command -label Undo \
4174         -command {catch {[focus] edit undo}} \
4175         -accelerator $M1T-Z \
4176         -font font_ui
4177 .mbar.edit add command -label Redo \
4178         -command {catch {[focus] edit redo}} \
4179         -accelerator $M1T-Y \
4180         -font font_ui
4181 .mbar.edit add separator
4182 .mbar.edit add command -label Cut \
4183         -command {catch {tk_textCut [focus]}} \
4184         -accelerator $M1T-X \
4185         -font font_ui
4186 .mbar.edit add command -label Copy \
4187         -command {catch {tk_textCopy [focus]}} \
4188         -accelerator $M1T-C \
4189         -font font_ui
4190 .mbar.edit add command -label Paste \
4191         -command {catch {tk_textPaste [focus]; [focus] see insert}} \
4192         -accelerator $M1T-V \
4193         -font font_ui
4194 .mbar.edit add command -label Delete \
4195         -command {catch {[focus] delete sel.first sel.last}} \
4196         -accelerator Del \
4197         -font font_ui
4198 .mbar.edit add separator
4199 .mbar.edit add command -label {Select All} \
4200         -command {catch {[focus] tag add sel 0.0 end}} \
4201         -accelerator $M1T-A \
4202         -font font_ui
4203
4204 # -- Branch Menu
4205 #
4206 if {!$single_commit} {
4207         menu .mbar.branch
4208
4209         .mbar.branch add command -label {Create...} \
4210                 -command do_create_branch \
4211                 -accelerator $M1T-N \
4212                 -font font_ui
4213         lappend disable_on_lock [list .mbar.branch entryconf \
4214                 [.mbar.branch index last] -state]
4215
4216         .mbar.branch add command -label {Delete...} \
4217                 -command do_delete_branch \
4218                 -font font_ui
4219         lappend disable_on_lock [list .mbar.branch entryconf \
4220                 [.mbar.branch index last] -state]
4221 }
4222
4223 # -- Commit Menu
4224 #
4225 menu .mbar.commit
4226
4227 .mbar.commit add radiobutton \
4228         -label {New Commit} \
4229         -command do_select_commit_type \
4230         -variable selected_commit_type \
4231         -value new \
4232         -font font_ui
4233 lappend disable_on_lock \
4234         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4235
4236 .mbar.commit add radiobutton \
4237         -label {Amend Last Commit} \
4238         -command do_select_commit_type \
4239         -variable selected_commit_type \
4240         -value amend \
4241         -font font_ui
4242 lappend disable_on_lock \
4243         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4244
4245 .mbar.commit add separator
4246
4247 .mbar.commit add command -label Rescan \
4248         -command do_rescan \
4249         -accelerator F5 \
4250         -font font_ui
4251 lappend disable_on_lock \
4252         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4253
4254 .mbar.commit add command -label {Add To Commit} \
4255         -command do_add_selection \
4256         -font font_ui
4257 lappend disable_on_lock \
4258         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4259
4260 .mbar.commit add command -label {Add All To Commit} \
4261         -command do_add_all \
4262         -accelerator $M1T-I \
4263         -font font_ui
4264 lappend disable_on_lock \
4265         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4266
4267 .mbar.commit add command -label {Unstage From Commit} \
4268         -command do_unstage_selection \
4269         -font font_ui
4270 lappend disable_on_lock \
4271         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4272
4273 .mbar.commit add command -label {Revert Changes} \
4274         -command do_revert_selection \
4275         -font font_ui
4276 lappend disable_on_lock \
4277         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4278
4279 .mbar.commit add separator
4280
4281 .mbar.commit add command -label {Sign Off} \
4282         -command do_signoff \
4283         -accelerator $M1T-S \
4284         -font font_ui
4285
4286 .mbar.commit add command -label Commit \
4287         -command do_commit \
4288         -accelerator $M1T-Return \
4289         -font font_ui
4290 lappend disable_on_lock \
4291         [list .mbar.commit entryconf [.mbar.commit index last] -state]
4292
4293 if {[is_MacOSX]} {
4294         # -- Apple Menu (Mac OS X only)
4295         #
4296         .mbar add cascade -label Apple -menu .mbar.apple
4297         menu .mbar.apple
4298
4299         .mbar.apple add command -label "About [appname]" \
4300                 -command do_about \
4301                 -font font_ui
4302         .mbar.apple add command -label "[appname] Options..." \
4303                 -command do_options \
4304                 -font font_ui
4305 } else {
4306         # -- Edit Menu
4307         #
4308         .mbar.edit add separator
4309         .mbar.edit add command -label {Options...} \
4310                 -command do_options \
4311                 -font font_ui
4312
4313         # -- Tools Menu
4314         #
4315         if {[file exists /usr/local/miga/lib/gui-miga]
4316                 && [file exists .pvcsrc]} {
4317         proc do_miga {} {
4318                 global ui_status_value
4319                 if {![lock_index update]} return
4320                 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
4321                 set miga_fd [open "|$cmd" r]
4322                 fconfigure $miga_fd -blocking 0
4323                 fileevent $miga_fd readable [list miga_done $miga_fd]
4324                 set ui_status_value {Running miga...}
4325         }
4326         proc miga_done {fd} {
4327                 read $fd 512
4328                 if {[eof $fd]} {
4329                         close $fd
4330                         unlock_index
4331                         rescan [list set ui_status_value {Ready.}]
4332                 }
4333         }
4334         .mbar add cascade -label Tools -menu .mbar.tools
4335         menu .mbar.tools
4336         .mbar.tools add command -label "Migrate" \
4337                 -command do_miga \
4338                 -font font_ui
4339         lappend disable_on_lock \
4340                 [list .mbar.tools entryconf [.mbar.tools index last] -state]
4341         }
4342
4343         # -- Help Menu
4344         #
4345         .mbar add cascade -label Help -menu .mbar.help
4346         menu .mbar.help
4347
4348         .mbar.help add command -label "About [appname]" \
4349                 -command do_about \
4350                 -font font_ui
4351 }
4352
4353
4354 # -- Branch Control
4355 #
4356 frame .branch \
4357         -borderwidth 1 \
4358         -relief sunken
4359 label .branch.l1 \
4360         -text {Current Branch:} \
4361         -anchor w \
4362         -justify left \
4363         -font font_ui
4364 label .branch.cb \
4365         -textvariable current_branch \
4366         -anchor w \
4367         -justify left \
4368         -font font_ui
4369 pack .branch.l1 -side left
4370 pack .branch.cb -side left -fill x
4371 pack .branch -side top -fill x
4372
4373 if {!$single_commit} {
4374         menu .mbar.merge
4375         .mbar.merge add command -label {Local Merge...} \
4376                 -command do_local_merge \
4377                 -font font_ui
4378         lappend disable_on_lock \
4379                 [list .mbar.merge entryconf [.mbar.merge index last] -state]
4380         .mbar.merge add command -label {Abort Merge...} \
4381                 -command do_reset_hard \
4382                 -font font_ui
4383         lappend disable_on_lock \
4384                 [list .mbar.merge entryconf [.mbar.merge index last] -state]
4385
4386
4387         menu .mbar.fetch
4388
4389         menu .mbar.push
4390         .mbar.push add command -label {Push...} \
4391                 -command do_push_anywhere \
4392                 -font font_ui
4393 }
4394
4395 # -- Main Window Layout
4396 #
4397 panedwindow .vpane -orient vertical
4398 panedwindow .vpane.files -orient horizontal
4399 .vpane add .vpane.files -sticky nsew -height 100 -width 200
4400 pack .vpane -anchor n -side top -fill both -expand 1
4401
4402 # -- Index File List
4403 #
4404 frame .vpane.files.index -height 100 -width 200
4405 label .vpane.files.index.title -text {Changes To Be Committed} \
4406         -background green \
4407         -font font_ui
4408 text $ui_index -background white -borderwidth 0 \
4409         -width 20 -height 10 \
4410         -wrap none \
4411         -font font_ui \
4412         -cursor $cursor_ptr \
4413         -xscrollcommand {.vpane.files.index.sx set} \
4414         -yscrollcommand {.vpane.files.index.sy set} \
4415         -state disabled
4416 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
4417 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
4418 pack .vpane.files.index.title -side top -fill x
4419 pack .vpane.files.index.sx -side bottom -fill x
4420 pack .vpane.files.index.sy -side right -fill y
4421 pack $ui_index -side left -fill both -expand 1
4422 .vpane.files add .vpane.files.index -sticky nsew
4423
4424 # -- Working Directory File List
4425 #
4426 frame .vpane.files.workdir -height 100 -width 200
4427 label .vpane.files.workdir.title -text {Changed But Not Updated} \
4428         -background red \
4429         -font font_ui
4430 text $ui_workdir -background white -borderwidth 0 \
4431         -width 20 -height 10 \
4432         -wrap none \
4433         -font font_ui \
4434         -cursor $cursor_ptr \
4435         -xscrollcommand {.vpane.files.workdir.sx set} \
4436         -yscrollcommand {.vpane.files.workdir.sy set} \
4437         -state disabled
4438 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
4439 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
4440 pack .vpane.files.workdir.title -side top -fill x
4441 pack .vpane.files.workdir.sx -side bottom -fill x
4442 pack .vpane.files.workdir.sy -side right -fill y
4443 pack $ui_workdir -side left -fill both -expand 1
4444 .vpane.files add .vpane.files.workdir -sticky nsew
4445
4446 foreach i [list $ui_index $ui_workdir] {
4447         $i tag conf in_diff -font font_uibold
4448         $i tag conf in_sel \
4449                 -background [$i cget -foreground] \
4450                 -foreground [$i cget -background]
4451 }
4452 unset i
4453
4454 # -- Diff and Commit Area
4455 #
4456 frame .vpane.lower -height 300 -width 400
4457 frame .vpane.lower.commarea
4458 frame .vpane.lower.diff -relief sunken -borderwidth 1
4459 pack .vpane.lower.commarea -side top -fill x
4460 pack .vpane.lower.diff -side bottom -fill both -expand 1
4461 .vpane add .vpane.lower -sticky nsew
4462
4463 # -- Commit Area Buttons
4464 #
4465 frame .vpane.lower.commarea.buttons
4466 label .vpane.lower.commarea.buttons.l -text {} \
4467         -anchor w \
4468         -justify left \
4469         -font font_ui
4470 pack .vpane.lower.commarea.buttons.l -side top -fill x
4471 pack .vpane.lower.commarea.buttons -side left -fill y
4472
4473 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
4474         -command do_rescan \
4475         -font font_ui
4476 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
4477 lappend disable_on_lock \
4478         {.vpane.lower.commarea.buttons.rescan conf -state}
4479
4480 button .vpane.lower.commarea.buttons.incall -text {Add All} \
4481         -command do_add_all \
4482         -font font_ui
4483 pack .vpane.lower.commarea.buttons.incall -side top -fill x
4484 lappend disable_on_lock \
4485         {.vpane.lower.commarea.buttons.incall conf -state}
4486
4487 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
4488         -command do_signoff \
4489         -font font_ui
4490 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
4491
4492 button .vpane.lower.commarea.buttons.commit -text {Commit} \
4493         -command do_commit \
4494         -font font_ui
4495 pack .vpane.lower.commarea.buttons.commit -side top -fill x
4496 lappend disable_on_lock \
4497         {.vpane.lower.commarea.buttons.commit conf -state}
4498
4499 # -- Commit Message Buffer
4500 #
4501 frame .vpane.lower.commarea.buffer
4502 frame .vpane.lower.commarea.buffer.header
4503 set ui_comm .vpane.lower.commarea.buffer.t
4504 set ui_coml .vpane.lower.commarea.buffer.header.l
4505 radiobutton .vpane.lower.commarea.buffer.header.new \
4506         -text {New Commit} \
4507         -command do_select_commit_type \
4508         -variable selected_commit_type \
4509         -value new \
4510         -font font_ui
4511 lappend disable_on_lock \
4512         [list .vpane.lower.commarea.buffer.header.new conf -state]
4513 radiobutton .vpane.lower.commarea.buffer.header.amend \
4514         -text {Amend Last Commit} \
4515         -command do_select_commit_type \
4516         -variable selected_commit_type \
4517         -value amend \
4518         -font font_ui
4519 lappend disable_on_lock \
4520         [list .vpane.lower.commarea.buffer.header.amend conf -state]
4521 label $ui_coml \
4522         -anchor w \
4523         -justify left \
4524         -font font_ui
4525 proc trace_commit_type {varname args} {
4526         global ui_coml commit_type
4527         switch -glob -- $commit_type {
4528         initial       {set txt {Initial Commit Message:}}
4529         amend         {set txt {Amended Commit Message:}}
4530         amend-initial {set txt {Amended Initial Commit Message:}}
4531         amend-merge   {set txt {Amended Merge Commit Message:}}
4532         merge         {set txt {Merge Commit Message:}}
4533         *             {set txt {Commit Message:}}
4534         }
4535         $ui_coml conf -text $txt
4536 }
4537 trace add variable commit_type write trace_commit_type
4538 pack $ui_coml -side left -fill x
4539 pack .vpane.lower.commarea.buffer.header.amend -side right
4540 pack .vpane.lower.commarea.buffer.header.new -side right
4541
4542 text $ui_comm -background white -borderwidth 1 \
4543         -undo true \
4544         -maxundo 20 \
4545         -autoseparators true \
4546         -relief sunken \
4547         -width 75 -height 9 -wrap none \
4548         -font font_diff \
4549         -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
4550 scrollbar .vpane.lower.commarea.buffer.sby \
4551         -command [list $ui_comm yview]
4552 pack .vpane.lower.commarea.buffer.header -side top -fill x
4553 pack .vpane.lower.commarea.buffer.sby -side right -fill y
4554 pack $ui_comm -side left -fill y
4555 pack .vpane.lower.commarea.buffer -side left -fill y
4556
4557 # -- Commit Message Buffer Context Menu
4558 #
4559 set ctxm .vpane.lower.commarea.buffer.ctxm
4560 menu $ctxm -tearoff 0
4561 $ctxm add command \
4562         -label {Cut} \
4563         -font font_ui \
4564         -command {tk_textCut $ui_comm}
4565 $ctxm add command \
4566         -label {Copy} \
4567         -font font_ui \
4568         -command {tk_textCopy $ui_comm}
4569 $ctxm add command \
4570         -label {Paste} \
4571         -font font_ui \
4572         -command {tk_textPaste $ui_comm}
4573 $ctxm add command \
4574         -label {Delete} \
4575         -font font_ui \
4576         -command {$ui_comm delete sel.first sel.last}
4577 $ctxm add separator
4578 $ctxm add command \
4579         -label {Select All} \
4580         -font font_ui \
4581         -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
4582 $ctxm add command \
4583         -label {Copy All} \
4584         -font font_ui \
4585         -command {
4586                 $ui_comm tag add sel 0.0 end
4587                 tk_textCopy $ui_comm
4588                 $ui_comm tag remove sel 0.0 end
4589         }
4590 $ctxm add separator
4591 $ctxm add command \
4592         -label {Sign Off} \
4593         -font font_ui \
4594         -command do_signoff
4595 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
4596
4597 # -- Diff Header
4598 #
4599 set current_diff_path {}
4600 set current_diff_side {}
4601 set diff_actions [list]
4602 proc trace_current_diff_path {varname args} {
4603         global current_diff_path diff_actions file_states
4604         if {$current_diff_path eq {}} {
4605                 set s {}
4606                 set f {}
4607                 set p {}
4608                 set o disabled
4609         } else {
4610                 set p $current_diff_path
4611                 set s [mapdesc [lindex $file_states($p) 0] $p]
4612                 set f {File:}
4613                 set p [escape_path $p]
4614                 set o normal
4615         }
4616
4617         .vpane.lower.diff.header.status configure -text $s
4618         .vpane.lower.diff.header.file configure -text $f
4619         .vpane.lower.diff.header.path configure -text $p
4620         foreach w $diff_actions {
4621                 uplevel #0 $w $o
4622         }
4623 }
4624 trace add variable current_diff_path write trace_current_diff_path
4625
4626 frame .vpane.lower.diff.header -background orange
4627 label .vpane.lower.diff.header.status \
4628         -background orange \
4629         -width $max_status_desc \
4630         -anchor w \
4631         -justify left \
4632         -font font_ui
4633 label .vpane.lower.diff.header.file \
4634         -background orange \
4635         -anchor w \
4636         -justify left \
4637         -font font_ui
4638 label .vpane.lower.diff.header.path \
4639         -background orange \
4640         -anchor w \
4641         -justify left \
4642         -font font_ui
4643 pack .vpane.lower.diff.header.status -side left
4644 pack .vpane.lower.diff.header.file -side left
4645 pack .vpane.lower.diff.header.path -fill x
4646 set ctxm .vpane.lower.diff.header.ctxm
4647 menu $ctxm -tearoff 0
4648 $ctxm add command \
4649         -label {Copy} \
4650         -font font_ui \
4651         -command {
4652                 clipboard clear
4653                 clipboard append \
4654                         -format STRING \
4655                         -type STRING \
4656                         -- $current_diff_path
4657         }
4658 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4659 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
4660
4661 # -- Diff Body
4662 #
4663 frame .vpane.lower.diff.body
4664 set ui_diff .vpane.lower.diff.body.t
4665 text $ui_diff -background white -borderwidth 0 \
4666         -width 80 -height 15 -wrap none \
4667         -font font_diff \
4668         -xscrollcommand {.vpane.lower.diff.body.sbx set} \
4669         -yscrollcommand {.vpane.lower.diff.body.sby set} \
4670         -state disabled
4671 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
4672         -command [list $ui_diff xview]
4673 scrollbar .vpane.lower.diff.body.sby -orient vertical \
4674         -command [list $ui_diff yview]
4675 pack .vpane.lower.diff.body.sbx -side bottom -fill x
4676 pack .vpane.lower.diff.body.sby -side right -fill y
4677 pack $ui_diff -side left -fill both -expand 1
4678 pack .vpane.lower.diff.header -side top -fill x
4679 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4680
4681 $ui_diff tag conf d_cr -elide true
4682 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
4683 $ui_diff tag conf d_+ -foreground {#00a000}
4684 $ui_diff tag conf d_- -foreground red
4685
4686 $ui_diff tag conf d_++ -foreground {#00a000}
4687 $ui_diff tag conf d_-- -foreground red
4688 $ui_diff tag conf d_+s \
4689         -foreground {#00a000} \
4690         -background {#e2effa}
4691 $ui_diff tag conf d_-s \
4692         -foreground red \
4693         -background {#e2effa}
4694 $ui_diff tag conf d_s+ \
4695         -foreground {#00a000} \
4696         -background ivory1
4697 $ui_diff tag conf d_s- \
4698         -foreground red \
4699         -background ivory1
4700
4701 $ui_diff tag conf d<<<<<<< \
4702         -foreground orange \
4703         -font font_diffbold
4704 $ui_diff tag conf d======= \
4705         -foreground orange \
4706         -font font_diffbold
4707 $ui_diff tag conf d>>>>>>> \
4708         -foreground orange \
4709         -font font_diffbold
4710
4711 $ui_diff tag raise sel
4712
4713 # -- Diff Body Context Menu
4714 #
4715 set ctxm .vpane.lower.diff.body.ctxm
4716 menu $ctxm -tearoff 0
4717 $ctxm add command \
4718         -label {Refresh} \
4719         -font font_ui \
4720         -command reshow_diff
4721 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4722 $ctxm add command \
4723         -label {Copy} \
4724         -font font_ui \
4725         -command {tk_textCopy $ui_diff}
4726 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4727 $ctxm add command \
4728         -label {Select All} \
4729         -font font_ui \
4730         -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
4731 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4732 $ctxm add command \
4733         -label {Copy All} \
4734         -font font_ui \
4735         -command {
4736                 $ui_diff tag add sel 0.0 end
4737                 tk_textCopy $ui_diff
4738                 $ui_diff tag remove sel 0.0 end
4739         }
4740 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4741 $ctxm add separator
4742 $ctxm add command \
4743         -label {Apply/Reverse Hunk} \
4744         -font font_ui \
4745         -command {apply_hunk $cursorX $cursorY}
4746 set ui_diff_applyhunk [$ctxm index last]
4747 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
4748 $ctxm add separator
4749 $ctxm add command \
4750         -label {Decrease Font Size} \
4751         -font font_ui \
4752         -command {incr_font_size font_diff -1}
4753 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4754 $ctxm add command \
4755         -label {Increase Font Size} \
4756         -font font_ui \
4757         -command {incr_font_size font_diff 1}
4758 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4759 $ctxm add separator
4760 $ctxm add command \
4761         -label {Show Less Context} \
4762         -font font_ui \
4763         -command {if {$repo_config(gui.diffcontext) >= 2} {
4764                 incr repo_config(gui.diffcontext) -1
4765                 reshow_diff
4766         }}
4767 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4768 $ctxm add command \
4769         -label {Show More Context} \
4770         -font font_ui \
4771         -command {
4772                 incr repo_config(gui.diffcontext)
4773                 reshow_diff
4774         }
4775 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4776 $ctxm add separator
4777 $ctxm add command -label {Options...} \
4778         -font font_ui \
4779         -command do_options
4780 bind_button3 $ui_diff "
4781         set cursorX %x
4782         set cursorY %y
4783         if {\$ui_index eq \$current_diff_side} {
4784                 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
4785         } else {
4786                 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
4787         }
4788         tk_popup $ctxm %X %Y
4789 "
4790 unset ui_diff_applyhunk
4791
4792 # -- Status Bar
4793 #
4794 set ui_status_value {Initializing...}
4795 label .status -textvariable ui_status_value \
4796         -anchor w \
4797         -justify left \
4798         -borderwidth 1 \
4799         -relief sunken \
4800         -font font_ui
4801 pack .status -anchor w -side bottom -fill x
4802
4803 # -- Load geometry
4804 #
4805 catch {
4806 set gm $repo_config(gui.geometry)
4807 wm geometry . [lindex $gm 0]
4808 .vpane sash place 0 \
4809         [lindex [.vpane sash coord 0] 0] \
4810         [lindex $gm 1]
4811 .vpane.files sash place 0 \
4812         [lindex $gm 2] \
4813         [lindex [.vpane.files sash coord 0] 1]
4814 unset gm
4815 }
4816
4817 # -- Key Bindings
4818 #
4819 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4820 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4821 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4822 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4823 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4824 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4825 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4826 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4827 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4828 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4829 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4830
4831 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4832 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4833 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4834 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4835 bind $ui_diff <$M1B-Key-v> {break}
4836 bind $ui_diff <$M1B-Key-V> {break}
4837 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4838 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4839 bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
4840 bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
4841 bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
4842 bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
4843 bind $ui_diff <Button-1>   {focus %W}
4844
4845 if {!$single_commit} {
4846         bind . <$M1B-Key-n> do_create_branch
4847         bind . <$M1B-Key-N> do_create_branch
4848 }
4849
4850 bind .   <Destroy> do_quit
4851 bind all <Key-F5> do_rescan
4852 bind all <$M1B-Key-r> do_rescan
4853 bind all <$M1B-Key-R> do_rescan
4854 bind .   <$M1B-Key-s> do_signoff
4855 bind .   <$M1B-Key-S> do_signoff
4856 bind .   <$M1B-Key-i> do_add_all
4857 bind .   <$M1B-Key-I> do_add_all
4858 bind .   <$M1B-Key-Return> do_commit
4859 bind all <$M1B-Key-q> do_quit
4860 bind all <$M1B-Key-Q> do_quit
4861 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4862 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4863 foreach i [list $ui_index $ui_workdir] {
4864         bind $i <Button-1>       "toggle_or_diff         $i %x %y; break"
4865         bind $i <$M1B-Button-1>  "add_one_to_selection   $i %x %y; break"
4866         bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
4867 }
4868 unset i
4869
4870 set file_lists($ui_index) [list]
4871 set file_lists($ui_workdir) [list]
4872
4873 set HEAD {}
4874 set PARENT {}
4875 set MERGE_HEAD [list]
4876 set commit_type {}
4877 set empty_tree {}
4878 set current_branch {}
4879 set current_diff_path {}
4880 set selected_commit_type new
4881
4882 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
4883 focus -force $ui_comm
4884
4885 # -- Warn the user about environmental problems.  Cygwin's Tcl
4886 #    does *not* pass its env array onto any processes it spawns.
4887 #    This means that git processes get none of our environment.
4888 #
4889 if {[is_Windows]} {
4890         set ignored_env 0
4891         set suggest_user {}
4892         set msg "Possible environment issues exist.
4893
4894 The following environment variables are probably
4895 going to be ignored by any Git subprocess run
4896 by [appname]:
4897
4898 "
4899         foreach name [array names env] {
4900                 switch -regexp -- $name {
4901                 {^GIT_INDEX_FILE$} -
4902                 {^GIT_OBJECT_DIRECTORY$} -
4903                 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4904                 {^GIT_DIFF_OPTS$} -
4905                 {^GIT_EXTERNAL_DIFF$} -
4906                 {^GIT_PAGER$} -
4907                 {^GIT_TRACE$} -
4908                 {^GIT_CONFIG$} -
4909                 {^GIT_CONFIG_LOCAL$} -
4910                 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4911                         append msg " - $name\n"
4912                         incr ignored_env
4913                 }
4914                 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4915                         append msg " - $name\n"
4916                         incr ignored_env
4917                         set suggest_user $name
4918                 }
4919                 }
4920         }
4921         if {$ignored_env > 0} {
4922                 append msg "
4923 This is due to a known issue with the
4924 Tcl binary distributed by Cygwin."
4925
4926                 if {$suggest_user ne {}} {
4927                         append msg "
4928
4929 A good replacement for $suggest_user
4930 is placing values for the user.name and
4931 user.email settings into your personal
4932 ~/.gitconfig file.
4933 "
4934                 }
4935                 warn_popup $msg
4936         }
4937         unset ignored_env msg suggest_user name
4938 }
4939
4940 # -- Only initialize complex UI if we are going to stay running.
4941 #
4942 if {!$single_commit} {
4943         load_all_remotes
4944         load_all_heads
4945
4946         populate_branch_menu
4947         populate_fetch_menu
4948         populate_push_menu
4949 }
4950
4951 # -- Only suggest a gc run if we are going to stay running.
4952 #
4953 if {!$single_commit} {
4954         set object_limit 2000
4955         if {[is_Windows]} {set object_limit 200}
4956         regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4957         if {$objects_current >= $object_limit} {
4958                 if {[ask_popup \
4959                         "This repository currently has $objects_current loose objects.
4960
4961 To maintain optimal performance it is strongly
4962 recommended that you compress the database
4963 when more than $object_limit loose objects exist.
4964
4965 Compress the database now?"] eq yes} {
4966                         do_gc
4967                 }
4968         }
4969         unset object_limit _junk objects_current
4970 }
4971
4972 lock_index begin-read
4973 after 1 do_rescan