1 # git-gui branch merge support
2 # Copyright (C) 2006, 2007 Shawn Pearce
6 field w ; # top level window
7 field w_rev ; # mega-widget to pick the revision to merge
10 global HEAD commit_type file_states
12 if {[string match amend* $commit_type]} {
13 info_popup [mc "Cannot merge while amending.
15 You must finish amending this commit before starting any type of merge.
20 if {[committer_ident] eq {}} {return 0}
21 if {![lock_index merge]} {return 0}
23 # -- Our in memory state should match the repository.
25 repository_state curType curHEAD curMERGE_HEAD
26 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
27 info_popup [mc "Last scanned state does not match repository state.
29 Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.
31 The rescan will be automatically started now.
38 foreach path [array names file_states] {
39 switch -glob -- [lindex $file_states($path) 0] {
41 continue; # and pray it works!
45 error_popup [mc "You are in the middle of a conflicted merge.
47 File %s has merge conflicts.
49 You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge.
55 error_popup [mc "You are in the middle of a change.
59 You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.
71 if {[catch {$w_rev commit_or_die}]} {
77 method _visualize {} {
80 do_gitk [list $rev --not HEAD]
85 global HEAD current_branch remote_url
86 global _last_merged_branch
93 set spec [$w_rev get_tracking_branch]
94 set cmit [$w_rev get_commit]
96 set fh [open [gitdir FETCH_HEAD] w]
97 fconfigure $fh -translation lf
103 set remote $remote_url([lindex $spec 1])
104 if {[regexp {^[^:@]*@[^:]*:/} $remote]} {
105 regsub {^[^:@]*@} $remote {} remote
107 set branch [lindex $spec 2]
108 set stitle [mc "%s of %s" $branch $remote]
110 regsub ^refs/heads/ $branch {} branch
111 puts $fh "$cmit\t\tbranch '$branch' of $remote"
113 set _last_merged_branch $branch
115 set cmd [list git merge --strategy=recursive FETCH_HEAD]
117 ui_status [mc "Merging %s and %s..." $current_branch $stitle]
118 set cons [console::new [mc "Merge"] "merge $stitle"]
119 console::exec $cons $cmd [cb _finish $cons]
121 wm protocol $w WM_DELETE_WINDOW {}
125 method _finish {cons ok} {
126 console::done $cons $ok
128 set msg [mc "Merge completed successfully."]
130 set msg [mc "Merge failed. Conflict resolution is required."]
133 rescan [list ui_status $msg]
137 constructor dialog {} {
138 global current_branch
139 global M1B use_ttk NS
141 if {![_can_merge $this]} {
147 wm title $top [append "[appname] ([reponame]): " [mc "Merge"]]
149 wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
152 set _start [cb _start]
154 ${NS}::label $w.header \
155 -text [mc "Merge Into %s" $current_branch] \
157 pack $w.header -side top -fill x
159 ${NS}::frame $w.buttons
160 ${NS}::button $w.buttons.visualize \
161 -text [mc Visualize] \
162 -command [cb _visualize]
163 pack $w.buttons.visualize -side left
164 ${NS}::button $w.buttons.merge \
167 pack $w.buttons.merge -side right
168 ${NS}::button $w.buttons.cancel \
169 -text [mc "Cancel"] \
170 -command [cb _cancel]
171 pack $w.buttons.cancel -side right -padx 5
172 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
174 set w_rev [::choose_rev::new_unmerged $w.rev [mc "Revision To Merge"]]
175 pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
177 bind $w <$M1B-Key-Return> $_start
178 bind $w <Key-Return> $_start
179 bind $w <Key-Escape> [cb _cancel]
180 wm protocol $w WM_DELETE_WINDOW [cb _cancel]
182 bind $w.buttons.merge <Visibility> [cb _visible]
188 if {[is_config_true gui.matchtrackingbranch]} {
189 $w_rev pick_tracking_branch
195 wm protocol $w WM_DELETE_WINDOW {}
203 namespace eval merge {
206 global HEAD commit_type file_states
208 if {[string match amend* $commit_type]} {
209 info_popup [mc "Cannot abort while amending.
211 You must finish amending this commit.
216 if {![lock_index abort]} return
218 if {[string match *merge* $commit_type]} {
219 set op_question [mc "Abort merge?
221 Aborting the current merge will cause *ALL* uncommitted changes to be lost.
223 Continue with aborting the current merge?"]
225 set op_question [mc "Reset changes?
227 Resetting the changes will cause *ALL* uncommitted changes to be lost.
229 Continue with resetting the current changes?"]
232 if {[ask_popup $op_question] eq {yes}} {
233 set fd [git_read --stderr read-tree --reset -u -v HEAD]
234 fconfigure $fd -blocking 0 -translation binary
235 fileevent $fd readable [namespace code [list _reset_wait $fd]]
236 $::main_status start [mc "Aborting"] [mc "files reset"]
242 proc _reset_wait {fd} {
245 $::main_status update_meter [read $fd]
247 fconfigure $fd -blocking 1
249 set fail [catch {close $fd} err]
253 $ui_comm delete 0.0 end
254 $ui_comm edit modified false
256 catch {file delete [gitdir MERGE_HEAD]}
257 catch {file delete [gitdir rr-cache MERGE_RR]}
258 catch {file delete [gitdir MERGE_RR]}
259 catch {file delete [gitdir SQUASH_MSG]}
260 catch {file delete [gitdir MERGE_MSG]}
261 catch {file delete [gitdir GITGUI_MSG]}
264 warn_popup "[mc "Abort failed."]\n\n$err"
266 rescan {ui_status [mc "Abort completed. Ready."]}
268 fconfigure $fd -blocking 0