Mercurial > hg
comparison mercurial/changegroup.py @ 38382:daa08d45740f
changegroup: use progress helper
Differential Revision: https://phab.mercurial-scm.org/D3783
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 17 Jun 2018 23:06:20 -0700 |
parents | ef692614e601 |
children | 1c5c4a5dd86d |
comparison
equal
deleted
inserted
replaced
38381:1a2ff11e8a88 | 38382:daa08d45740f |
---|---|
973 return bundler.generate(commonrevs, csets, fastpathlinkrev, source) | 973 return bundler.generate(commonrevs, csets, fastpathlinkrev, source) |
974 | 974 |
975 def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): | 975 def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): |
976 revisions = 0 | 976 revisions = 0 |
977 files = 0 | 977 files = 0 |
978 progress = repo.ui.makeprogress(_('files'), unit=_('files'), | |
979 total=expectedfiles) | |
978 for chunkdata in iter(source.filelogheader, {}): | 980 for chunkdata in iter(source.filelogheader, {}): |
979 files += 1 | 981 files += 1 |
980 f = chunkdata["filename"] | 982 f = chunkdata["filename"] |
981 repo.ui.debug("adding %s revisions\n" % f) | 983 repo.ui.debug("adding %s revisions\n" % f) |
982 repo.ui.progress(_('files'), files, unit=_('files'), | 984 progress.increment() |
983 total=expectedfiles) | |
984 fl = repo.file(f) | 985 fl = repo.file(f) |
985 o = len(fl) | 986 o = len(fl) |
986 try: | 987 try: |
987 deltas = source.deltaiter() | 988 deltas = source.deltaiter() |
988 if not fl.addgroup(deltas, revmap, trp): | 989 if not fl.addgroup(deltas, revmap, trp): |
999 else: | 1000 else: |
1000 raise error.Abort( | 1001 raise error.Abort( |
1001 _("received spurious file revlog entry")) | 1002 _("received spurious file revlog entry")) |
1002 if not needs: | 1003 if not needs: |
1003 del needfiles[f] | 1004 del needfiles[f] |
1004 repo.ui.progress(_('files'), None) | 1005 progress.complete() |
1005 | 1006 |
1006 for f, needs in needfiles.iteritems(): | 1007 for f, needs in needfiles.iteritems(): |
1007 fl = repo.file(f) | 1008 fl = repo.file(f) |
1008 for n in needs: | 1009 for n in needs: |
1009 try: | 1010 try: |