From f322b9abb4cadc67b991baf6ba1b9f2fbd5d7812 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 19 Sep 2011 14:50:58 -0700 Subject: sync: Support downloading bundle to initialize repository An HTTP (or HTTPS) based remote server may now offer a 'clone.bundle' file in each repository's Git directory. Over an http:// or https:// remote repo will first ask for '$URL/clone.bundle', and if present download this to bootstrap the local client, rather than relying on the native Git transport to initialize the new repository. Bundles may be hosted elsewhere. The client automatically follows a HTTP 302 redirect to acquire the bundle file. This allows servers to direct clients to cached copies residing on content delivery networks, where the bundle may be closer to the end-user. Bundle downloads are resumeable from where they last left off, allowing clients to initialize large repositories even when the connection gets interrupted. If a bundle does not exist for a repository (a HTTP 404 response code is returned for '$URL/clone.bundle'), the native Git transport is used instead. If the client is performing a shallow sync, the bundle transport is not used, as there is no way to embed shallow data into the bundle. Change-Id: I05dad17792fd6fd20635a0f71589566e557cc743 Signed-off-by: Shawn O. Pearce --- project.py | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 11 deletions(-) (limited to 'project.py') diff --git a/project.py b/project.py index 3efc4452..5adfe82e 100644 --- a/project.py +++ b/project.py @@ -24,9 +24,11 @@ import urllib2 from color import Coloring from git_command import GitCommand -from git_config import GitConfig, IsId +from git_config import GitConfig, IsId, GetSchemeFromUrl +from error import DownloadError from error import GitError, HookError, ImportError, UploadError from error import ManifestInvalidRevisionError +from progress import Progress from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M @@ -884,15 +886,13 @@ class Project(object): ## Sync ## - def Sync_NetworkHalf(self, quiet=False): + def Sync_NetworkHalf(self, quiet=False, is_new=None): """Perform only the network IO portion of the sync process. Local working directory/branch state is not affected. """ - is_new = not self.Exists + if is_new is None: + is_new = not self.Exists if is_new: - if not quiet: - print >>sys.stderr - print >>sys.stderr, 'Initializing project %s ...' % self.name self._InitGitDir() self._InitRemote() @@ -1312,9 +1312,16 @@ class Project(object): name = self.remote.name ssh_proxy = False - if self.GetRemote(name).PreConnectFetch(): + remote = self.GetRemote(name) + if remote.PreConnectFetch(): ssh_proxy = True + bundle_dst = os.path.join(self.gitdir, 'clone.bundle') + bundle_tmp = os.path.join(self.gitdir, 'clone.bundle.tmp') + use_bundle = False + if os.path.exists(bundle_dst) or os.path.exists(bundle_tmp): + use_bundle = True + if initial: alt = os.path.join(self.gitdir, 'objects/info/alternates') try: @@ -1329,6 +1336,8 @@ class Project(object): ref_dir = None if ref_dir and 'objects' == os.path.basename(ref_dir): + if use_bundle: + use_bundle = False ref_dir = os.path.dirname(ref_dir) packed_refs = os.path.join(self.gitdir, 'packed-refs') remote = self.GetRemote(name) @@ -1368,6 +1377,7 @@ class Project(object): else: ref_dir = None + use_bundle = True cmd = ['fetch'] @@ -1376,15 +1386,37 @@ class Project(object): depth = self.manifest.manifestProject.config.GetString('repo.depth') if depth and initial: cmd.append('--depth=%s' % depth) + use_bundle = False if quiet: cmd.append('--quiet') if not self.worktree: cmd.append('--update-head-ok') - cmd.append(name) - if tag is not None: - cmd.append('tag') - cmd.append(tag) + + if use_bundle and not os.path.exists(bundle_dst): + bundle_url = remote.url + '/clone.bundle' + bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url) + if GetSchemeFromUrl(bundle_url) in ('http', 'https'): + use_bundle = self._FetchBundle( + bundle_url, + bundle_tmp, + bundle_dst, + quiet=quiet) + else: + use_bundle = False + + if use_bundle: + if not quiet: + cmd.append('--quiet') + cmd.append(bundle_dst) + for f in remote.fetch: + cmd.append(str(f)) + cmd.append('refs/tags/*:refs/tags/*') + else: + cmd.append(name) + if tag is not None: + cmd.append('tag') + cmd.append(tag) ok = GitCommand(self, cmd, @@ -1399,8 +1431,99 @@ class Project(object): os.remove(packed_refs) self.bare_git.pack_refs('--all', '--prune') + if os.path.exists(bundle_dst): + os.remove(bundle_dst) + if os.path.exists(bundle_tmp): + os.remove(bundle_tmp) + return ok + def _FetchBundle(self, srcUrl, tmpPath, dstPath, quiet=False): + keep = True + done = False + dest = open(tmpPath, 'a+b') + try: + dest.seek(0, os.SEEK_END) + pos = dest.tell() + + req = urllib2.Request(srcUrl) + if pos > 0: + req.add_header('Range', 'bytes=%d-' % pos) + + try: + r = urllib2.urlopen(req) + except urllib2.HTTPError, e: + if e.code == 404: + keep = False + return False + elif e.info()['content-type'] == 'text/plain': + try: + msg = e.read() + if len(msg) > 0 and msg[-1] == '\n': + msg = msg[0:-1] + msg = ' (%s)' % msg + except: + msg = '' + else: + try: + from BaseHTTPServer import BaseHTTPRequestHandler + res = BaseHTTPRequestHandler.responses[e.code] + msg = ' (%s: %s)' % (res[0], res[1]) + except: + msg = '' + raise DownloadError('HTTP %s%s' % (e.code, msg)) + except urllib2.URLError, e: + raise DownloadError('%s (%s)' % (e.reason, req.get_host())) + + p = None + try: + size = r.headers['content-length'] + unit = 1 << 10 + + if size and not quiet: + if size > 1024 * 1.3: + unit = 1 << 20 + desc = 'MB' + else: + desc = 'KB' + p = Progress( + 'Downloading %s' % self.relpath, + int(size) / unit, + units=desc) + if pos > 0: + p.update(pos / unit) + + s = 0 + while True: + d = r.read(8192) + if d == '': + done = True + return True + dest.write(d) + if p: + s += len(d) + if s >= unit: + p.update(s / unit) + s = s % unit + if p: + if s >= unit: + p.update(s / unit) + else: + p.update(1) + finally: + r.close() + if p: + p.end() + finally: + dest.close() + + if os.path.exists(dstPath): + os.remove(dstPath) + if done: + os.rename(tmpPath, dstPath) + elif not keep: + os.remove(tmpPath) + def _Checkout(self, rev, quiet=False): cmd = ['checkout'] if quiet: -- cgit v1.2.3-54-g00ecf