Re: [PATCH v14 21/27] bisect--helper: `bisect_log` shell function in C

[Pranit Bauva]

Hey Junio,

On Sat, Aug 27, 2016 at 4:37 AM, Junio C Hamano  wrote:
> Pranit Bauva  writes:
>
>> +static int bisect_log(void)
>> +{
>> + struct strbuf buf = STRBUF_INIT;
>> +
>> + if (strbuf_read_file(, git_path_bisect_log(), 256) < 0) {
>> + strbuf_release();
>> + return error(_("We are not bisecting.\n"));
>> + }
>> +
>> + printf("%s", buf.buf);
>> + strbuf_release();
>> +
>> + return 0;
>> +}
>
> Hmph, is it really necessary to slurp everything in a strbuf before
> sending it out to the standard output?  Wouldn't it be sufficient to
> open a file descriptor for reading on the log file and then hand it
> over to copy.c::copy_fd()?

That is actually much better. Thanks!

Regards,
Pranit Bauva
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v14 21/27] bisect--helper: `bisect_log` shell function in C

[Junio C Hamano]

Pranit Bauva  writes:

> +static int bisect_log(void)
> +{
> + struct strbuf buf = STRBUF_INIT;
> +
> + if (strbuf_read_file(, git_path_bisect_log(), 256) < 0) {
> + strbuf_release();
> + return error(_("We are not bisecting.\n"));
> + }
> +
> + printf("%s", buf.buf);
> + strbuf_release();
> +
> + return 0;
> +}

Hmph, is it really necessary to slurp everything in a strbuf before
sending it out to the standard output?  Wouldn't it be sufficient to
open a file descriptor for reading on the log file and then hand it
over to copy.c::copy_fd()?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v14 21/27] bisect--helper: `bisect_log` shell function in C

[Pranit Bauva]

Reimplement the `bisect_log` shell function in C and also add
`--bisect-log` subcommand to `git bisect--helper` to call it from
git-bisect.sh .

Using `--bisect-log` subcommand is a temporary measure to port shell
function to C so as to use the existing test suite. As more functions
are ported, this subcommand will be retired and will be called by some
other method.

Mentored-by: Lars Schneider 
Mentored-by: Christian Couder 
Signed-off-by: Pranit Bauva 
---
 builtin/bisect--helper.c | 25 -
 git-bisect.sh|  7 +--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 1b6e5d8..b57b0c8 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -864,6 +864,21 @@ static int bisect_state(struct bisect_terms *terms, const 
char **argv,
return -1;
 }
 
+static int bisect_log(void)
+{
+   struct strbuf buf = STRBUF_INIT;
+
+   if (strbuf_read_file(, git_path_bisect_log(), 256) < 0) {
+   strbuf_release();
+   return error(_("We are not bisecting.\n"));
+   }
+
+   printf("%s", buf.buf);
+   strbuf_release();
+
+   return 0;
+}
+
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
enum {
@@ -876,7 +891,8 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
BISECT_NEXT,
BISECT_AUTO_NEXT,
BISECT_AUTOSTART,
-   BISECT_STATE
+   BISECT_STATE,
+   BISECT_LOG
} cmdmode = 0;
int no_checkout = 0, res = 0;
struct option options[] = {
@@ -900,6 +916,8 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
 N_("start the bisection if BISECT_START empty or 
missing"), BISECT_AUTOSTART),
OPT_CMDMODE(0, "bisect-state", ,
 N_("mark the state of ref (or refs)"), BISECT_STATE),
+   OPT_CMDMODE(0, "bisect-log", ,
+N_("output the contents of BISECT_LOG"), BISECT_LOG),
OPT_BOOL(0, "no-checkout", _checkout,
 N_("update BISECT_HEAD instead of checking out the 
current commit")),
OPT_END()
@@ -978,6 +996,11 @@ int cmd_bisect__helper(int argc, const char **argv, const 
char *prefix)
get_terms();
res = bisect_state(, argv, argc);
break;
+   case BISECT_LOG:
+   if (argc > 1)
+   die(_("--bisect-log requires 0 arguments"));
+   res = bisect_log();
+   break;
default:
die("BUG: unknown subcommand '%d'", cmdmode);
}
diff --git a/git-bisect.sh b/git-bisect.sh
index a9eebbb..a47e3b5 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -166,11 +166,6 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
done
 }
 
-bisect_log () {
-   test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not 
bisecting.")"
-   cat "$GIT_DIR/BISECT_LOG"
-}
-
 get_terms () {
if test -s "$GIT_DIR/BISECT_TERMS"
then
@@ -208,7 +203,7 @@ case "$#" in
replay)
bisect_replay "$@" ;;
log)
-   bisect_log ;;
+   git bisect--helper --bisect-log ;;
run)
bisect_run "$@" ;;
terms)

--
https://github.com/git/git/pull/287
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html