1 # git-gui commit checkout support
2 # Copyright (C) 2007 Shawn Pearce
6 field w
{}; # our window (if we have one)
7 field w_cons
{}; # embedded console window object
9 field new_expr
; # expression the user saw/thinks this is
10 field new_hash
; # commit SHA-1 we are switching to
11 field new_ref
; # ref we are updating/creating
13 field parent_w .
; # window that started us
14 field merge_type none
; # type of merge to apply to existing branch
15 field merge_base
{}; # merge base if we have another ref involved
16 field fetch_spec
{}; # refetch tracking branch if used?
17 field checkout
1; # actually checkout the branch?
18 field create
0; # create the branch if it doesn't exist?
20 field reset_ok
0; # did the user agree to reset?
21 field fetch_ok
0; # did the fetch succeed?
23 field readtree_d
{}; # buffered output from read-tree
24 field update_old
{}; # was the update-ref call deferred?
25 field reflog_msg
{}; # log message for the update-ref call
27 constructor new
{expr hash
{ref
{}}} {
35 method parent
{path
} {
36 set parent_w
[winfo toplevel $path]
39 method enable_merge
{type
} {
43 method enable_fetch
{spec
} {
47 method enable_checkout
{co
} {
51 method enable_create
{co
} {
56 if {$fetch_spec ne
{}} {
59 # We were asked to refresh a single tracking branch
60 # before we get to work. We should do that before we
61 # consider any ref updating.
64 set l_trck
[lindex $fetch_spec 0]
65 set remote
[lindex $fetch_spec 1]
66 set r_head
[lindex $fetch_spec 2]
67 regsub ^refs
/heads
/ $r_head {} r_name
69 set cmd
[list git fetch
$remote]
71 lappend cmd
+$r_head:$l_trck
76 _toplevel
$this {Refreshing Tracking Branch
}
77 set w_cons
[::console::embed \
79 "Fetching $r_name from $remote"]
80 pack $w.
console -fill both
-expand 1
81 $w_cons exec $cmd [cb _finish_fetch
]
83 bind $w <$M1B-Key
-w
> break
84 bind $w <$M1B-Key
-W
> break
85 bind $w <Visibility
> "
89 wm protocol
$w WM_DELETE_WINDOW
[cb _noop
]
99 # If we have a ref we need to update it before we can
100 # proceed with a checkout (if one was enabled).
102 if {![_update_ref
$this]} {
119 method _finish_fetch
{ok
} {
121 set l_trck
[lindex $fetch_spec 0]
123 set l_trck FETCH_HEAD
125 if {[catch {set new_hash
[git rev-parse
--verify "$l_trck^0"]} err
]} {
127 $w_cons insert
"fatal: Cannot resolve $l_trck"
134 wm protocol
$w WM_DELETE_WINDOW
{}
140 button $w.
close -text Close
-command [list destroy $w]
141 pack $w.
close -side bottom
-anchor e
-padx 10 -pady 10
147 method _update_ref
{} {
148 global null_sha1 current_branch
155 set rn
[string length
$rh]
156 if {[string equal
-length $rn $rh $ref]} {
157 set newbranch
[string range
$ref $rn end
]
158 if {$current_branch eq
$newbranch} {
165 if {[catch {set cur
[git rev-parse
--verify "$ref^0"]}]} {
166 # Assume it does not exist, and that is what the error was.
169 _error
$this "Branch '$newbranch' does not exist."
173 set reflog_msg
"branch: Created from $new_expr"
175 } elseif
{$create && $merge_type eq
{none
}} {
176 # We were told to create it, but not do a merge.
177 # Bad. Name shouldn't have existed.
179 _error
$this "Branch '$newbranch' already exists."
181 } elseif
{!$create && $merge_type eq
{none
}} {
182 # We aren't creating, it exists and we don't merge.
183 # We are probably just a simple branch switch.
184 # Use whatever value we just read.
188 } elseif
{$new eq
$cur} {
189 # No merge would be required, don't compute anything.
192 catch {set merge_base
[git merge-base
$new $cur]}
193 if {$merge_base eq
$cur} {
194 # The current branch is older.
196 set reflog_msg
"merge $new_expr: Fast-forward"
198 switch -- $merge_type {
200 if {$merge_base eq
$new} {
201 # The current branch is actually newer.
206 _error
$this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required."
211 # The current branch will lose things.
213 if {[_confirm_reset
$this $cur]} {
214 set reflog_msg
"reset $new_expr"
220 _error
$this "Merge strategy '$merge_type' not supported."
229 # No so fast. We should defer this in case
230 # we cannot update the working directory.
237 git update-ref
-m $reflog_msg $ref $new $cur
239 _error
$this "Failed to update '$newbranch'.\n\n$err"
247 method _checkout
{} {
248 if {[lock_index checkout_op
]} {
249 after idle
[cb _start_checkout
]
251 _error
$this "Index is already locked."
256 method _start_checkout
{} {
257 global HEAD commit_type
259 # -- Our in memory state should match the repository.
261 repository_state curType curHEAD curMERGE_HEAD
262 if {[string match amend
* $commit_type]
263 && $curType eq
{normal
}
264 && $curHEAD eq
$HEAD} {
265 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
266 info_popup
{Last scanned state does not match repository state.
268 Another Git program has modified this repository since the last
scan. A rescan must be performed before the current branch can be changed.
270 The rescan will be automatically started now.
278 if {$curHEAD eq
$new_hash} {
279 _after_readtree
$this
280 } elseif
{[is_config_true gui.trustmtime
]} {
283 ui_status
{Refreshing
file status...
}
284 set fd
[git_read update-index
\
290 fconfigure $fd -blocking 0 -translation binary
291 fileevent $fd readable
[cb _refresh_wait
$fd]
295 method _refresh_wait
{fd
} {
304 if {$new_ref eq
{}} {
305 return [string range
$new_hash 0 7]
309 set rn
[string length
$rh]
310 if {[string equal
-length $rn $rh $new_ref]} {
311 return [string range
$new_ref $rn end
]
317 method _readtree
{} {
321 $::main_status start
\
322 "Updating working directory to '[_name $this]'..." \
325 set fd
[git_read
--stderr read-tree
\
329 --exclude-per
-directory
=.gitignore
\
333 fconfigure $fd -blocking 0 -translation binary
334 fileevent $fd readable
[cb _readtree_wait
$fd]
337 method _readtree_wait
{fd
} {
338 global current_branch
341 $::main_status update_meter
$buf
342 append readtree_d
$buf
344 fconfigure $fd -blocking 1
346 fconfigure $fd -blocking 0
350 if {[catch {close $fd}]} {
352 regsub {^fatal
: } $err {} err
353 $::main_status stop
"Aborted checkout of '[_name $this]' (file level merging is required)."
354 warn_popup
"File level merge required.
358 Staying on branch '$current_branch'."
365 _after_readtree
$this
368 method _after_readtree
{} {
369 global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
370 global current_branch is_detached
373 set name
[_name
$this]
374 set log
"checkout: moving"
376 append log
" from $current_branch"
379 # -- Move/create HEAD as a symbolic ref. Core git does not
380 # even check for failure here, it Just Works(tm). If it
381 # doesn't we are in some really ugly state that is difficult
382 # to recover from within git-gui.
385 set rn
[string length
$rh]
386 if {[string equal
-length $rn $rh $new_ref]} {
387 set new_branch
[string range
$new_ref $rn end
]
388 append log
" to $new_branch"
391 git symbolic-ref
-m $log HEAD
$new_ref
395 set current_branch
$new_branch
398 append log
" to $new_expr"
401 _detach_HEAD
$log $new_hash
405 set current_branch HEAD
409 # -- We had to defer updating the branch itself until we
410 # knew the working directory would update. So now we
411 # need to finish that work. If it fails we're in big
414 if {$update_old ne
{}} {
427 info_popup
"You are no longer on a local branch.
429 If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."
432 # -- Update our repository state. If we were previously in
433 # amend mode we need to toss the current buffer and do a
434 # full rescan to update our file lists. If we weren't in
435 # amend mode our file lists are accurate and we can avoid
439 set selected_commit_type new
440 if {[string match amend
* $commit_type]} {
441 $ui_comm delete
0.0 end
443 $ui_comm edit modified false
444 rescan
[list ui_status
"Checked out '$name'."]
446 repository_state commit_type HEAD MERGE_HEAD
448 ui_status
"Checked out '$name'."
453 git-version
proc _detach_HEAD
{log new
} {
455 git update-ref
--no-deref
-m $log HEAD
$new
461 fconfigure $fd -translation lf
-encoding utf-8
467 method _confirm_reset
{cur
} {
469 set name
[_name
$this]
470 set gitk
[list do_gitk
[list $cur ^
$new_hash]]
472 _toplevel
$this {Confirm Branch Reset
}
473 pack [label $w.msg1
\
476 -text "Resetting '$name' to $new_expr will lose the following commits:" \
486 -xscrollcommand [list $w.
list.sbx
set] \
487 -yscrollcommand [list $w.
list.sby
set]
488 scrollbar $w.
list.sbx
-orient h
-command [list $list xview
]
489 scrollbar $w.
list.sby
-orient v
-command [list $list yview
]
490 pack $w.
list.sbx
-fill x
-side bottom
491 pack $w.
list.sby
-fill y
-side right
492 pack $list -fill both
-expand 1
493 pack $w.
list -fill both
-expand 1 -padx 5 -pady 5
495 pack [label $w.msg2
\
498 -text {Recovering lost commits may not be easy.
} \
500 pack [label $w.msg3
\
503 -text "Reset '$name'?" \
507 button $w.buttons.visualize
\
510 pack $w.buttons.visualize
-side left
511 button $w.buttons.reset
\
517 pack $w.buttons.reset
-side right
518 button $w.buttons.cancel
\
521 -command [list destroy $w]
522 pack $w.buttons.cancel
-side right
-padx 5
523 pack $w.buttons
-side bottom
-fill x
-pady 10 -padx 10
525 set fd
[git_read rev-list
--pretty=oneline
$cur ^
$new_hash]
526 while {[gets $fd line
] > 0} {
527 set abbr
[string range
$line 0 7]
528 set subj
[string range
$line 41 end
]
529 $list insert end
"$abbr $subj\n"
532 $list configure
-state disabled
534 bind $w <Key-v
> $gitk
535 bind $w <Visibility
> "
537 focus $w.buttons.cancel
539 bind $w <Key-Return
> [list destroy $w]
540 bind $w <Key-Escape
> [list destroy $w]
545 method _error
{msg
} {
546 if {[winfo ismapped
$parent_w]} {
555 -title [wm title
$p] \
560 method _toplevel
{title
} {
561 regsub -all {::} $this {__
} w
564 if {[winfo ismapped
$parent_w]} {
572 wm geometry
$w "+[winfo rootx $p]+[winfo rooty $p]"
575 method _fatal
{err
} {
576 error_popup
"Failed to set current branch.
578 This working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file.
580 This should not have occurred. [appname] will now close and give up.