( )⚙ D3774 progress: hide update(None) in a new complete() method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3774

progress: hide update(None) in a new complete() method
ClosedPublic

Authored by martinvonz on Jun 18 2018, 3:04 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGef692614e601: progress: hide update(None) in a new complete() method
Summary

update(None) seemed a bit cryptic.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 9145

mercurial/changegroup.py

self.callback = prog.increment self.callback = prog.increment
# no need to check for empty manifest group here: # no need to check for empty manifest group here:
# if the result of the merge of 1 and 2 is the same in 3 and 4, # if the result of the merge of 1 and 2 is the same in 3 and 4,
# no new manifest will be created and the manifest group will # no new manifest will be created and the manifest group will
# be empty during the pull # be empty during the pull
self.manifestheader() self.manifestheader()
deltas = self.deltaiter() deltas = self.deltaiter()
repo.manifestlog._revlog.addgroup(deltas, revmap, trp) repo.manifestlog._revlog.addgroup(deltas, revmap, trp)
prog.update(None) prog.complete()
self.callback = None self.callback = None
def apply(self, repo, tr, srctype, url, targetphase=phases.draft, def apply(self, repo, tr, srctype, url, targetphase=phases.draft,
expectedtotal=None): expectedtotal=None):
"""Add the changegroup returned by source.read() to this repo. """Add the changegroup returned by source.read() to this repo.
srctype is a string like 'push', 'pull', or 'unbundle'. url is srctype is a string like 'push', 'pull', or 'unbundle'. url is
the URL of the repo where this changegroup is coming from. the URL of the repo where this changegroup is coming from.
cgnodes = cl.addgroup(deltas, csmap, trp, addrevisioncb=onchangelog) cgnodes = cl.addgroup(deltas, csmap, trp, addrevisioncb=onchangelog)
efiles = len(efiles) efiles = len(efiles)
if not cgnodes: if not cgnodes:
repo.ui.develwarn('applied empty changegroup', repo.ui.develwarn('applied empty changegroup',
config='warn-empty-changegroup') config='warn-empty-changegroup')
clend = len(cl) clend = len(cl)
changesets = clend - clstart changesets = clend - clstart
progress.update(None) progress.complete()
self.callback = None self.callback = None
# pull off the manifest group # pull off the manifest group
repo.ui.status(_("adding manifests\n")) repo.ui.status(_("adding manifests\n"))
# We know that we'll never have more manifests than we had # We know that we'll never have more manifests than we had
# changesets. # changesets.
progress = repo.ui.makeprogress(_('manifests'), unit=_('chunks'), progress = repo.ui.makeprogress(_('manifests'), unit=_('chunks'),
total=changesets) total=changesets)

mercurial/cmdutil.py

sub = wctx.sub(subpath) sub = wctx.sub(subpath)
try: try:
if sub.removefiles(submatch, prefix, after, force, subrepos, if sub.removefiles(submatch, prefix, after, force, subrepos,
dryrun, warnings): dryrun, warnings):
ret = 1 ret = 1
except error.LookupError: except error.LookupError:
warnings.append(_("skipping missing subrepository: %s\n") warnings.append(_("skipping missing subrepository: %s\n")
% join(subpath)) % join(subpath))
progress.update(None) progress.complete()
# warn about failure to delete explicit files/dirs # warn about failure to delete explicit files/dirs
deleteddirs = util.dirs(deleted) deleteddirs = util.dirs(deleted)
files = m.files() files = m.files()
progress = ui.makeprogress(_('deleting'), total=len(files), progress = ui.makeprogress(_('deleting'), total=len(files),
unit=_('files')) unit=_('files'))
for f in files: for f in files:
def insubrepo(): def insubrepo():
if repo.wvfs.isdir(f): if repo.wvfs.isdir(f):
warnings.append(_('not removing %s: no tracked files\n') warnings.append(_('not removing %s: no tracked files\n')
% m.rel(f)) % m.rel(f))
else: else:
warnings.append(_('not removing %s: file is untracked\n') warnings.append(_('not removing %s: file is untracked\n')
% m.rel(f)) % m.rel(f))
# missing files will generate a warning elsewhere # missing files will generate a warning elsewhere
ret = 1 ret = 1
progress.update(None) progress.complete()
if force: if force:
list = modified + deleted + clean + added list = modified + deleted + clean + added
elif after: elif after:
list = deleted list = deleted
remaining = modified + added + clean remaining = modified + added + clean
progress = ui.makeprogress(_('skipping'), total=len(remaining), progress = ui.makeprogress(_('skipping'), total=len(remaining),
unit=_('files')) unit=_('files'))
for f in remaining: for f in remaining:
progress.increment() progress.increment()
if ui.verbose or (f in files): if ui.verbose or (f in files):
warnings.append(_('not removing %s: file still exists\n') warnings.append(_('not removing %s: file still exists\n')
% m.rel(f)) % m.rel(f))
ret = 1 ret = 1
progress.update(None) progress.complete()
else: else:
list = deleted + clean list = deleted + clean
progress = ui.makeprogress(_('skipping'), progress = ui.makeprogress(_('skipping'),
total=(len(modified) + len(added)), total=(len(modified) + len(added)),
unit=_('files')) unit=_('files'))
for f in modified: for f in modified:
progress.increment() progress.increment()
warnings.append(_('not removing %s: file is modified (use -f' warnings.append(_('not removing %s: file is modified (use -f'
' to force removal)\n') % m.rel(f)) ' to force removal)\n') % m.rel(f))
ret = 1 ret = 1
for f in added: for f in added:
progress.increment() progress.increment()
warnings.append(_("not removing %s: file has been marked for add" warnings.append(_("not removing %s: file has been marked for add"
" (use 'hg forget' to undo add)\n") % m.rel(f)) " (use 'hg forget' to undo add)\n") % m.rel(f))
ret = 1 ret = 1
progress.update(None) progress.complete()
list = sorted(list) list = sorted(list)
progress = ui.makeprogress(_('deleting'), total=len(list), progress = ui.makeprogress(_('deleting'), total=len(list),
unit=_('files')) unit=_('files'))
for f in list: for f in list:
if ui.verbose or not m.exact(f): if ui.verbose or not m.exact(f):
progress.increment() progress.increment()
ui.status(_('removing %s\n') % m.rel(f)) ui.status(_('removing %s\n') % m.rel(f))
progress.update(None) progress.complete()
if not dryrun: if not dryrun:
with repo.wlock(): with repo.wlock():
if not after: if not after:
for f in list: for f in list:
if f in added: if f in added:
continue # we never unlink added files on remove continue # we never unlink added files on remove
repo.wvfs.unlinkpath(f, ignoremissing=True) repo.wvfs.unlinkpath(f, ignoremissing=True)

