{"thread":{"id":"7404","subject":"[PATCH 2/5] Do not break git-gui messages into multiple lines.","startedAt":"2007-03-26T07:37:53Z","lastAt":"2007-03-26T07:37:53Z","messageCount":1,"participants":["Eygene Ryabinkin"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"38001","messageId":"20070326073753.GF44578@codelabs.ru","threadId":"7404","inReplyTo":null,"subject":"[PATCH 2/5] Do not break git-gui messages into multiple lines.","fromName":"Eygene Ryabinkin","fromEmail":"rea-git@codelabs.ru","sentAt":"2007-03-26T07:37:53Z","receivedAt":"2007-03-26T07:37:53Z","isPatch":true,"sender":{"key":"rea-git@codelabs.ru","avatar":null},"body":"Many git-gui messages were broken into a multiple lines to make\ngood paragraph width. Unfortunately in reality it breaks the paragraph\nwidth completely, because the dialog window width does not coincide\nwith the paragraph width created by the current font.\n\nTcl/Tk's standard dialog boxes are breaking the long lines\nautomatically, so it is better to make long lines and let the\ninterpreter do the job.\n\nSigned-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>\n---\n git-gui/git-gui.sh |   64 ++++++++++++++-------------------------------------\n 1 files changed, 18 insertions(+), 46 deletions(-)\n\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex 8157184..13c440d 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -735,12 +735,9 @@ proc handle_empty_diff {} {\n \n [short_path $path] has no changes.\n \n-The modification date of this file was updated\n-by another application, but the content within\n-the file was not changed.\n+The modification date of this file was updated by another application, but the content within the file was not changed.\n \n-A rescan will be automatically started to find\n-other files which may have the same state.\"\n+A rescan will be automatically started to find other files which may have the same state.\"\n \n \tclear_diff\n \tdisplay_file $path __\n@@ -1041,8 +1038,7 @@ proc load_last_commit {} {\n \tif {[llength $PARENT] == 0} {\n \t\terror_popup {There is nothing to amend.\n \n-You are about to create the initial commit.\n-There is no commit before this to amend.\n+You are about to create the initial commit.  There is no commit before this to amend.\n }\n \t\treturn\n \t}\n@@ -1051,10 +1047,7 @@ There is no commit before this to amend.\n \tif {$curType eq {merge}} {\n \t\terror_popup {Cannot amend while merging.\n \n-You are currently in the middle of a merge that\n-has not been fully completed.  You cannot amend\n-the prior commit unless you first abort the\n-current merge activity.\n+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.\n }\n \t\treturn\n \t}\n@@ -1144,9 +1137,7 @@ proc commit_tree {} {\n \t} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {\n \t\tinfo_popup {Last scanned state does not match repository state.\n \n-Another Git program has modified this repository\n-since the last scan.  A rescan must be performed\n-before another commit can be created.\n+Another Git program has modified this repository since the last scan.  A rescan must be performed before another commit can be created.\n \n The rescan will be automatically started now.\n }\n@@ -1167,8 +1158,7 @@ The rescan will be automatically started now.\n \t\tU? {\n \t\t\terror_popup \"Unmerged files cannot be committed.\n \n-File [short_path $path] has merge conflicts.\n-You must resolve them and add the file before committing.\n+File [short_path $path] has merge conflicts.  You must resolve them and add the file before committing.\n \"\n \t\t\tunlock_index\n \t\t\treturn\n@@ -1284,8 +1274,7 @@ proc commit_committree {fd_wt curHEAD msg} {\n \t\tif {$tree_id eq $old_tree} {\n \t\t\tinfo_popup {No changes to commit.\n \n-No files were modified by this commit and it\n-was not a merge commit.\n+No files were modified by this commit and it was not a merge commit.\n \n A rescan will be automatically started now.\n }\n@@ -2403,9 +2392,7 @@ proc switch_branch {new_branch} {\n \t} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {\n \t\tinfo_popup {Last scanned state does not match repository state.\n \n-Another Git program has modified this repository\n-since the last scan.  A rescan must be performed\n-before the current branch can be changed.\n+Another Git program has modified this repository since the last scan.  A rescan must be performed before the current branch can be changed.\n \n The rescan will be automatically started now.\n }\n@@ -2496,12 +2483,9 @@ Staying on branch '$current_branch'.\"\n \tif {[catch {git symbolic-ref HEAD \"refs/heads/$new_branch\"} err]} {\n \t\terror_popup \"Failed to set current branch.\n \n-This working directory is only partially switched.\n-We successfully updated your files, but failed to\n-update an internal Git file.\n+This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.\n \n-This should not have occurred.  [appname] will now\n-close and give up.\n+This should not have occurred.  [appname] will now close and give up.\n \n $err\"\n \t\tdo_quit\n@@ -2815,8 +2799,7 @@ proc can_merge {} {\n \tif {[string match amend* $commit_type]} {\n \t\tinfo_popup {Cannot merge while amending.\n \n-You must finish amending this commit before\n-starting any type of merge.\n+You must finish amending this commit before starting any type of merge.\n }\n \t\treturn 0\n \t}\n@@ -2830,9 +2813,7 @@ starting any type of merge.\n \tif {$commit_type ne $curType || $HEAD ne $curHEAD} {\n \t\tinfo_popup {Last scanned state does not match repository state.\n \n-Another Git program has modified this repository\n-since the last scan.  A rescan must be performed\n-before a merge can be performed.\n+Another Git program has modified this repository since the last scan.  A rescan must be performed before a merge can be performed.\n \n The rescan will be automatically started now.\n }\n@@ -2851,9 +2832,7 @@ The rescan will be automatically started now.\n \n File [short_path $path] has merge conflicts.\n \n-You must resolve them, add the file, and commit to\n-complete the current merge.  Only then can you\n-begin another merge.\n+You must resolve them, add the file, and commit to complete the current merge.  Only then can you begin another merge.\n \"\n \t\t\tunlock_index\n \t\t\treturn 0\n@@ -2863,9 +2842,7 @@ begin another merge.\n \n File [short_path $path] is modified.\n \n-You should complete the current commit before\n-starting a merge.  Doing so will help you abort\n-a failed merge, should the need arise.\n+You should complete the current commit before starting a merge.  Doing so will help you abort a failed merge, should the need arise.\n \"\n \t\t\tunlock_index\n \t\t\treturn 0\n@@ -2941,13 +2918,11 @@ proc finish_merge {revcnt w ok} {\n \n Your merge of $revcnt branches has failed.\n \n-There are file-level conflicts between the\n-branches which must be resolved manually.\n+There are file-level conflicts between the branches which must be resolved manually.\n \n The working directory will now be reset.\n \n-You can attempt this merge again\n-by merging only one branch at a time.\" $w\n+You can attempt this merge again by merging only one branch at a time.\" $w\n \n \t\t\tset fd [open \"| git read-tree --reset -u HEAD\" r]\n \t\t\tfconfigure $fd -blocking 0 -translation binary\n@@ -3060,8 +3035,7 @@ You must finish amending this commit.\n \n \tif {[ask_popup \"Abort $op?\n \n-Aborting the current $op will cause\n-*ALL* uncommitted changes to be lost.\n+Aborting the current $op will cause *ALL* uncommitted changes to be lost.\n \n Continue with aborting the current $op?\"] eq {yes}} {\n \t\tset fd [open \"| git read-tree --reset -u HEAD\" r]\n@@ -6058,9 +6032,7 @@ if {[is_enabled multicommit]} {\n \t\tif {[ask_popup \\\n \t\t\t\"This repository currently has $objects_current loose objects.\n \n-To maintain optimal performance it is strongly\n-recommended that you compress the database\n-when more than $object_limit loose objects exist.\n+To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.\n \n Compress the database now?\"] eq yes} {\n \t\t\tdo_gc\n-- \n1.5.0.3-dirty\n"}]}