From: Junio C Hamano <gitster@pobox.com>
To: "Gábor Bernát" <bernat@primeranks.net>
Cc: git@vger.kernel.org, peff@peff.net, sunshine@sunshineco.com,
mikachu@gmail.com, cbailey32@bloomberg.net,
Lee.Carver@servicenow.com, mfwitten@gmail.com,
Gabor Bernat <gabor.bernat@gravityrd.com>
Subject: Re: [PATCH] filter-branch: add passed/remaining seconds on progress
Date: Fri, 04 Sep 2015 11:34:08 -0700 [thread overview]
Message-ID: <xmqqk2s6f2zj.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1441379798-15453-1-git-send-email-bernat@primeranks.net> ("Gábor Bernát"'s message of "Fri, 4 Sep 2015 17:16:38 +0200")
Gábor Bernát <bernat@primeranks.net> writes:
> @@ -277,9 +277,43 @@ test $commits -eq 0 && die "Found nothing to rewrite"
> # Rewrite the commits
>
> git_filter_branch__commit_count=0
This is not a new problem, but I wonder why we need such a
cumbersomely long variable name. It is not like this is a part of
some shell script library that needs to be careful about namespace
pollution.
> +echo $(date +%s) | grep -q '^[0-9]+$'; 2>/dev/null && show_seconds=t
That is very strange construct. I think you meant to say something
like
if date '+%s' 2>/dev/null | grep -q '^[0-9][0-9]*$'
then
show_seconds=t
else
show_seconds=
fi
A handful of points:
* "echo $(any-command)" is suspect, unless you are trying to let
the shell munge output from any-command, which is not the case.
* "grep" without -E (or "egrep") takes BRE, which "+" (one or more)
is not part of.
* That semicolon is a syntax error. I think whoever suggested you
to use it meant to squelch possible errors from "date" that does
not understand the "%s" format.
* I do not think you are clearing show_seconds to empty anywhere,
so an environment variable the user may have when s/he starts
filter-branch will seep through and confuse you.
> +case "$show_seconds" in
> + t)
> + start_timestamp=$(date +%s)
> + next_sample_at=0
> + ;;
> + '')
> + progress=""
> + ;;
> +esac
In our codebase case labels and case/esac align, like you did in the
later part of the patch.
> +
> while read commit parents; do
> git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
> - printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)"
> +
> + case "$show_seconds" in
> + t)
> + if test $git_filter_branch__commit_count -gt $next_sample_at
> + then
> + now_timestamp=$(date +%s)
> + elapsed_seconds=$(($now_timestamp - $start_timestamp))
> + remaining_second=$(( ($commits - $git_filter_branch__commit_count) * $elapsed_seconds / $git_filter_branch__commit_count ))
> + if test $elapsed_seconds -gt 0
> + then
> + next_sample_at=$(( ($elapsed_seconds + 1) * $git_filter_branch__commit_count / $elapsed_seconds ))
> + else
> + next_sample_at=$(($next_sample_at + 1))
> + fi
> + progress=" ($elapsed_seconds seconds passed, remaining $remaining_second predicted)"
> + fi
> + ;;
> + '')
> + progress=""
> + ;;
> + esac
> +
> + printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)$progress"
It would be easier to follow the logic of this loop whose _primary_
point is to rewrite one commit if you moved this part into a helper
function. Then the loop would look more like:
while read commit parents
do
: $(( $git_filter_branch__commit_count++ ))
report_progress
case "$filter_subdir" in
...
# all the work that is about rewriting this commit
# comes here.
done
next prev parent reply other threads:[~2015-09-04 18:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <xmqq4mjgyrl9.fsf () gitster ! mtv ! corp ! google ! com>
2015-09-04 15:16 ` [PATCH] filter-branch: add passed/remaining seconds on progress Gábor Bernát
2015-09-04 18:34 ` Junio C Hamano [this message]
2015-09-04 20:15 ` Eric Sunshine
2015-09-06 9:49 ` Gabor Bernat
2015-09-06 10:05 ` Eric Sunshine
2015-09-06 13:11 ` Gábor Bernát
2015-09-06 18:13 ` Junio C Hamano
2015-09-07 12:31 ` Gábor Bernát
2015-09-07 13:44 ` Ramsay Jones
2015-09-07 13:52 ` Gábor Bernát
2015-09-07 20:54 ` Eric Sunshine
2015-09-08 17:32 ` Junio C Hamano
2015-09-08 17:59 ` Eric Sunshine
2015-09-21 19:52 ` Junio C Hamano
2015-09-21 21:22 ` Eric Sunshine
[not found] ` <CALYJoz3xoiB2pVT+r0Nz+EYdE91WX6ypdmieMs1uubg=Vs4bog@mail.gmail.com>
2015-09-22 15:53 ` Gabor Bernat
2015-09-22 16:08 ` Junio C Hamano
2015-09-23 20:48 ` Gabor Bernat
2015-09-08 21:44 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2s6f2zj.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Lee.Carver@servicenow.com \
--cc=bernat@primeranks.net \
--cc=cbailey32@bloomberg.net \
--cc=gabor.bernat@gravityrd.com \
--cc=git@vger.kernel.org \
--cc=mfwitten@gmail.com \
--cc=mikachu@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.