equal
deleted
inserted
replaced
403 topic = {'upload': _('lfs uploading'), |
403 topic = {'upload': _('lfs uploading'), |
404 'download': _('lfs downloading')}[action] |
404 'download': _('lfs downloading')}[action] |
405 if len(objects) > 1: |
405 if len(objects) > 1: |
406 self.ui.note(_('lfs: need to transfer %d objects (%s)\n') |
406 self.ui.note(_('lfs: need to transfer %d objects (%s)\n') |
407 % (len(objects), util.bytecount(total))) |
407 % (len(objects), util.bytecount(total))) |
408 self.ui.progress(topic, 0, total=total) |
408 progress = self.ui.makeprogress(topic, total=total) |
|
409 progress.update(0) |
409 def transfer(chunk): |
410 def transfer(chunk): |
410 for obj in chunk: |
411 for obj in chunk: |
411 objsize = obj.get('size', 0) |
412 objsize = obj.get('size', 0) |
412 if self.ui.verbose: |
413 if self.ui.verbose: |
413 if action == 'download': |
414 if action == 'download': |
441 processed = 0 |
442 processed = 0 |
442 blobs = 0 |
443 blobs = 0 |
443 for _one, oid in oids: |
444 for _one, oid in oids: |
444 processed += sizes[oid] |
445 processed += sizes[oid] |
445 blobs += 1 |
446 blobs += 1 |
446 self.ui.progress(topic, processed, total=total) |
447 progress.update(processed) |
447 self.ui.note(_('lfs: processed: %s\n') % oid) |
448 self.ui.note(_('lfs: processed: %s\n') % oid) |
448 self.ui.progress(topic, pos=None, total=total) |
449 progress.complete() |
449 |
450 |
450 if blobs > 0: |
451 if blobs > 0: |
451 if action == 'upload': |
452 if action == 'upload': |
452 self.ui.status(_('lfs: uploaded %d files (%s)\n') |
453 self.ui.status(_('lfs: uploaded %d files (%s)\n') |
453 % (blobs, util.bytecount(processed))) |
454 % (blobs, util.bytecount(processed))) |