]>
Commit | Line | Data |
---|---|---|
f522c9b5 SP |
1 | # git-gui branch merge support |
2 | # Copyright (C) 2006, 2007 Shawn Pearce | |
3 | ||
ff749c11 SP |
4 | class merge { |
5 | ||
6 | field w ; # top level window | |
350a35f0 | 7 | field w_rev ; # mega-widget to pick the revision to merge |
a6c9b081 | 8 | |
ff749c11 | 9 | method _can_merge {} { |
f522c9b5 SP |
10 | global HEAD commit_type file_states |
11 | ||
12 | if {[string match amend* $commit_type]} { | |
1ac17950 | 13 | info_popup [mc "Cannot merge while amending. |
f522c9b5 SP |
14 | |
15 | You must finish amending this commit before starting any type of merge. | |
1ac17950 | 16 | "] |
f522c9b5 SP |
17 | return 0 |
18 | } | |
19 | ||
20 | if {[committer_ident] eq {}} {return 0} | |
21 | if {![lock_index merge]} {return 0} | |
22 | ||
23 | # -- Our in memory state should match the repository. | |
24 | # | |
25 | repository_state curType curHEAD curMERGE_HEAD | |
26 | if {$commit_type ne $curType || $HEAD ne $curHEAD} { | |
1ac17950 | 27 | info_popup [mc "Last scanned state does not match repository state. |
f522c9b5 SP |
28 | |
29 | Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed. | |
30 | ||
31 | The rescan will be automatically started now. | |
1ac17950 | 32 | "] |
f522c9b5 | 33 | unlock_index |
699d5601 | 34 | rescan ui_ready |
f522c9b5 SP |
35 | return 0 |
36 | } | |
37 | ||
38 | foreach path [array names file_states] { | |
39 | switch -glob -- [lindex $file_states($path) 0] { | |
40 | _O { | |
41 | continue; # and pray it works! | |
42 | } | |
a910898e | 43 | _U - |
f522c9b5 | 44 | U? { |
1ac17950 | 45 | error_popup [mc "You are in the middle of a conflicted merge. |
f522c9b5 | 46 | |
1ac17950 | 47 | File %s has merge conflicts. |
f522c9b5 | 48 | |
360cc106 | 49 | You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge. |
1ac17950 | 50 | " [short_path $path]] |
f522c9b5 SP |
51 | unlock_index |
52 | return 0 | |
53 | } | |
54 | ?? { | |
1ac17950 | 55 | error_popup [mc "You are in the middle of a change. |
f522c9b5 | 56 | |
1ac17950 | 57 | File %s is modified. |
f522c9b5 SP |
58 | |
59 | You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise. | |
1ac17950 | 60 | " [short_path $path]] |
f522c9b5 SP |
61 | unlock_index |
62 | return 0 | |
63 | } | |
64 | } | |
65 | } | |
66 | ||
67 | return 1 | |
68 | } | |
69 | ||
5dc2cae6 | 70 | method _rev {} { |
350a35f0 SP |
71 | if {[catch {$w_rev commit_or_die}]} { |
72 | return {} | |
f522c9b5 | 73 | } |
350a35f0 | 74 | return [$w_rev get] |
1fc4ba86 SP |
75 | } |
76 | ||
ff749c11 | 77 | method _visualize {} { |
5dc2cae6 SP |
78 | set rev [_rev $this] |
79 | if {$rev ne {}} { | |
80 | do_gitk [list $rev --not HEAD] | |
81 | } | |
f522c9b5 SP |
82 | } |
83 | ||
ff749c11 | 84 | method _start {} { |
ead49f5a | 85 | global HEAD current_branch remote_url |
9d04278a | 86 | global _last_merged_branch |
f522c9b5 | 87 | |
5dc2cae6 SP |
88 | set name [_rev $this] |
89 | if {$name eq {}} { | |
f522c9b5 SP |
90 | return |
91 | } | |
92 | ||
ead49f5a SP |
93 | set spec [$w_rev get_tracking_branch] |
94 | set cmit [$w_rev get_commit] | |
ead49f5a SP |
95 | |
96 | set fh [open [gitdir FETCH_HEAD] w] | |
97 | fconfigure $fh -translation lf | |
98 | if {$spec eq {}} { | |
99 | set remote . | |
100 | set branch $name | |
101 | set stitle $branch | |
102 | } else { | |
103 | set remote $remote_url([lindex $spec 1]) | |
bc318ea8 SP |
104 | if {[regexp {^[^:@]*@[^:]*:/} $remote]} { |
105 | regsub {^[^:@]*@} $remote {} remote | |
106 | } | |
ead49f5a | 107 | set branch [lindex $spec 2] |
1ac17950 | 108 | set stitle [mc "%s of %s" $branch $remote] |
ead49f5a SP |
109 | } |
110 | regsub ^refs/heads/ $branch {} branch | |
111 | puts $fh "$cmit\t\tbranch '$branch' of $remote" | |
112 | close $fh | |
9d04278a | 113 | set _last_merged_branch $branch |
ead49f5a | 114 | |
84f67537 SP |
115 | set cmd [list git] |
116 | lappend cmd merge | |
117 | lappend cmd --strategy=recursive | |
ead49f5a SP |
118 | lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] |
119 | lappend cmd HEAD | |
18a01a0d | 120 | lappend cmd $name |
ead49f5a | 121 | |
5e6d7768 | 122 | ui_status [mc "Merging %s and %s..." $current_branch $stitle] |
1ac17950 | 123 | set cons [console::new [mc "Merge"] "merge $stitle"] |
5dc2cae6 | 124 | console::exec $cons $cmd [cb _finish $cons] |
39fa2a98 SP |
125 | |
126 | wm protocol $w WM_DELETE_WINDOW {} | |
f522c9b5 SP |
127 | destroy $w |
128 | } | |
129 | ||
5dc2cae6 | 130 | method _finish {cons ok} { |
ff749c11 | 131 | console::done $cons $ok |
f522c9b5 | 132 | if {$ok} { |
1ac17950 | 133 | set msg [mc "Merge completed successfully."] |
f522c9b5 | 134 | } else { |
1ac17950 | 135 | set msg [mc "Merge failed. Conflict resolution is required."] |
f522c9b5 SP |
136 | } |
137 | unlock_index | |
699d5601 | 138 | rescan [list ui_status $msg] |
ff749c11 | 139 | delete_this |
f522c9b5 SP |
140 | } |
141 | ||
ff749c11 | 142 | constructor dialog {} { |
f522c9b5 | 143 | global current_branch |
c80d7be5 | 144 | global M1B use_ttk NS |
f522c9b5 | 145 | |
ff749c11 SP |
146 | if {![_can_merge $this]} { |
147 | delete_this | |
148 | return | |
149 | } | |
f522c9b5 | 150 | |
c80d7be5 | 151 | make_dialog top w |
1ac17950 | 152 | wm title $top [append "[appname] ([reponame]): " [mc "Merge"]] |
ff749c11 SP |
153 | if {$top ne {.}} { |
154 | wm geometry $top "+[winfo rootx .]+[winfo rooty .]" | |
155 | } | |
f522c9b5 | 156 | |
ff749c11 | 157 | set _start [cb _start] |
ebcaadab | 158 | |
c80d7be5 | 159 | ${NS}::label $w.header \ |
1ac17950 | 160 | -text [mc "Merge Into %s" $current_branch] \ |
f522c9b5 SP |
161 | -font font_uibold |
162 | pack $w.header -side top -fill x | |
163 | ||
c80d7be5 PT |
164 | ${NS}::frame $w.buttons |
165 | ${NS}::button $w.buttons.visualize \ | |
1ac17950 | 166 | -text [mc Visualize] \ |
9feefbd2 | 167 | -command [cb _visualize] |
f522c9b5 | 168 | pack $w.buttons.visualize -side left |
c80d7be5 | 169 | ${NS}::button $w.buttons.merge \ |
1ac17950 | 170 | -text [mc Merge] \ |
9feefbd2 SP |
171 | -command $_start |
172 | pack $w.buttons.merge -side right | |
c80d7be5 | 173 | ${NS}::button $w.buttons.cancel \ |
1ac17950 | 174 | -text [mc "Cancel"] \ |
ff749c11 | 175 | -command [cb _cancel] |
f522c9b5 SP |
176 | pack $w.buttons.cancel -side right -padx 5 |
177 | pack $w.buttons -side bottom -fill x -pady 10 -padx 10 | |
178 | ||
1ac17950 | 179 | set w_rev [::choose_rev::new_unmerged $w.rev [mc "Revision To Merge"]] |
350a35f0 | 180 | pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5 |
ebcaadab SP |
181 | |
182 | bind $w <$M1B-Key-Return> $_start | |
350a35f0 | 183 | bind $w <Key-Return> $_start |
ff749c11 SP |
184 | bind $w <Key-Escape> [cb _cancel] |
185 | wm protocol $w WM_DELETE_WINDOW [cb _cancel] | |
9feefbd2 SP |
186 | |
187 | bind $w.buttons.merge <Visibility> [cb _visible] | |
f522c9b5 SP |
188 | tkwait window $w |
189 | } | |
190 | ||
ff749c11 SP |
191 | method _visible {} { |
192 | grab $w | |
350a35f0 SP |
193 | if {[is_config_true gui.matchtrackingbranch]} { |
194 | $w_rev pick_tracking_branch | |
195 | } | |
196 | $w_rev focus_filter | |
ff749c11 SP |
197 | } |
198 | ||
199 | method _cancel {} { | |
200 | wm protocol $w WM_DELETE_WINDOW {} | |
201 | unlock_index | |
202 | destroy $w | |
203 | delete_this | |
204 | } | |
205 | ||
206 | } | |
207 | ||
208 | namespace eval merge { | |
209 | ||
a6c9b081 | 210 | proc reset_hard {} { |
f522c9b5 SP |
211 | global HEAD commit_type file_states |
212 | ||
213 | if {[string match amend* $commit_type]} { | |
1ac17950 | 214 | info_popup [mc "Cannot abort while amending. |
f522c9b5 SP |
215 | |
216 | You must finish amending this commit. | |
1ac17950 | 217 | "] |
f522c9b5 SP |
218 | return |
219 | } | |
220 | ||
221 | if {![lock_index abort]} return | |
222 | ||
223 | if {[string match *merge* $commit_type]} { | |
1ac17950 | 224 | set op_question [mc "Abort merge? |
360cc106 CS |
225 | |
226 | Aborting the current merge will cause *ALL* uncommitted changes to be lost. | |
227 | ||
1ac17950 | 228 | Continue with aborting the current merge?"] |
f522c9b5 | 229 | } else { |
1ac17950 | 230 | set op_question [mc "Reset changes? |
f522c9b5 | 231 | |
360cc106 | 232 | Resetting the changes will cause *ALL* uncommitted changes to be lost. |
f522c9b5 | 233 | |
1ac17950 | 234 | Continue with resetting the current changes?"] |
360cc106 | 235 | } |
f522c9b5 | 236 | |
360cc106 | 237 | if {[ask_popup $op_question] eq {yes}} { |
0fe055cd | 238 | set fd [git_read --stderr read-tree --reset -u -v HEAD] |
f522c9b5 | 239 | fconfigure $fd -blocking 0 -translation binary |
a6c9b081 | 240 | fileevent $fd readable [namespace code [list _reset_wait $fd]] |
5e6d7768 | 241 | $::main_status start [mc "Aborting"] [mc "files reset"] |
f522c9b5 SP |
242 | } else { |
243 | unlock_index | |
244 | } | |
245 | } | |
246 | ||
a6c9b081 | 247 | proc _reset_wait {fd} { |
f522c9b5 SP |
248 | global ui_comm |
249 | ||
0fe055cd SP |
250 | $::main_status update_meter [read $fd] |
251 | ||
252 | fconfigure $fd -blocking 1 | |
f522c9b5 | 253 | if {[eof $fd]} { |
0fe055cd SP |
254 | set fail [catch {close $fd} err] |
255 | $::main_status stop | |
f522c9b5 SP |
256 | unlock_index |
257 | ||
258 | $ui_comm delete 0.0 end | |
259 | $ui_comm edit modified false | |
260 | ||
261 | catch {file delete [gitdir MERGE_HEAD]} | |
262 | catch {file delete [gitdir rr-cache MERGE_RR]} | |
f049e094 | 263 | catch {file delete [gitdir MERGE_RR]} |
f522c9b5 SP |
264 | catch {file delete [gitdir SQUASH_MSG]} |
265 | catch {file delete [gitdir MERGE_MSG]} | |
266 | catch {file delete [gitdir GITGUI_MSG]} | |
267 | ||
0fe055cd | 268 | if {$fail} { |
1ac17950 | 269 | warn_popup "[mc "Abort failed."]\n\n$err" |
0fe055cd | 270 | } |
1ac17950 | 271 | rescan {ui_status [mc "Abort completed. Ready."]} |
0fe055cd SP |
272 | } else { |
273 | fconfigure $fd -blocking 0 | |
f522c9b5 SP |
274 | } |
275 | } | |
a6c9b081 SP |
276 | |
277 | } |