This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3808

largefiles: use progress helper
ClosedPublic

Authored by martinvonz on Jun 18 2018, 8:45 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG164306d3f4b4: largefiles: use progress helper
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 18 2018, 8:45 PM
pulkit accepted this revision.Jun 19 2018, 7:08 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
hgext/largefiles/lfcommands.py
376

This one can also be progress.increment().

hgext/largefiles/lfutil.py
507

This one too.

Closed by commit rHG164306d3f4b4: largefiles: use progress helper (authored by martinvonz). · Explain WhyJun 19 2018, 7:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9224

hgext/largefiles/basestore.py

been presented to the user, so missing is just supplied as a been presented to the user, so missing is just supplied as a
summary.)''' summary.)'''
success = [] success = []
missing = [] missing = []
ui = self.ui ui = self.ui
at = 0 at = 0
available = self.exists(set(hash for (_filename, hash) in files)) available = self.exists(set(hash for (_filename, hash) in files))
for filename, hash in files: progress = ui.makeprogress(_('getting largefiles'), unit=_('files'),
ui.progress(_('getting largefiles'), at, unit=_('files'),
total=len(files)) total=len(files))
for filename, hash in files:
progress.update(at)
at += 1 at += 1
ui.note(_('getting %s:%s\n') % (filename, hash)) ui.note(_('getting %s:%s\n') % (filename, hash))
if not available.get(hash): if not available.get(hash):
ui.warn(_('%s: largefile %s not available from %s\n') ui.warn(_('%s: largefile %s not available from %s\n')
% (filename, hash, util.hidepassword(self.url))) % (filename, hash, util.hidepassword(self.url)))
missing.append(filename) missing.append(filename)
continue continue
if self._gethash(filename, hash): if self._gethash(filename, hash):
success.append((filename, hash)) success.append((filename, hash))
else: else:
missing.append(filename) missing.append(filename)
ui.progress(_('getting largefiles'), None) progress.complete()
return (success, missing) return (success, missing)
def _gethash(self, filename, hash): def _gethash(self, filename, hash):
"""Get file with the provided hash and store it in the local repo's """Get file with the provided hash and store it in the local repo's
store and in the usercache. store and in the usercache.
filename is for informational messages only. filename is for informational messages only.
""" """
util.makedirs(lfutil.storepath(self.repo, '')) util.makedirs(lfutil.storepath(self.repo, ''))

hgext/largefiles/lfcommands.py

if not pats: if not pats:
pats = ui.configlist(lfutil.longname, 'patterns') pats = ui.configlist(lfutil.longname, 'patterns')
if pats: if pats:
matcher = matchmod.match(rsrc.root, '', list(pats)) matcher = matchmod.match(rsrc.root, '', list(pats))
else: else:
matcher = None matcher = None
lfiletohash = {} lfiletohash = {}
progress = ui.makeprogress(_('converting revisions'),
unit=_('revisions'),
total=rsrc['tip'].rev())
for ctx in ctxs: for ctx in ctxs:
ui.progress(_('converting revisions'), ctx.rev(), progress.update(ctx.rev())
unit=_('revisions'), total=rsrc['tip'].rev())
_lfconvert_addchangeset(rsrc, rdst, ctx, revmap, _lfconvert_addchangeset(rsrc, rdst, ctx, revmap,
lfiles, normalfiles, matcher, size, lfiletohash) lfiles, normalfiles, matcher, size, lfiletohash)
ui.progress(_('converting revisions'), None) progress.complete()
if rdst.wvfs.exists(lfutil.shortname): if rdst.wvfs.exists(lfutil.shortname):
rdst.wvfs.rmtree(lfutil.shortname) rdst.wvfs.rmtree(lfutil.shortname)
for f in lfiletohash.keys(): for f in lfiletohash.keys():
if rdst.wvfs.isfile(f): if rdst.wvfs.isfile(f):
rdst.wvfs.unlink(f) rdst.wvfs.unlink(f)
try: try:
store = storefactory.openstore(rsrc, rdst, put=True) store = storefactory.openstore(rsrc, rdst, put=True)
at = 0 at = 0
ui.debug("sending statlfile command for %d largefiles\n" % len(files)) ui.debug("sending statlfile command for %d largefiles\n" % len(files))
retval = store.exists(files) retval = store.exists(files)
files = [h for h in files if not retval[h]] files = [h for h in files if not retval[h]]
ui.debug("%d largefiles need to be uploaded\n" % len(files)) ui.debug("%d largefiles need to be uploaded\n" % len(files))
for hash in files: progress = ui.makeprogress(_('uploading largefiles'), unit=_('files'),
ui.progress(_('uploading largefiles'), at, unit=_('files'),
total=len(files)) total=len(files))
for hash in files:
progress.update(at)
pulkitUnsubmitted
Not Done

