@matheusbsbs / matheus-bagliano / commits / 360cc106e7
Fork 0

git-gui: Unify wording to say "to stage" instead of "to add"

Also, the warning message when clicking "Reset" is adapted to the wording "Reset" rather than a confusion "Cancel commit?". Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Christian Stimming committed Jul 28, 2007 at 22:17 UTC 360cc106e76ea2a4ba424905c4924e9ed6a4165d
5 files changed +18 -14
git-gui.sh
+3 -3
@@ -1827,12 +1827,12 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1827 lappend disable_on_lock \
1828 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1829
1830 - .mbar.commit add command -label {Add To Commit} \
1830 + .mbar.commit add command -label {Stage To Commit} \
1831 -command do_add_selection
1832 lappend disable_on_lock \
1833 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1834
1835 - .mbar.commit add command -label {Add Tracked Files To Commit} \
1835 + .mbar.commit add command -label {Stage Changed Files To Commit} \
1836 -command do_add_all \
1837 -accelerator $M1T-I
1838 lappend disable_on_lock \
@@ -2154,7 +2154,7 @@ pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2154 lappend disable_on_lock \
2155 {.vpane.lower.commarea.buttons.rescan conf -state}
2156
2157 -button .vpane.lower.commarea.buttons.incall -text {Add Tracked} \
2157 +button .vpane.lower.commarea.buttons.incall -text {Stage Changed} \
2158 -command do_add_all
2159 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2160 lappend disable_on_lock \
lib/checkout_op.tcl
+1 -1
@@ -248,7 +248,7 @@ method _checkout {} {
248 if {[lock_index checkout_op]} {
249 after idle [cb _start_checkout]
250 } else {
251 - _error $this "Index is already locked."
251 + _error $this "Staging area (index) is already locked."
252 delete_this
253 }
254 }
lib/commit.tcl
+2 -2
@@ -153,7 +153,7 @@ The rescan will be automatically started now.
153 U? {
154 error_popup "Unmerged files cannot be committed.
155
156 -File [short_path $path] has merge conflicts. You must resolve them and add the file before committing.
156 +File [short_path $path] has merge conflicts. You must resolve them and stage the file before committing.
157 "
158 unlock_index
159 return
@@ -169,7 +169,7 @@ File [short_path $path] cannot be committed by this program.
169 if {!$files_ready && ![string match *merge $curType]} {
170 info_popup {No changes to commit.
171
172 -You must add at least 1 file before you can commit.
172 +You must stage at least 1 file before you can commit.
173 }
174 unlock_index
175 return
lib/index.tcl
+1 -1
@@ -360,7 +360,7 @@ proc revert_helper {txt paths} {
360 "[appname] ([reponame])" \
361 "Revert changes in $s?
362
363 -Any unadded changes will be permanently lost by the revert." \
363 +Any unstaged changes will be permanently lost by the revert." \
364 question \
365 1 \
366 {Do Nothing} \
lib/merge.tcl
+11 -7
@@ -45,7 +45,7 @@ The rescan will be automatically started now.
45
46 File [short_path $path] has merge conflicts.
47
48 -You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge.
48 +You must resolve them, stage the file, and commit to complete the current merge. Only then can you begin another merge.
49 "
50 unlock_index
51 return 0
@@ -219,16 +219,20 @@ You must finish amending this commit.
219 if {![lock_index abort]} return
220
221 if {[string match *merge* $commit_type]} {
222 - set op merge
222 + set op_question "Abort merge?
223 +
224 +Aborting the current merge will cause *ALL* uncommitted changes to be lost.
225 +
226 +Continue with aborting the current merge?"
227 } else {
224 - set op commit
225 - }
228 + set op_question "Reset changes?
229
227 - if {[ask_popup "Abort $op?
230 +Resetting the changes will cause *ALL* uncommitted changes to be lost.
231
229 -Aborting the current $op will cause *ALL* uncommitted changes to be lost.
232 +Continue with resetting the current changes?"
233 + }
234
231 -Continue with aborting the current $op?"] eq {yes}} {
235 + if {[ask_popup $op_question] eq {yes}} {
236 set fd [git_read read-tree --reset -u HEAD]
237 fconfigure $fd -blocking 0 -translation binary
238 fileevent $fd readable [namespace code [list _reset_wait $fd]]