undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not break git-gui messages into multiple lines.

Browse Source 
Many git-gui messages were broken into a multiple lines to make
good paragraph width. Unfortunately in reality it breaks the paragraph
width completely, because the dialog window width does not coincide
with the paragraph width created by the current font.

Tcl/Tk's standard dialog boxes are breaking the long lines
automatically, so it is better to make long lines and let the
interpreter do the job.

Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Eygene Ryabinkin 2007-03-27 14:31:55 +04:00 committed by Shawn O. Pearce
parent df0cd69558
commit 53a291a435
1 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
git-gui.sh
View File

@ -735,12 +735,9 @@ proc handle_empty_diff {} {
[short_path $path] has no changes. [short_path $path] has no changes.
The modification date of this file was updated The modification date of this file was updated by another application, but the content within the file was not changed.
by another application, but the content within
the file was not changed.
A rescan will be automatically started to find A rescan will be automatically started to find other files which may have the same state."
other files which may have the same state."
clear_diff clear_diff
display_file $path __ display_file $path __
@ -1041,8 +1038,7 @@ proc load_last_commit {} {
if {[llength $PARENT] == 0} { if {[llength $PARENT] == 0} {
error_popup {There is nothing to amend. error_popup {There is nothing to amend.
You are about to create the initial commit. You are about to create the initial commit. There is no commit before this to amend.
There is no commit before this to amend.
} }
return return
} }
@ -1051,10 +1047,7 @@ There is no commit before this to amend.
if {$curType eq {merge}} { if {$curType eq {merge}} {
error_popup {Cannot amend while merging. error_popup {Cannot amend while merging.
You are currently in the middle of a merge that 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.
has not been fully completed. You cannot amend
the prior commit unless you first abort the
current merge activity.
} }
return return
} }
@ -1144,9 +1137,7 @@ proc commit_tree {} {
} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} { } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
info_popup {Last scanned state does not match repository state. info_popup {Last scanned state does not match repository state.
Another Git program has modified this repository Another Git program has modified this repository since the last scan. A rescan must be performed before another commit can be created.
since the last scan. A rescan must be performed
before another commit can be created.
The rescan will be automatically started now. The rescan will be automatically started now.
} }
@ -1167,8 +1158,7 @@ The rescan will be automatically started now.
U? { U? {
error_popup "Unmerged files cannot be committed. error_popup "Unmerged files cannot be committed.
File [short_path $path] has merge conflicts. File [short_path $path] has merge conflicts. You must resolve them and add the file before committing.
You must resolve them and add the file before committing.
" "
unlock_index unlock_index
return return
@ -1284,8 +1274,7 @@ proc commit_committree {fd_wt curHEAD msg} {
if {$tree_id eq $old_tree} { if {$tree_id eq $old_tree} {
info_popup {No changes to commit. info_popup {No changes to commit.
No files were modified by this commit and it No files were modified by this commit and it was not a merge commit.
was not a merge commit.
A rescan will be automatically started now. A rescan will be automatically started now.
} }
@ -2403,9 +2392,7 @@ proc switch_branch {new_branch} {
} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} { } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
info_popup {Last scanned state does not match repository state. info_popup {Last scanned state does not match repository state.
Another Git program has modified this repository Another Git program has modified this repository since the last scan. A rescan must be performed before the current branch can be changed.
since the last scan. A rescan must be performed
before the current branch can be changed.
The rescan will be automatically started now. The rescan will be automatically started now.
} }
@ -2496,12 +2483,9 @@ Staying on branch '$current_branch'."
if {[catch {git symbolic-ref HEAD "refs/heads/$new_branch"} err]} { if {[catch {git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
error_popup "Failed to set current branch. error_popup "Failed to set current branch.
This working directory is only partially switched. This working directory is only partially switched. We successfully updated your files, but failed to update an internal Git file.
We successfully updated your files, but failed to
update an internal Git file.
This should not have occurred. [appname] will now This should not have occurred. [appname] will now close and give up.
close and give up.
$err" $err"
do_quit do_quit
@ -2817,8 +2801,7 @@ proc can_merge {} {
if {[string match amend* $commit_type]} { if {[string match amend* $commit_type]} {
info_popup {Cannot merge while amending. info_popup {Cannot merge while amending.
You must finish amending this commit before You must finish amending this commit before starting any type of merge.
starting any type of merge.
} }
return 0 return 0
} }
@ -2832,9 +2815,7 @@ starting any type of merge.
if {$commit_type ne $curType || $HEAD ne $curHEAD} { if {$commit_type ne $curType || $HEAD ne $curHEAD} {
info_popup {Last scanned state does not match repository state. info_popup {Last scanned state does not match repository state.
Another Git program has modified this repository Another Git program has modified this repository since the last scan. A rescan must be performed before a merge can be performed.
since the last scan. A rescan must be performed
before a merge can be performed.
The rescan will be automatically started now. The rescan will be automatically started now.
} }
@ -2853,9 +2834,7 @@ The rescan will be automatically started now.
File [short_path $path] has merge conflicts. File [short_path $path] has merge conflicts.
You must resolve them, add the file, and commit to You must resolve them, add the file, and commit to complete the current merge. Only then can you begin another merge.
complete the current merge. Only then can you
begin another merge.
" "
unlock_index unlock_index
return 0 return 0
@ -2865,9 +2844,7 @@ begin another merge.
File [short_path $path] is modified. File [short_path $path] is modified.
You should complete the current commit before You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.
starting a merge. Doing so will help you abort
a failed merge, should the need arise.
" "
unlock_index unlock_index
return 0 return 0
@ -2943,13 +2920,11 @@ proc finish_merge {revcnt w ok} {
Your merge of $revcnt branches has failed. Your merge of $revcnt branches has failed.
There are file-level conflicts between the There are file-level conflicts between the branches which must be resolved manually.
branches which must be resolved manually.
The working directory will now be reset. The working directory will now be reset.
You can attempt this merge again You can attempt this merge again by merging only one branch at a time." $w
by merging only one branch at a time." $w
set fd [open "| git read-tree --reset -u HEAD" r] set fd [open "| git read-tree --reset -u HEAD" r]
fconfigure $fd -blocking 0 -translation binary fconfigure $fd -blocking 0 -translation binary
@ -3062,8 +3037,7 @@ You must finish amending this commit.
if {[ask_popup "Abort $op? if {[ask_popup "Abort $op?
Aborting the current $op will cause Aborting the current $op will cause *ALL* uncommitted changes to be lost.
*ALL* uncommitted changes to be lost.
Continue with aborting the current $op?"] eq {yes}} { Continue with aborting the current $op?"] eq {yes}} {
set fd [open "| git read-tree --reset -u HEAD" r] set fd [open "| git read-tree --reset -u HEAD" r]
@ -6069,9 +6043,7 @@ if {[is_enabled multicommit]} {
if {[ask_popup \ if {[ask_popup \
"This repository currently has $objects_current loose objects. "This repository currently has $objects_current loose objects.
To maintain optimal performance it is strongly To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
recommended that you compress the database
when more than $object_limit loose objects exist.
Compress the database now?"] eq yes} { Compress the database now?"] eq yes} {
do_gc do_gc