D3778: rebase: use progress helper
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon Jun 18 10:24:25 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa73eab7d6575: rebase: use progress helper (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3778?vs=9149&id=9182
REVISION DETAIL
https://phab.mercurial-scm.org/D3778
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -433,13 +433,10 @@
self.storestatus(tr)
cands = [k for k, v in self.state.iteritems() if v == revtodo]
- total = len(cands)
- posholder = [0]
+ p = repo.ui.makeprogress(_("rebasing"), unit=_('changesets'),
+ total=len(cands))
def progress(ctx):
- posholder[0] += 1
- self.repo.ui.progress(_("rebasing"), posholder[0],
- ("%d:%s" % (ctx.rev(), ctx)),
- _('changesets'), total)
+ p.increment(item=("%d:%s" % (ctx.rev(), ctx)))
allowdivergence = self.ui.configbool(
'experimental', 'evolution.allowdivergence')
for subset in sortsource(self.destmap):
@@ -452,7 +449,7 @@
)
for rev in sortedrevs:
self._rebasenode(tr, rev, allowdivergence, progress)
- ui.progress(_('rebasing'), None)
+ p.complete()
ui.note(_('rebase merging completed\n'))
def _concludenode(self, rev, p1, p2, editor, commitmsg=None):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list