1 # git-gui misc. commit reading/writing support
2 # Copyright (C) 2006, 2007 Shawn Pearce
4 proc load_last_commit
{} {
5 global HEAD PARENT MERGE_HEAD commit_type ui_comm
8 if {[llength $PARENT] == 0} {
9 error_popup
[mc
"There is nothing to amend.
11 You are about to create the initial commit. There is no commit before this to amend.
16 repository_state curType curHEAD curMERGE_HEAD
17 if {$curType eq
{merge
}} {
18 error_popup
[mc
"Cannot amend while merging.
20 You are currently in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity.
28 set fd
[git_read cat-file commit
$curHEAD]
29 fconfigure $fd -encoding binary -translation lf
30 if {[catch {set enc
$repo_config(i18n.commitencoding
)}]} {
33 while {[gets $fd line
] > 0} {
34 if {[string match
{parent
*} $line]} {
35 lappend parents
[string range
$line 7 end
]
36 } elseif
{[string match
{encoding *} $line]} {
37 set enc
[string tolower
[string range
$line 9 end
]]
43 set enc
[tcl_encoding
$enc]
45 set msg
[encoding convertfrom
$enc $msg]
47 set msg
[string trim
$msg]
49 error_popup
[strcat
[mc
"Error loading commit data for amend:"] "\n\n$err"]
56 switch -- [llength $parents] {
57 0 {set commit_type amend-initial
}
58 1 {set commit_type amend
}
59 default {set commit_type amend-merge
}
62 $ui_comm delete
0.0 end
63 $ui_comm insert end
$msg
65 $ui_comm edit modified false
69 set GIT_COMMITTER_IDENT
{}
71 proc committer_ident
{} {
72 global GIT_COMMITTER_IDENT
74 if {$GIT_COMMITTER_IDENT eq
{}} {
75 if {[catch {set me
[git var GIT_COMMITTER_IDENT
]} err
]} {
76 error_popup
[strcat
[mc
"Unable to obtain your identity:"] "\n\n$err"]
79 if {![regexp {^
(.
*) [0-9]+ [-+0-9]+$} \
80 $me me GIT_COMMITTER_IDENT
]} {
81 error_popup
[strcat
[mc
"Invalid GIT_COMMITTER_IDENT:"] "\n\n$me"]
86 return $GIT_COMMITTER_IDENT
92 set me
[committer_ident
]
95 set sob
"Signed-off-by: $me"
96 set last
[$ui_comm get
{end
-1c linestart
} {end
-1c}]
98 $ui_comm edit separator
100 && ![regexp {^
[A-Z
][A-Za-z
]*-[A-Za-z-
]+: *} $last]} {
101 $ui_comm insert end
"\n"
103 $ui_comm insert end
"\n$sob"
104 $ui_comm edit separator
109 proc create_new_commit
{} {
110 global commit_type ui_comm
112 set commit_type normal
113 $ui_comm delete
0.0 end
115 $ui_comm edit modified false
119 proc commit_tree
{} {
120 global HEAD commit_type file_states ui_comm repo_config
123 if {[committer_ident
] eq
{}} return
124 if {![lock_index
update]} return
126 # -- Our in memory state should match the repository.
128 repository_state curType curHEAD curMERGE_HEAD
129 if {[string match amend
* $commit_type]
130 && $curType eq
{normal
}
131 && $curHEAD eq
$HEAD} {
132 } elseif
{$commit_type ne
$curType ||
$HEAD ne
$curHEAD} {
133 info_popup
[mc
"Last scanned state does not match repository state.
135 Another Git program has modified this repository since the last scan. A rescan must be performed before another commit can be created.
137 The rescan will be automatically started now.
144 # -- At least one file should differ in the index.
147 foreach path
[array names file_states
] {
148 switch -glob -- [lindex $file_states($path) 0] {
152 M?
{set files_ready
1}
154 error_popup
[mc
"Unmerged files cannot be committed.
156 File %s has merge conflicts. You must resolve them and stage the file before committing.
157 " [short_path
$path]]
162 error_popup
[mc
"Unknown file state %s detected.
164 File %s cannot be committed by this program.
165 " [lindex $s 0] [short_path
$path]]
169 if {!$files_ready && ![string match
*merge
$curType]} {
170 info_popup
[mc
"No changes to commit.
172 You must stage at least 1 file before you can commit.
178 # -- A message is required.
180 set msg
[string trim
[$ui_comm get
1.0 end
]]
181 regsub -all -line {[ \t\r]+$} $msg {} msg
183 error_popup
[mc
"Please supply a commit message.
185 A good commit message has the following format:
187 - First line: Describe in one sentence what you did.
189 - Remaining lines: Describe why this change is good.
195 # -- Build the message file.
197 set msg_p
[gitdir GITGUI_EDITMSG
]
198 set msg_wt
[open $msg_p w
]
199 fconfigure $msg_wt -translation lf
200 if {[catch {set enc
$repo_config(i18n.commitencoding
)}]} {
203 set use_enc
[tcl_encoding
$enc]
204 if {$use_enc ne
{}} {
205 fconfigure $msg_wt -encoding $use_enc
207 puts stderr
[mc
"warning: Tcl does not support encoding '%s'." $enc]
208 fconfigure $msg_wt -encoding utf-8
213 # -- Run the pre-commit hook.
215 set pchook
[gitdir hooks pre-commit
]
217 # On Cygwin [file executable] might lie so we need to ask
218 # the shell if the hook is executable. Yes that's annoying.
220 if {[is_Cygwin
] && [file isfile
$pchook]} {
221 set pchook
[list sh
-c [concat \
222 "if test -x \"$pchook\";" \
223 "then exec \"$pchook\" 2>&1;" \
225 } elseif
{[file executable
$pchook]} {
226 set pchook
[list $pchook |
& cat
]
228 commit_commitmsg
$curHEAD $msg_p
232 ui_status
{Calling pre-commit hook...
}
234 set fd_ph
[open "| $pchook" r
]
235 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
236 fileevent $fd_ph readable
\
237 [list commit_prehook_wait
$fd_ph $curHEAD $msg_p]
240 proc commit_prehook_wait
{fd_ph curHEAD msg_p
} {
243 append pch_error
[read $fd_ph]
244 fconfigure $fd_ph -blocking 1
246 if {[catch {close $fd_ph}]} {
247 catch {file delete
$msg_p}
248 ui_status
{Commit declined by pre-commit hook.
}
249 hook_failed_popup pre-commit
$pch_error
252 commit_commitmsg
$curHEAD $msg_p
257 fconfigure $fd_ph -blocking 0
260 proc commit_commitmsg
{curHEAD msg_p
} {
263 # -- Run the commit-msg hook.
265 set pchook
[gitdir hooks commit-msg
]
267 # On Cygwin [file executable] might lie so we need to ask
268 # the shell if the hook is executable. Yes that's annoying.
270 if {[is_Cygwin
] && [file isfile
$pchook]} {
271 set pchook
[list sh
-c [concat \
272 "if test -x \"$pchook\";" \
273 "then exec \"$pchook\" \"$msg_p\" 2>&1;" \
275 } elseif
{[file executable
$pchook]} {
276 set pchook
[list $pchook $msg_p |
& cat
]
278 commit_writetree
$curHEAD $msg_p
282 ui_status
{Calling commit-msg hook...
}
284 set fd_ph
[open "| $pchook" r
]
285 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
286 fileevent $fd_ph readable
\
287 [list commit_commitmsg_wait
$fd_ph $curHEAD $msg_p]
290 proc commit_commitmsg_wait
{fd_ph curHEAD msg_p
} {
293 append pch_error
[read $fd_ph]
294 fconfigure $fd_ph -blocking 1
296 if {[catch {close $fd_ph}]} {
297 catch {file delete
$msg_p}
298 ui_status
{Commit declined by commit-msg hook.
}
299 hook_failed_popup commit-msg
$pch_error
302 commit_writetree
$curHEAD $msg_p
307 fconfigure $fd_ph -blocking 0
310 proc commit_writetree
{curHEAD msg_p
} {
311 ui_status
{Committing changes...
}
312 set fd_wt
[git_read write-tree
]
313 fileevent $fd_wt readable
\
314 [list commit_committree
$fd_wt $curHEAD $msg_p]
317 proc commit_committree
{fd_wt curHEAD msg_p
} {
318 global HEAD PARENT MERGE_HEAD commit_type
319 global current_branch
320 global ui_comm selected_commit_type
321 global file_states selected_paths rescan_active
325 if {[catch {close $fd_wt} err
]} {
326 catch {file delete
$msg_p}
327 error_popup
[strcat
[mc
"write-tree failed:"] "\n\n$err"]
328 ui_status
{Commit failed.
}
333 # -- Verify this wasn't an empty change.
335 if {$commit_type eq
{normal
}} {
336 set fd_ot
[git_read cat-file commit
$PARENT]
337 fconfigure $fd_ot -encoding binary -translation lf
338 set old_tree
[gets $fd_ot]
341 if {[string equal
-length 5 {tree
} $old_tree]
342 && [string length
$old_tree] == 45} {
343 set old_tree
[string range
$old_tree 5 end
]
345 error [mc
"Commit %s appears to be corrupt" $PARENT]
348 if {$tree_id eq
$old_tree} {
349 catch {file delete
$msg_p}
350 info_popup
[mc
"No changes to commit.
352 No files were modified by this commit and it was not a merge commit.
354 A rescan will be automatically started now.
357 rescan
{ui_status
[mc
"No changes to commit."]}
362 # -- Create the commit.
364 set cmd
[list commit-tree
$tree_id]
365 foreach p
[concat $PARENT $MERGE_HEAD] {
369 if {[catch {set cmt_id
[eval git
$cmd]} err
]} {
370 catch {file delete
$msg_p}
371 error_popup
[strcat
[mc
"commit-tree failed:"] "\n\n$err"]
372 ui_status
{Commit failed.
}
377 # -- Update the HEAD ref.
380 if {$commit_type ne
{normal
}} {
381 append reflogm
" ($commit_type)"
383 set msg_fd
[open $msg_p r
]
386 append reflogm
{: } $subject
388 git update-ref
-m $reflogm HEAD
$cmt_id $curHEAD
390 catch {file delete
$msg_p}
391 error_popup
[strcat
[mc
"update-ref failed:"] "\n\n$err"]
392 ui_status
{Commit failed.
}
397 # -- Cleanup after ourselves.
399 catch {file delete
$msg_p}
400 catch {file delete
[gitdir MERGE_HEAD
]}
401 catch {file delete
[gitdir MERGE_MSG
]}
402 catch {file delete
[gitdir SQUASH_MSG
]}
403 catch {file delete
[gitdir GITGUI_MSG
]}
405 # -- Let rerere do its thing.
407 if {[get_config rerere.enabled
] eq
{}} {
408 set rerere
[file isdirectory
[gitdir rr-cache
]]
410 set rerere
[is_config_true rerere.enabled
]
416 # -- Run the post-commit hook.
418 set pchook
[gitdir hooks post-commit
]
419 if {[is_Cygwin
] && [file isfile
$pchook]} {
420 set pchook
[list sh
-c [concat \
421 "if test -x \"$pchook\";" \
422 "then exec \"$pchook\";" \
424 } elseif
{![file executable
$pchook]} {
428 catch {exec $pchook &}
431 $ui_comm delete
0.0 end
433 $ui_comm edit modified false
434 if {$::GITGUI_BCK_exists} {
435 catch {file delete
[gitdir GITGUI_BCK
]}
436 set ::GITGUI_BCK_exists 0
439 if {[is_enabled singlecommit
]} do_quit
441 # -- Update in memory status
443 set selected_commit_type new
444 set commit_type normal
447 set MERGE_HEAD
[list]
449 foreach path
[array names file_states
] {
450 set s
$file_states($path)
460 unset file_states
($path)
461 catch {unset selected_paths
($path)}
464 set file_states
($path) [list _O
[lindex $s 1] {} {}]
470 set file_states
($path) [list \
471 _
[string index
$m 1] \
482 ui_status
[mc
"Created commit %s: %s" [string range
$cmt_id 0 7] $subject]