This is an archive of the discontinued Mercurial Phabricator instance.

infinitepush: be compatible with latest changes
ClosedPublic

Authored by quark on Aug 23 2017, 12:38 AM.

Reviewers

None

Group Reviewers

Restricted Project

Commits

Summary

Upstream has renamed cleanup to _cleanup. Let's update our code.

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Lint Skipped

Unit

Unit Tests Skipped

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			infinitepush/backupcommands.py (3 lines)

	_writelocalbackupstate(repo.vfs, afterbackupheads,			_writelocalbackupstate(repo.vfs, afterbackupheads,
	afterbackuplocalbooks)			afterbackuplocalbooks)
	if ui.config('infinitepushbackup', 'savelatestbackupinfo'):			if ui.config('infinitepushbackup', 'savelatestbackupinfo'):
	_writelocalbackupinfo(repo.vfs, **afterbackupinfo)			_writelocalbackupinfo(repo.vfs, **afterbackupinfo)
	else:			else:
	ui.status(_('nothing to backup\n'))			ui.status(_('nothing to backup\n'))
	finally:			finally:
	# cleanup ensures that all pipes are flushed			# cleanup ensures that all pipes are flushed
				cleanup = getattr(other, '_cleanup', None) or getattr(other, 'cleanup')
	try:			try:
	other.cleanup()			cleanup()
	except Exception:			except Exception:
	ui.warn(_('remote connection cleanup failed\n'))			ui.warn(_('remote connection cleanup failed\n'))
	ui.status(_('finished in %f seconds\n') % (time.time() - start))			ui.status(_('finished in %f seconds\n') % (time.time() - start))
	unwrapfunction(changegroup.cg2packer, 'deltaparent', _deltaparent)			unwrapfunction(changegroup.cg2packer, 'deltaparent', _deltaparent)
	return 0			return 0

	def _dobackupcheck(bkpstate, ui, repo, dest, **opts):			def _dobackupcheck(bkpstate, ui, repo, dest, **opts):
	remotehexnodes = list(bkpstate.heads) + bkpstate.localbookmarks.values()			remotehexnodes = list(bkpstate.heads) + bkpstate.localbookmarks.values()