diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/checkout_op.tcl | 2 | ||||
| -rw-r--r-- | lib/commit.tcl | 4 | ||||
| -rw-r--r-- | lib/index.tcl | 2 | ||||
| -rw-r--r-- | lib/merge.tcl | 18 |
4 files changed, 15 insertions, 11 deletions
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl index 40cc73a527..170f737f61 100644 --- a/lib/checkout_op.tcl +++ b/lib/checkout_op.tcl @@ -248,7 +248,7 @@ method _checkout {} { if {[lock_index checkout_op]} { after idle [cb _start_checkout] } else { - _error $this "Index is already locked." + _error $this "Staging area (index) is already locked." delete_this } } diff --git a/lib/commit.tcl b/lib/commit.tcl index 1f5c2c3d44..f857a2ff5b 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -153,7 +153,7 @@ The rescan will be automatically started now. U? { error_popup "Unmerged files cannot be committed. -File [short_path $path] has merge conflicts. You must resolve them and add the file before committing. +File [short_path $path] has merge conflicts. You must resolve them and stage the file before committing. " unlock_index return @@ -169,7 +169,7 @@ File [short_path $path] cannot be committed by this program. if {!$files_ready && ![string match *merge $curType]} { info_popup {No changes to commit. -You must add at least 1 file before you can commit. +You must stage at least 1 file before you can commit. } unlock_index return diff --git a/lib/index.tcl b/lib/index.tcl index 3ea72e1ec9..f47f9290c8 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -360,7 +360,7 @@ proc revert_helper {txt paths} { "[appname] ([reponame])" \ "Revert changes in $s? -Any unadded changes will be permanently lost by the revert." \ +Any unstaged changes will be permanently lost by the revert." \ question \ 1 \ {Do Nothing} \ diff --git a/lib/merge.tcl b/lib/merge.tcl index 148d859c5c..f6a2df3c06 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -45,7 +45,7 @@ The rescan will be automatically started now. File [short_path $path] has merge conflicts. -You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge. +You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge. " unlock_index return 0 @@ -219,16 +219,20 @@ You must finish amending this commit. if {![lock_index abort]} return if {[string match *merge* $commit_type]} { - set op merge + set op_question "Abort merge? + +Aborting the current merge will cause *ALL* uncommitted changes to be lost. + +Continue with aborting the current merge?" } else { - set op commit - } + set op_question "Reset changes? - if {[ask_popup "Abort $op? +Resetting the changes will cause *ALL* uncommitted changes to be lost. -Aborting the current $op will cause *ALL* uncommitted changes to be lost. +Continue with resetting the current changes?" + } -Continue with aborting the current $op?"] eq {yes}} { + if {[ask_popup $op_question] eq {yes}} { set fd [git_read read-tree --reset -u HEAD] fconfigure $fd -blocking 0 -translation binary fileevent $fd readable [namespace code [list _reset_wait $fd]] |