From: Gábor Bernát <hidden> Date: 2016-06-15 23:06:27
From: Gabor Bernat <redacted>
adds seconds progress and estimated seconds time if getting the current
timestamp is supported by the date %+s command
Signed-off-by: Gabor Bernat <redacted>
---
I've submitted this first to this list as a feature request, however
in the meantime with the help of Jeff King [off-list ref], Junio C
Hamano [off-list ref], Eric Sunshine [off-list ref]
and Mikael Magnusson [off-list ref] came up with solution, so now
I submit it as a revised patch.
The current solution updates the progress for all commits until 1
second time is elapsed. Afterwards updates it at most once a second.
---
git-filter-branch.sh | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
From: Gábor Bernát <hidden> Date: 2016-06-15 23:06:28
From: Gabor Bernat <redacted>
adds seconds progress and estimated seconds time if getting the current
timestamp is supported by the date %+s command
Signed-off-by: Gabor Bernat <redacted>
---
I've submitted this first to this list as a feature request, however
in the meantime with the help of Jeff King [off-list ref], Junio C
Hamano [off-list ref], Eric Sunshine [off-list ref]
and Mikael Magnusson [off-list ref] came up with solution, so now
I submit it as a revised patch.
The current solution updates the progress for all commits until 1
second time is elapsed. Afterwards updates it at most once a second.
---
git-filter-branch.sh | 42 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
From: Gábor Bernát <hidden> Date: 2016-06-15 23:06:28
From: Gabor Bernat <redacted>
adds seconds progress and estimated seconds time if getting the current
timestamp is supported by the date %+s command
Signed-off-by: Gabor Bernat <redacted>
---
I've submitted this first to this list as a feature request, however
in the meantime with the help of Jeff King [off-list ref], Junio C
Hamano [off-list ref], Eric Sunshine [off-list ref]
and Mikael Magnusson [off-list ref] came up with solution, so now
I submit it as a revised patch.
The current solution updates the progress for all commits until 1
second time is elapsed. Afterwards updates it at most once a second.
Ammended build up as agreed at [1].
[1] http://thread.gmane.org/gmane.comp.version-control.git/277314
---
git-filter-branch.sh | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
From: Gábor Bernát <hidden> Date: 2016-06-15 23:06:28
From: Gabor Bernat <redacted>
adds seconds progress and estimated seconds time if getting the current
timestamp is supported by the date +%s command
Signed-off-by: Gabor Bernat <redacted>
---
I've submitted this first to this list as a feature request, however
in the meantime with the help of Jeff King [off-list ref], Junio C
Hamano [off-list ref], Eric Sunshine [off-list ref]
and Mikael Magnusson [off-list ref] came up with solution, so now
I submit it as a revised patch.
The current solution updates the progress for all commits until 1
second time is elapsed. Afterwards updates it at most once a second.
Ammended build up as agreed at [1].
[1] http://thread.gmane.org/gmane.comp.version-control.git/277314
---
git-filter-branch.sh | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
From: Eric Sunshine <hidden> Date: 2016-06-15 23:06:28
On Mon, Sep 7, 2015 at 9:52 AM, Gábor Bernát [off-list ref] wrote:
quoted hunk
From: Gabor Bernat <redacted>
adds seconds progress and estimated seconds time if getting the current
timestamp is supported by the date +%s command
Signed-off-by: Gabor Bernat <redacted>
---
@@ -275,11 +275,41 @@ commits=$(wc -l <../revs | tr -d " ")test$commits-eq0&&die"Found nothing to rewrite"# Rewrite the commits+report_progress()+{+iftest-n"$progress"+then
Indent code within the function...
+ 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
+fi
+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? While it's true that elapsed seconds will increase,
estimated seconds may jump around, requiring different numbers of
digits to display. This may leave "garbage" digits at the end of line
from previous iterations, can't it?
+}
git_filter_branch__commit_count=0
+
+progress= start_timestamp=
+if date '+%s' 2>/dev/null | grep -q '^[0-9][0-9]*$'
+then
+ next_sample_at=0
+ progress="dummy to ensure this is not empty"
+ start_timestamp=$(date '+%s')
+fi
+
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)"
+
+ report_progress
case "$filter_subdir" in
"")
--
2.6.0.rc0.3.gb3280a4