This one can also be progress.increment().

pulkit: This one can also be progress.increment().
source = lfutil.findfile(rsrc, hash) source = lfutil.findfile(rsrc, hash)
if not source: if not source:
raise error.Abort(_('largefile %s missing from store' raise error.Abort(_('largefile %s missing from store'
' (needs to be uploaded)') % hash) ' (needs to be uploaded)') % hash)
# XXX check for errors here # XXX check for errors here
store.put(source, hash) store.put(source, hash)
at += 1 at += 1
ui.progress(_('uploading largefiles'), None) progress.complete()
def verifylfiles(ui, repo, all=False, contents=False): def verifylfiles(ui, repo, all=False, contents=False):
'''Verify that every largefile revision in the current changeset '''Verify that every largefile revision in the current changeset
exists in the central store. With --contents, also verify that exists in the central store. With --contents, also verify that
the contents of each local largefile file revision are correct (SHA-1 hash the contents of each local largefile file revision are correct (SHA-1 hash
matches the revision ID). With --all, check every changeset in matches the revision ID). With --all, check every changeset in
this repository.''' this repository.'''
if all: if all:

hgext/largefiles/lfutil.py

changedstandins = set(oldstandins).symmetric_difference(set(newstandins)) changedstandins = set(oldstandins).symmetric_difference(set(newstandins))
filelist = [] filelist = []
for f in changedstandins: for f in changedstandins:
if f[0] not in filelist: if f[0] not in filelist:
filelist.append(f[0]) filelist.append(f[0])
return filelist return filelist
def getlfilestoupload(repo, missing, addfunc): def getlfilestoupload(repo, missing, addfunc):
for i, n in enumerate(missing): progress = repo.ui.makeprogress(_('finding outgoing largefiles'),
repo.ui.progress(_('finding outgoing largefiles'), i,
unit=_('revisions'), total=len(missing)) unit=_('revisions'), total=len(missing))
for i, n in enumerate(missing):
progress.update(i)
pulkitUnsubmitted
Not Done

This one too.

pulkit: This one too.
parents = [p for p in repo[n].parents() if p != node.nullid] parents = [p for p in repo[n].parents() if p != node.nullid]
oldlfstatus = repo.lfstatus oldlfstatus = repo.lfstatus
repo.lfstatus = False repo.lfstatus = False
try: try:
ctx = repo[n] ctx = repo[n]
finally: finally:
repo.lfstatus = oldlfstatus repo.lfstatus = oldlfstatus
if f not in mc: if f not in mc:
files.add(f) files.add(f)
for f in mc: for f in mc:
if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):
files.add(f) files.add(f)
for fn in files: for fn in files:
if isstandin(fn) and fn in ctx: if isstandin(fn) and fn in ctx:
addfunc(fn, readasstandin(ctx[fn])) addfunc(fn, readasstandin(ctx[fn]))
repo.ui.progress(_('finding outgoing largefiles'), None) progress.complete()
def updatestandinsbymatch(repo, match): def updatestandinsbymatch(repo, match):
'''Update standins in the working directory according to specified match '''Update standins in the working directory according to specified match
This returns (possibly modified) ``match`` object to be used for This returns (possibly modified) ``match`` object to be used for
subsequent commit process. subsequent commit process.
''' '''