This is an archive of the discontinued Mercurial Phabricator instance.

repack: support --packsonly --background
ClosedPublic

Authored by durham on Dec 1 2017, 2:06 PM.

Reviewers

singhsrb
phillco

Group Reviewers

Restricted Project

Commits

rFBHGXa47767bde762: repack: support --packsonly --background

Summary

The --packsonly option was being lost when --background was specified. This
fixes that.

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision is now accepted and ready to land.Dec 1 2017, 2:12 PM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			remotefilelog/__init__.py (3 lines)
M			remotefilelog/repack.py (4 lines)


	@command('repack', [			@command('repack', [
	('', 'background', None, _('run in a background process'), None),			('', 'background', None, _('run in a background process'), None),
	('', 'incremental', None, _('do an incremental repack'), None),			('', 'incremental', None, _('do an incremental repack'), None),
	('', 'packsonly', None, _('only repack packs (skip loose objects)'), None),			('', 'packsonly', None, _('only repack packs (skip loose objects)'), None),
	], _('hg repack [OPTIONS]'))			], _('hg repack [OPTIONS]'))
	def repack(ui, repo, pats, *opts):			def repack(ui, repo, pats, *opts):
	if opts.get('background'):			if opts.get('background'):
	repackmod.backgroundrepack(repo, incremental=opts.get('incremental'))			repackmod.backgroundrepack(repo, incremental=opts.get('incremental'),
				packsonly=opts.get('packsonly', False))
	return			return

	options = {'packsonly': opts.get('packsonly')}			options = {'packsonly': opts.get('packsonly')}

	if opts.get('incremental'):			if opts.get('incremental'):
	repackmod.incrementalrepack(repo, options=options)			repackmod.incrementalrepack(repo, options=options)
	else:			else:
	repackmod.fullrepack(repo, options=options)			repackmod.fullrepack(repo, options=options)

	historypack,			historypack,
	metadatastore,			metadatastore,
	shallowutil,			shallowutil,
	)			)
	import time			import time

	osutil = policy.importmod(r'osutil')			osutil = policy.importmod(r'osutil')

	def backgroundrepack(repo, incremental=True):			def backgroundrepack(repo, incremental=True, packsonly=False):
	cmd = [util.hgexecutable(), '-R', repo.origroot, 'repack']			cmd = [util.hgexecutable(), '-R', repo.origroot, 'repack']
	msg = _("(running background repack)\n")			msg = _("(running background repack)\n")
	if incremental:			if incremental:
	cmd.append('--incremental')			cmd.append('--incremental')
	msg = _("(running background incremental repack)\n")			msg = _("(running background incremental repack)\n")
				if packsonly:
				cmd.append('--packsonly')
	cmd = ' '.join(map(util.shellquote, cmd))			cmd = ' '.join(map(util.shellquote, cmd))

	repo.ui.warn(msg)			repo.ui.warn(msg)
	runshellcommand(cmd, os.environ)			runshellcommand(cmd, os.environ)

	def fullrepack(repo, options=None):			def fullrepack(repo, options=None):
	"""If ``packsonly`` is True, stores creating only loose objects are skipped.			"""If ``packsonly`` is True, stores creating only loose objects are skipped.
	"""			"""