mercurial/merge.py

# #
# We don't need to do the same operation for 'dc' and 'cd' because # We don't need to do the same operation for 'dc' and 'cd' because
# those lists aren't consulted again. # those lists aren't consulted again.
mfiles.difference_update(a[0] for a in acts) mfiles.difference_update(a[0] for a in acts)
actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE] actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE]
if a[0] in mfiles] if a[0] in mfiles]
progress.update(None) progress.complete()
return updateresult(updated, merged, removed, unresolved) return updateresult(updated, merged, removed, unresolved)
def recordupdates(repo, actions, branchmerge): def recordupdates(repo, actions, branchmerge):
"record merge actions to the dirstate" "record merge actions to the dirstate"
# remove (must come first) # remove (must come first)
for f, args, msg in actions.get(ACTION_REMOVE, []): for f, args, msg in actions.get(ACTION_REMOVE, []):
if branchmerge: if branchmerge:
repo.dirstate.remove(f) repo.dirstate.remove(f)

mercurial/scmutil.py

if total: if total:
self.total = total self.total = total
self.pos = pos self.pos = pos
self._print(item) self._print(item)
def increment(self, step=1, item="", total=None): def increment(self, step=1, item="", total=None):
self.update(self.pos + step, item, total) self.update(self.pos + step, item, total)
def complete(self):
self.update(None)
def _print(self, item): def _print(self, item):
self.ui.progress(self.topic, self.pos, item, self.unit, self.ui.progress(self.topic, self.pos, item, self.unit,
self.total) self.total)
def gdinitconfig(ui): def gdinitconfig(ui):
"""helper function to know if a repo should be created as general delta """helper function to know if a repo should be created as general delta
""" """
# experimental config: format.generaldelta # experimental config: format.generaldelta

mercurial/setdiscovery.py

# heads(common) == heads(common.bases) since common represents common.bases # heads(common) == heads(common.bases) since common represents common.bases
# and all its ancestors # and all its ancestors
result = dag.headsetofconnecteds(common.bases) result = dag.headsetofconnecteds(common.bases)
# common.bases can include nullrev, but our contract requires us to not # common.bases can include nullrev, but our contract requires us to not
# return any heads in that case, so discard that # return any heads in that case, so discard that
result.discard(nullrev) result.discard(nullrev)
elapsed = util.timer() - start elapsed = util.timer() - start
progress.update(None) progress.complete()
ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed)) ui.debug("%d total queries in %.4fs\n" % (roundtrips, elapsed))
msg = ('found %d common and %d unknown server heads,' msg = ('found %d common and %d unknown server heads,'
' %d roundtrips in %.4fs\n') ' %d roundtrips in %.4fs\n')
missing = set(result) - set(srvheads) missing = set(result) - set(srvheads)
ui.log('discovery', msg, len(result), len(missing), roundtrips, ui.log('discovery', msg, len(result), len(missing), roundtrips,
elapsed) elapsed)
if not result and srvheadhashes != [nullid]: if not result and srvheadhashes != [nullid]:
if abortwhenunrelated: if abortwhenunrelated:
raise error.Abort(_("repository is unrelated")) raise error.Abort(_("repository is unrelated"))
else: else:
ui.warn(_("warning: repository is unrelated\n")) ui.warn(_("warning: repository is unrelated\n"))
return ({nullid}, True, srvheadhashes,) return ({nullid}, True, srvheadhashes,)
anyincoming = (srvheadhashes != [nullid]) anyincoming = (srvheadhashes != [nullid])
return dag.externalizeall(result), anyincoming, srvheadhashes return dag.externalizeall(result), anyincoming, srvheadhashes

