lfs: use a context manager to control the progress bar lifetime

hgext/lfs/blobstore.py

@@ -405,8 +405,7 b' class _gitlfsremote(object):'
         if len(objects) > 1:
             self.ui.note(_('lfs: need to transfer %d objects (%s)\n')
                          % (len(objects), util.bytecount(total)))
-        progress = self.ui.makeprogress(topic, total=total)
-        progress.update(0)
+
         def transfer(chunk):
             for obj in chunk:
                 objsize = obj.get('size', 0)
@@ -439,6 +438,8 b' class _gitlfsremote(object):'
         else:
             oids = transfer(sorted(objects, key=lambda o: o.get('oid')))
 
+        with self.ui.makeprogress(topic, total=total) as progress:
+            progress.update(0)
         processed = 0
         blobs = 0
         for _one, oid in oids:
@@ -446,7 +447,6 b' class _gitlfsremote(object):'
             blobs += 1
             progress.update(processed)
             self.ui.note(_('lfs: processed: %s\n') % oid)
-        progress.complete()
 
         if blobs > 0:
             if action == 'upload':

hgext/lfs/wrapper.py

@@ -344,17 +344,14 b' def extractpointers(repo, revs):'
     repo.ui.debug('lfs: computing set of blobs to upload\n')
     pointers = {}
 
-    progress = repo.ui.makeprogress(_('lfs search'), _('changesets'), len(revs))
-
-    try:
+    makeprogress = repo.ui.makeprogress
+    with makeprogress(_('lfs search'), _('changesets'), len(revs)) as progress:
         for r in revs:
             ctx = repo[r]
             for p in pointersfromctx(ctx).values():
                 pointers[p.oid()] = p
             progress.increment()
         return sorted(pointers.values())
-    finally:
-        progress.complete()
 
 def pointerfromctx(ctx, f, removed=False):
     """return a pointer for the named file from the given changectx, or None if