Show More
@@ -366,12 +366,23 b' class _gitlfsremote(object):' | |||||
366 | oids = transfer(sorted(objects, key=lambda o: o.get('oid'))) |
|
366 | oids = transfer(sorted(objects, key=lambda o: o.get('oid'))) | |
367 |
|
367 | |||
368 | processed = 0 |
|
368 | processed = 0 | |
|
369 | blobs = 0 | |||
369 | for _one, oid in oids: |
|
370 | for _one, oid in oids: | |
370 | processed += sizes[oid] |
|
371 | processed += sizes[oid] | |
|
372 | blobs += 1 | |||
371 | self.ui.progress(topic, processed, total=total) |
|
373 | self.ui.progress(topic, processed, total=total) | |
372 | self.ui.note(_('lfs: processed: %s\n') % oid) |
|
374 | self.ui.note(_('lfs: processed: %s\n') % oid) | |
373 | self.ui.progress(topic, pos=None, total=total) |
|
375 | self.ui.progress(topic, pos=None, total=total) | |
374 |
|
376 | |||
|
377 | if blobs > 0: | |||
|
378 | if action == 'upload': | |||
|
379 | self.ui.status(_('lfs: uploaded %d files (%s)\n') | |||
|
380 | % (blobs, util.bytecount(processed))) | |||
|
381 | # TODO: coalesce the download requests, and comment this in | |||
|
382 | #elif action == 'download': | |||
|
383 | # self.ui.status(_('lfs: downloaded %d files (%s)\n') | |||
|
384 | # % (blobs, util.bytecount(processed))) | |||
|
385 | ||||
375 | def __del__(self): |
|
386 | def __del__(self): | |
376 | # copied from mercurial/httppeer.py |
|
387 | # copied from mercurial/httppeer.py | |
377 | urlopener = getattr(self, 'urlopener', None) |
|
388 | urlopener = getattr(self, 'urlopener', None) |
@@ -48,6 +48,7 b' store.' | |||||
48 | searching for changes |
|
48 | searching for changes | |
49 | lfs: uploading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) |
|
49 | lfs: uploading 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b (12 bytes) | |
50 | lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b |
|
50 | lfs: processed: 31cf46fbc4ecd458a0943c5b4881f1f5a6dd36c53d6167d5b69ac45149b38e5b | |
|
51 | lfs: uploaded 1 files (12 bytes) | |||
51 | 1 changesets found |
|
52 | 1 changesets found | |
52 | uncompressed size of bundle content: |
|
53 | uncompressed size of bundle content: | |
53 | * (changelog) (glob) |
|
54 | * (changelog) (glob) | |
@@ -86,6 +87,7 b' When the server has some blobs already' | |||||
86 | lfs: processed: 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 |
|
87 | lfs: processed: 37a65ab78d5ecda767e8622c248b5dbff1e68b1678ab0e730d5eb8601ec8ad19 | |
87 | lfs: uploading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) |
|
88 | lfs: uploading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) | |
88 | lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 |
|
89 | lfs: processed: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 | |
|
90 | lfs: uploaded 2 files (39 bytes) | |||
89 | 1 changesets found |
|
91 | 1 changesets found | |
90 | uncompressed size of bundle content: |
|
92 | uncompressed size of bundle content: | |
91 | adding changesets |
|
93 | adding changesets |
General Comments 0
You need to be logged in to leave comments.
Login now