mercurial/similar.py

h = hash(adata) h = hash(adata)
for rfctx in hashes.get(h, []): for rfctx in hashes.get(h, []):
# compare between actual file contents for exact identity # compare between actual file contents for exact identity
if adata == rfctx.data(): if adata == rfctx.data():
yield (rfctx, fctx) yield (rfctx, fctx)
break break
# Done # Done
progress.update(None) progress.complete()
def _ctxdata(fctx): def _ctxdata(fctx):
# lazily load text # lazily load text
orig = fctx.data() orig = fctx.data()
return orig, mdiff.splitnewlines(orig) return orig, mdiff.splitnewlines(orig)
def _score(fctx, otherdata): def _score(fctx, otherdata):
orig, lines = otherdata orig, lines = otherdata

mercurial/streamclone.py

progress = repo.ui.makeprogress(_('bundle'), total=bytecount, progress = repo.ui.makeprogress(_('bundle'), total=bytecount,
unit=_('bytes')) unit=_('bytes'))
progress.update(0) progress.update(0)
for chunk in it: for chunk in it:
progress.increment(step=len(chunk)) progress.increment(step=len(chunk))
yield chunk yield chunk
progress.update(None) progress.complete()
return requirements, gen() return requirements, gen()
def consumev1(repo, fp, filecount, bytecount): def consumev1(repo, fp, filecount, bytecount):
"""Apply the contents from version 1 of a streaming clone file handle. """Apply the contents from version 1 of a streaming clone file handle.
This takes the output from "stream_out" and applies it to the specified This takes the output from "stream_out" and applies it to the specified
repository. repository.
# force @filecache properties to be reloaded from # force @filecache properties to be reloaded from
# streamclone-ed file at next access # streamclone-ed file at next access
repo.invalidate(clearfilecache=True) repo.invalidate(clearfilecache=True)
elapsed = util.timer() - start elapsed = util.timer() - start
if elapsed <= 0: if elapsed <= 0:
elapsed = 0.001 elapsed = 0.001
progress.update(None) progress.complete()
repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
(util.bytecount(bytecount), elapsed, (util.bytecount(bytecount), elapsed,
util.bytecount(bytecount / elapsed))) util.bytecount(bytecount / elapsed)))
def readbundle1header(fp): def readbundle1header(fp):
compression = fp.read(2) compression = fp.read(2)
if compression != 'UN': if compression != 'UN':
raise error.Abort(_('only uncompressed stream clone bundles are ' raise error.Abort(_('only uncompressed stream clone bundles are '
chunks = util.filechunkiter(fp, limit=size) chunks = util.filechunkiter(fp, limit=size)
for chunk in chunks: for chunk in chunks:
seen += len(chunk) seen += len(chunk)
progress.update(seen) progress.update(seen)
yield chunk yield chunk
finally: finally:
fp.close() fp.close()
finally: finally:
progress.update(None) progress.complete()
def generatev2(repo): def generatev2(repo):
"""Emit content for version 2 of a streaming clone. """Emit content for version 2 of a streaming clone.
the data stream consists the following entries: the data stream consists the following entries:
1) A char representing the file destination (eg: store or cache) 1) A char representing the file destination (eg: store or cache)
2) A varint containing the length of the filename 2) A varint containing the length of the filename
3) A varint containing the length of file data 3) A varint containing the length of file data
repo.invalidate(clearfilecache=True) repo.invalidate(clearfilecache=True)
elapsed = util.timer() - start elapsed = util.timer() - start
if elapsed <= 0: if elapsed <= 0:
elapsed = 0.001 elapsed = 0.001
repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') %
(util.bytecount(progress.pos), elapsed, (util.bytecount(progress.pos), elapsed,
util.bytecount(progress.pos / elapsed))) util.bytecount(progress.pos / elapsed)))
progress.update(None) progress.complete()
def applybundlev2(repo, fp, filecount, filesize, requirements): def applybundlev2(repo, fp, filecount, filesize, requirements):
missingreqs = [r for r in requirements if r not in repo.supported] missingreqs = [r for r in requirements if r not in repo.supported]
if missingreqs: if missingreqs:
raise error.Abort(_('unable to apply stream clone: ' raise error.Abort(_('unable to apply stream clone: '
'unsupported format: %s') % 'unsupported format: %s') %
', '.join(sorted(missingreqs))) ', '.join(sorted(missingreqs)))