aboutsummaryrefslogtreecommitdiff
path: root/csum-file.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-10-30 17:06:21 -0400
committerJunio C Hamano <gitster@pobox.com>2007-10-30 16:08:40 -0700
commit2a128d63dc140e8daeaf68659d9263b7389b7d1b (patch)
tree5b99bafae33c1277e2b09008bd44fd50856a57b9 /csum-file.c
parent74b6792f7b2d4b410459cf96977a2007ddea8675 (diff)
downloadgit-2a128d63dc140e8daeaf68659d9263b7389b7d1b.tar.gz
git-2a128d63dc140e8daeaf68659d9263b7389b7d1b.tar.xz
add throughput display to git-push
This one triggers only when git-pack-objects is called with --all-progress and --stdout which is the combination used by git-push. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.c')
-rw-r--r--csum-file.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/csum-file.c b/csum-file.c
index 9929991de..3729e73e1 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -8,6 +8,7 @@
* able to verify hasn't been messed with afterwards.
*/
#include "cache.h"
+#include "progress.h"
#include "csum-file.h"
static void sha1flush(struct sha1file *f, unsigned int count)
@@ -17,6 +18,7 @@ static void sha1flush(struct sha1file *f, unsigned int count)
for (;;) {
int ret = xwrite(f->fd, buf, count);
if (ret > 0) {
+ display_throughput(f->tp, ret);
buf = (char *) buf + ret;
count -= ret;
if (count)
@@ -80,6 +82,11 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
struct sha1file *sha1fd(int fd, const char *name)
{
+ return sha1fd_throughput(fd, name, NULL);
+}
+
+struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp)
+{
struct sha1file *f;
unsigned len;
@@ -94,6 +101,7 @@ struct sha1file *sha1fd(int fd, const char *name)
f->fd = fd;
f->error = 0;
f->offset = 0;
+ f->tp = tp;
f->do_crc = 0;
SHA1_Init(&f->ctx);
return f;