mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://github.com/prati0100/git-gui

Browse Source 
* 'master' of https://github.com/prati0100/git-gui:
  git-gui: create a new namespace for chord script evaluation
  git-gui: reduce Tcl version requirement from 8.6 to 8.5
  git-gui--askpass: coerce answers to UTF-8 on Windows
  git-gui: fix error popup when doing blame -> "Show History Context"
  git-gui: add missing close bracket
  git-gui: update German translation
  git-gui: extend translation glossary template with more terms
  git-gui: update pot template and German translation to current source code
This commit is contained in:
Junio C Hamano
2020-03-19 16:06:51 -07:00
parent 7fcb965970 a5728022e0
commit 98cedd0233
10 changed files with 4802 additions and 3741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git-gui/lib/index.tcl
View File

@ -436,7 +436,7 @@ proc revert_helper {txt paths} {
#
# The asynchronous operations are each indicated below by a comment
# before the code block that starts the async operation.
set after_chord [SimpleChord new {
set after_chord [SimpleChord::new {
if {[string trim $err] != ""} {
rescan_on_error $err
} else {
@ -522,10 +522,11 @@ proc revert_helper {txt paths} {
]
if {$reply == 1} {
set note [$after_chord add_note]
checkout_index \
$txt \
$path_list \
[$after_chord add_note] \
[list $note activate] \
$capture_error
}
}
@ -567,14 +568,15 @@ proc revert_helper {txt paths} {
if {$reply == 1} {
$after_chord eval { set should_reshow_diff 1 }
delete_files $untracked_list [$after_chord add_note]
set note [$after_chord add_note]
delete_files $untracked_list [list $note activate]
}
}
# Activate the common note. If no other notes were created, this
# completes the chord. If other notes were created, then this common
# note prevents a race condition where the chord might complete early.
$after_common_note
$after_common_note activate
}
# Delete all of the specified files, performing deletion in batches to allow the