{"thread":{"id":"28265","subject":"[PATCH] bisect: take advantage of gettextln, eval_gettextln.","startedAt":"2011-08-30T23:09:47Z","lastAt":"2011-08-30T23:09:47Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"174587","messageId":"1314745788-5060-1-git-send-email-jon.seymour@gmail.com","threadId":"28265","inReplyTo":null,"subject":"[PATCH] bisect: take advantage of gettextln, eval_gettextln.","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2011-08-30T23:09:47Z","receivedAt":"2011-08-30T23:09:47Z","isPatch":true,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"Signed-off-by: Jon Seymour <jon.seymour@gmail.com>\n---\n git-bisect.sh |   49 ++++++++++++++-----------------------------------\n 1 files changed, 14 insertions(+), 35 deletions(-)\n\nNow that both dependencies have been merged into master, this patch is ready\nto be merged.\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex e0ca3fb..2524060 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -45,10 +45,7 @@ bisect_head()\n \n bisect_autostart() {\n \ttest -s \"$GIT_DIR/BISECT_START\" || {\n-\t\t(\n-\t\t\tgettext \"You need to start by \\\"git bisect start\\\"\" &&\n-\t\t\techo\n-\t\t) >&2\n+\t\tgettextln \"You need to start by \\\"git bisect start\\\"\" >&2\n \t\tif test -t 0\n \t\tthen\n \t\t\t# TRANSLATORS: Make sure to include [Y] and [n] in your\n@@ -272,10 +269,7 @@ bisect_next_check() {\n \tt,,good)\n \t\t# have bad but not good.  we could bisect although\n \t\t# this is less optimum.\n-\t\t(\n-\t\t\tgettext \"Warning: bisecting only with a bad commit.\" &&\n-\t\t\techo\n-\t\t) >&2\n+\t\tgettextln \"Warning: bisecting only with a bad commit.\" >&2\n \t\tif test -t 0\n \t\tthen\n \t\t\t# TRANSLATORS: Make sure to include [Y] and [n] in your\n@@ -291,18 +285,12 @@ bisect_next_check() {\n \n \t\tif test -s \"$GIT_DIR/BISECT_START\"\n \t\tthen\n-\t\t\t(\n-\t\t\t\tgettext \"You need to give me at least one good and one bad revisions.\n-(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\" &&\n-\t\t\t\techo\n-\t\t\t) >&2\n+\t\t\tgettextln \"You need to give me at least one good and one bad revisions.\n+(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\" >&2\n \t\telse\n-\t\t\t(\n-\t\t\t\tgettext \"You need to start by \\\"git bisect start\\\".\n+\t\t\tgettextln \"You need to start by \\\"git bisect start\\\".\n You then need to give me at least one good and one bad revisions.\n-(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\" &&\n-\t\t\t\techo\n-\t\t\t) >&2\n+(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\" >&2\n \t\tfi\n \t\texit 1 ;;\n \tesac\n@@ -355,7 +343,7 @@ bisect_visualize() {\n \n bisect_reset() {\n \ttest -s \"$GIT_DIR/BISECT_START\" || {\n-\t\tgettext \"We are not bisecting.\"; echo\n+\t\tgettextln \"We are not bisecting.\"\n \t\treturn\n \t}\n \tcase \"$#\" in\n@@ -428,18 +416,15 @@ bisect_run () {\n \twhile true\n \tdo\n \t\tcommand=\"$@\"\n-\t\teval_gettext \"running \\$command\"; echo\n+\t\teval_gettextln \"running \\$command\"\n \t\t\"$@\"\n \t\tres=$?\n \n \t\t# Check for really bad run error.\n \t\tif [ $res -lt 0 -o $res -ge 128 ]\n \t\tthen\n-\t\t\t(\n-\t\t\t\teval_gettext \"bisect run failed:\n-exit code \\$res from '\\$command' is < 0 or >= 128\" &&\n-\t\t\t\techo\n-\t\t\t) >&2\n+\t\t\teval_gettextln \"bisect run failed:\n+exit code \\$res from '\\$command' is < 0 or >= 128\" >&2\n \t\t\texit $res\n \t\tfi\n \n@@ -464,26 +449,20 @@ exit code \\$res from '\\$command' is < 0 or >= 128\" &&\n \t\tif sane_grep \"first bad commit could be any of\" \"$GIT_DIR/BISECT_RUN\" \\\n \t\t\t> /dev/null\n \t\tthen\n-\t\t\t(\n-\t\t\t\tgettext \"bisect run cannot continue any more\" &&\n-\t\t\t\techo\n-\t\t\t) >&2\n+\t\t\tgettextln \"bisect run cannot continue any more\" >&2\n \t\t\texit $res\n \t\tfi\n \n \t\tif [ $res -ne 0 ]\n \t\tthen\n-\t\t\t(\n-\t\t\t\teval_gettext \"bisect run failed:\n-'bisect_state \\$state' exited with error code \\$res\" &&\n-\t\t\t\techo\n-\t\t\t) >&2\n+\t\t\teval_gettextln \"bisect run failed:\n+'bisect_state \\$state' exited with error code \\$res\" >&2\n \t\t\texit $res\n \t\tfi\n \n \t\tif sane_grep \"is the first bad commit\" \"$GIT_DIR/BISECT_RUN\" > /dev/null\n \t\tthen\n-\t\t\tgettext \"bisect run success\"; echo\n+\t\t\tgettextln \"bisect run success\"\n \t\t\texit 0;\n \t\tfi\n \n-- \n1.7.6.44.gdbb64d\n"}]}