All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Gábor Bernát" <bernat@primeranks.net>,
	"Git List" <git@vger.kernel.org>, "Jeff King" <peff@peff.net>,
	"Mikael Magnusson" <mikachu@gmail.com>,
	cbailey32@bloomberg.net, Lee.Carver@servicenow.com,
	"Michael Witten" <mfwitten@gmail.com>,
	"Gabor Bernat" <gabor.bernat@gravityrd.com>
Subject: Re: [PATCH] filter-branch: add passed/remaining seconds on progress
Date: Tue, 08 Sep 2015 10:32:12 -0700	[thread overview]
Message-ID: <xmqqsi6o95r7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAPig+cRRMUhWwxAgVHKpMMne7XiOuYGTi_zgQMB=A+XNGUzLqQ@mail.gmail.com> (Eric Sunshine's message of "Mon, 7 Sep 2015 16:54:56 -0400")

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Mon, Sep 7, 2015 at 9:52 AM, Gábor Bernát <bernat@primeranks.net> wrote:
>...
>>  # Rewrite the commits
>> +report_progress ()
>> +{
>> +if test -n "$progress"
>> +then
>
> Indent code within the function...

Also git_filter_branch__commit_count is now used only inside this
function, so it is easier to follow to increment it here.

I suspect that the variable has this unwieldy name for historic
reasons, perhaps an attempt to avoid name clashes with the end user
script, but it has many variables (e.g. $commits, $ref, etc.) that
are way too generic and that I can see no attempt of name clash
avoidance, so renaming it to $total_commits or something _might_
make some sense.

> ...
>> +printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)$progress"
>
> The "\r" causes this status line to be overwritten each time through,
> and since the processed commit count always increases, we know that
> the original (without ETA) will never leave junk at the end of the
> line. However, with estimated seconds also being displayed, does this
> still hold?

Good point.

Perhaps like this squashed in?

 git-filter-branch.sh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 565144a..30ef513 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -277,27 +277,28 @@ test $commits -eq 0 && die "Found nothing to rewrite"
 # Rewrite the commits
 report_progress ()
 {
-if test -n "$progress"
-then
-	if test $git_filter_branch__commit_count -gt $next_sample_at
+	git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
+
+	if test -n "$progress"
 	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
+		if test "$git_filter_branch__commit_count" -gt "$next_sample_at"
 		then
-			next_sample_at=$(( ($elapsed_seconds + 1) * $git_filter_branch__commit_count / $elapsed_seconds ))
-		else
-			next_sample_at=$(($next_sample_at + 1))
+			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=" ($elapsed_seconds seconds passed, remaining $remaining_second predicted)"
 	fi
-fi
-printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)$progress"
+	printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)$progress            "
 }
 
 git_filter_branch__commit_count=0
-
 progress= start_timestamp=
 if date '+%s' 2>/dev/null | grep -q '^[0-9][0-9]*$'
 then
@@ -306,9 +307,8 @@ then
 		start_timestamp=$(date '+%s')
 fi
 
-while read commit parents; do
-	git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
-
+while read commit parents
+do
 	report_progress
 
 	case "$filter_subdir" in

  reply	other threads:[~2015-09-08 17:32 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
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 [this message]
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=xmqqsi6o95r7.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.