Mercurial > hg
diff hgext/remotefilelog/__init__.py @ 43862:5606e1cb4685
merge with stable
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 13 Dec 2019 09:43:43 -0800 |
parents | 888bd39ed555 612b4b63fb22 |
children | 9d2b2df2c2ba |
line wrap: on
line diff
--- a/hgext/remotefilelog/__init__.py Mon Dec 09 22:24:58 2019 -0800 +++ b/hgext/remotefilelog/__init__.py Fri Dec 13 09:43:43 2019 -0800 @@ -229,7 +229,7 @@ configitem(b'packs', b'maxpacksize', default=0) configitem(b'packs', b'maxchainlen', default=1000) -configitem(b'devel', b'remotefilelog.ensurestart', default=False) +configitem(b'devel', b'remotefilelog.bg-wait', default=False) # default TTL limit is 30 days _defaultlimit = 60 * 60 * 24 * 30 @@ -1080,26 +1080,19 @@ prefetchrevset = ui.config(b'remotefilelog', b'pullprefetch') bgrepack = repo.ui.configbool(b'remotefilelog', b'backgroundrepack') bgprefetch = repo.ui.configbool(b'remotefilelog', b'backgroundprefetch') - ensurestart = repo.ui.configbool(b'devel', b'remotefilelog.ensurestart') if prefetchrevset: ui.status(_(b"prefetching file contents\n")) revs = scmutil.revrange(repo, [prefetchrevset]) base = repo[b'.'].rev() if bgprefetch: - repo.backgroundprefetch( - prefetchrevset, repack=bgrepack, ensurestart=ensurestart - ) + repo.backgroundprefetch(prefetchrevset, repack=bgrepack) else: repo.prefetch(revs, base=base) if bgrepack: - repackmod.backgroundrepack( - repo, incremental=True, ensurestart=ensurestart - ) + repackmod.backgroundrepack(repo, incremental=True) elif bgrepack: - repackmod.backgroundrepack( - repo, incremental=True, ensurestart=ensurestart - ) + repackmod.backgroundrepack(repo, incremental=True) return result @@ -1250,13 +1243,9 @@ revs = scmutil.revrange(repo, opts.get(b'rev')) repo.prefetch(revs, opts.get(b'base'), pats, opts) - ensurestart = repo.ui.configbool(b'devel', b'remotefilelog.ensurestart') - # Run repack in background if opts.get(b'repack'): - repackmod.backgroundrepack( - repo, incremental=True, ensurestart=ensurestart - ) + repackmod.backgroundrepack(repo, incremental=True) @command( @@ -1276,12 +1265,10 @@ ) def repack_(ui, repo, *pats, **opts): if opts.get('background'): - ensurestart = repo.ui.configbool(b'devel', b'remotefilelog.ensurestart') repackmod.backgroundrepack( repo, incremental=opts.get('incremental'), packsonly=opts.get('packsonly', False), - ensurestart=ensurestart, ) return