From ebed9ace77eed4b8e40675cff40a96f61ae291e2 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Tue, 25 Sep 2012 13:46:02 +0000 Subject: Use tarballs instead of bundles This makes a non-backward-compatible change to morph which switches it to using tarballs instead of bundles when initialising cached git repositories. This is faster because it doesn't require index-pack --fix-thin operations on the machine running morph. --- morphlib/plugins/show_dependencies_plugin.py | 4 ++-- morphlib/plugins/update_gits_plugin.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'morphlib/plugins') diff --git a/morphlib/plugins/show_dependencies_plugin.py b/morphlib/plugins/show_dependencies_plugin.py index 8d805a35..dee84c59 100644 --- a/morphlib/plugins/show_dependencies_plugin.py +++ b/morphlib/plugins/show_dependencies_plugin.py @@ -36,11 +36,11 @@ class ShowDependenciesPlugin(cliapp.Plugin): if not os.path.exists(self.app.settings['cachedir']): os.mkdir(self.app.settings['cachedir']) cachedir = os.path.join(self.app.settings['cachedir'], 'gits') - bundle_base_url = self.app.settings['bundle-server'] + tarball_base_url = self.app.settings['tarball-server'] repo_resolver = morphlib.repoaliasresolver.RepoAliasResolver( self.app.settings['repo-alias']) lrc = morphlib.localrepocache.LocalRepoCache( - self.app, cachedir, repo_resolver, bundle_base_url) + self.app, cachedir, repo_resolver, tarball_base_url) if self.app.settings['cache-server']: rrc = morphlib.remoterepocache.RemoteRepoCache( self.app.settings['cache-server'], repo_resolver) diff --git a/morphlib/plugins/update_gits_plugin.py b/morphlib/plugins/update_gits_plugin.py index 92a687a3..608b34f1 100644 --- a/morphlib/plugins/update_gits_plugin.py +++ b/morphlib/plugins/update_gits_plugin.py @@ -45,9 +45,9 @@ class UpdateGitsPlugin(cliapp.Plugin): cachedir = os.path.join(app.settings['cachedir'], 'gits') repo_resolver = morphlib.repoaliasresolver.RepoAliasResolver( app.settings['repo-alias']) - bundle_base_url = app.settings['bundle-server'] + tarball_base_url = app.settings['tarball-server'] cache = morphlib.localrepocache.LocalRepoCache( - app, cachedir, repo_resolver, bundle_base_url) + app, cachedir, repo_resolver, tarball_base_url) subs_to_process = set() -- cgit v1.2.1