summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Gabor Bernat <gabor.bernat@gravityrd.com>2015-09-07 15:52:08 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-21 15:19:06 -0700
commit6a9d16a0a80ef53c1fcc0f6bc3d1d24d21961272 (patch)
tree58e605667cbf59dd7d1381f4d49649314ea505ee
parentGit 2.5 (diff)
downloadtgif-6a9d16a0a80ef53c1fcc0f6bc3d1d24d21961272.tar.xz
filter-branch: add passed/remaining seconds on progress
adds seconds progress and estimated seconds time if getting the current timestamp is supported by the date +%s command Signed-off-by: Gabor Bernat <gabor.bernat@gravityrd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-filter-branch.sh30
1 files changed, 29 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 5b3f63d8bb..b7bad16006 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -275,11 +275,39 @@ commits=$(wc -l <../revs | tr -d " ")
test $commits -eq 0 && die "Found nothing to rewrite"
# Rewrite the commits
+report_progress ()
+{
+ if test -n "$progress" &&
+ 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
+ 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
+ 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
"")