Patchwork D3848: fix: add progress bar for number of file revisions processed

login
register
mail settings
Submitter phabricator
Date June 29, 2018, 9:52 p.m.
Message ID <c5d4d033268c13fb04d2361511bbea58@localhost.localdomain>
Download mbox | patch
Permalink /patch/32517/
State Not Applicable
Headers show

Comments

phabricator - June 29, 2018, 9:52 p.m.
hooper updated this revision to Diff 9368.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3848?vs=9363&id=9368

REVISION DETAIL
  https://phab.mercurial-scm.org/D3848

AFFECTED FILES
  hgext/fix.py

CHANGE DETAILS




To: hooper, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/fix.py b/hgext/fix.py
--- a/hgext/fix.py
+++ b/hgext/fix.py
@@ -162,22 +162,25 @@ 
         filedata = collections.defaultdict(dict)
         replacements = {}
         commitorder = sorted(revstofix, reverse=True)
-        for rev, path, newdata in results:
-            if newdata is not None:
-                filedata[rev][path] = newdata
-            numitems[rev] -= 1
-            # Apply the fixes for this and any other revisions that are ready
-            # and sitting at the front of the queue. Using a loop here prevents
-            # the queue from being blocked by the first revision to be ready out
-            # of order.
-            while commitorder and not numitems[commitorder[-1]]:
-                rev = commitorder.pop()
-                ctx = repo[rev]
-                if rev == wdirrev:
-                    writeworkingdir(repo, ctx, filedata[rev], replacements)
-                else:
-                    replacerev(ui, repo, ctx, filedata[rev], replacements)
-                del filedata[rev]
+        with ui.makeprogress(topic=_('fixing'), unit=_('files'),
+                             total=sum(numitems.values())) as progress:
+            for rev, path, newdata in results:
+                progress.increment(item=path)
+                if newdata is not None:
+                    filedata[rev][path] = newdata
+                numitems[rev] -= 1
+                # Apply the fixes for this and any other revisions that are
+                # ready and sitting at the front of the queue. Using a loop here
+                # prevents the queue from being blocked by the first revision to
+                # be ready out of order.
+                while commitorder and not numitems[commitorder[-1]]:
+                    rev = commitorder.pop()
+                    ctx = repo[rev]
+                    if rev == wdirrev:
+                        writeworkingdir(repo, ctx, filedata[rev], replacements)
+                    else:
+                        replacerev(ui, repo, ctx, filedata[rev], replacements)
+                    del filedata[rev]
 
         replacements = {prec: [succ] for prec, succ in replacements.iteritems()}
         scmutil.cleanupnodes(repo, replacements, 'fix', fixphase=True)