Mercurial > hg
changeset 1077:b87aeccf73d9
tarball support v0.3 pt 2
| author | Wojciech Milkowski <wmilkowski@interia.pl> |
|---|---|
| date | Fri, 26 Aug 2005 20:51:48 -0700 |
| parents | 01db658cc78a |
| children | 33f40d0c6124 |
| files | mercurial/hgweb.py templates/changeset.tmpl templates/map |
| diffstat | 3 files changed, 65 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb.py Fri Aug 26 20:51:34 2005 -0700 +++ b/mercurial/hgweb.py Fri Aug 26 20:51:48 2005 -0700 @@ -158,6 +158,7 @@ self.mtime = -1 self.reponame = name or self.repo.ui.config("web", "name", self.repo.root) + self.supportedtarballs = 'zip', 'gz', 'bz2' def refresh(self): s = os.stat(os.path.join(self.repo.root, ".hg", "00changelog.i")) @@ -167,9 +168,10 @@ self.maxchanges = self.repo.ui.config("web", "maxchanges", 10) self.maxfiles = self.repo.ui.config("web", "maxchanges", 10) self.allowpull = self.repo.ui.configbool("web", "allowpull", True) - self.allowzip = self.repo.ui.configbool("web", "zip", True) - self.allowgz = self.repo.ui.configbool("web", "gz", True) - self.allowbz2 = self.repo.ui.configbool("web", "bz2", True) + self.allowedtarballs = [] + for i in self.supportedtarballs: + if self.repo.ui.configbool("web", i, True): + self.allowedtarballs.append(i) def date(self, cs): return time.asctime(time.gmtime(float(cs[2].split(' ')[0]))) @@ -197,16 +199,6 @@ for t in self.repo.nodetags(node): yield self.t(t1, tag=t, **args) - def tarballbuttons(self, m): - s = '' - if self.allowzip: - s += '<a href="?cmd=tarball;manifest=%s;type=zip">zip</a>\n' % m - if self.allowgz: - s += '<a href="?cmd=tarball;manifest=%s;type=gz">gz</a>\n' % m - if self.allowbz2: - s += '<a href="?cmd=tarball;manifest=%s;type=bz2">bz2</a>\n' % m - return s - def diff(self, node1, node2, files): def filterfiles(list, files): l = [x for x in list if x in files] @@ -403,6 +395,11 @@ def diff(**map): yield self.diff(p1, n, None) + def tarballs(): + for i in self.allowedtarballs: + yield {"type" : i, + "manifest" : hex(changes[0])} + yield self.t('changeset', diff=diff, rev=cl.rev(n), @@ -415,7 +412,7 @@ desc=changes[4], date=t, files=files, - tarballbuttons=self.tarballbuttons(hex(changes[0]))) + tarballbs = tarballs()) def filelog(self, f, filenode): cl = self.repo.changelog @@ -643,57 +640,58 @@ cl.parents(n), cl.rev), diff=diff) - def ziparchive(self, mnode): - import zipfile - - tmp = tempfile.mkstemp()[1] - zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) - mf = self.repo.manifest.read(bin(mnode)) - rev = self.repo.manifest.rev(bin(mnode)) - cnode = short(self.repo.changelog.node(rev)) - name = os.path.basename(self.repo.path[:-4]) # without '/.hg' suffix - name += '-' + str(rev) + '-' + cnode + '/' + def tarball(self, mnode, type): + if type == 'zip': + import zipfile - for fname in mf.keys(): - r = self.repo.file(fname) - zf.writestr(name + fname, r.read(mf[fname])) - zf.close() + tmp = tempfile.mkstemp()[1] + zf = zipfile.ZipFile(tmp, "w", zipfile.ZIP_DEFLATED) + mf = self.repo.manifest.read(bin(mnode)) + rev = self.repo.manifest.rev(bin(mnode)) + cnode = short(self.repo.changelog.node(rev)) + name = os.path.basename(self.repo.path[:-4]) # without '/.hg' suffix + name += '-' + str(rev) + '-' + cnode + '/' - f = open(tmp, 'r') - httphdr('application/zip', name[:-1] + '.zip', os.path.getsize(tmp)) - sys.stdout.write(f.read()) - f.close() - os.unlink(tmp) + for fname in mf.keys(): + r = self.repo.file(fname) + zf.writestr(name + fname, r.read(mf[fname])) + zf.close() + + f = open(tmp, 'r') + httphdr('application/zip', name[:-1] + '.zip', os.path.getsize(tmp)) + sys.stdout.write(f.read()) + f.close() + os.unlink(tmp) - def tararchive(self, mnode, type): - import StringIO - import time - import tarfile + else: + import StringIO + import time + import tarfile - #if type == "gz": - # tf = tarfile.TarFile.gzopen('', 'w', sys.stdout, compressionlevel) - #else: - # tf = tarfile.TarFile.bz2open('', 'w', sys.stdout, compressionlevel) - tf = tarfile.TarFile.open(mode='w|' + type, fileobj=sys.stdout) + #if type == "gz": + # tf = tarfile.TarFile.gzopen('', 'w', sys.stdout, compressionlevel) + #else: + # tf = tarfile.TarFile.bz2open('', 'w', sys.stdout, compressionlevel) + tf = tarfile.TarFile.open(mode='w|' + type, fileobj=sys.stdout) - mf = self.repo.manifest.read(bin(mnode)) - rev = self.repo.manifest.rev(bin(mnode)) - cnode = short(self.repo.changelog.node(rev)) - mff = self.repo.manifest.readflags(bin(mnode)) - mtime = int(time.time()) - name = os.path.basename(self.repo.path[:-4]) # without '/.hg' suffix - name += '-' + str(rev) + '-' + cnode + '/' + mf = self.repo.manifest.read(bin(mnode)) + rev = self.repo.manifest.rev(bin(mnode)) + cnode = short(self.repo.changelog.node(rev)) + mff = self.repo.manifest.readflags(bin(mnode)) + mtime = int(time.time()) + name = os.path.basename(self.repo.path[:-4]) # without '/.hg' suffix + name += '-' + str(rev) + '-' + cnode + '/' - httphdr('application/octet-stream', name[:-1] + '.tar.' + type) - for fname in mf.keys(): - r = self.repo.file(fname) - rcont = r.read(mf[fname]) - finfo = tarfile.TarInfo(name + fname) - finfo.mtime = mtime - finfo.size = len(rcont) - finfo.mode = mff[fname] and 0755 or 0644 - tf.addfile(finfo, StringIO.StringIO(rcont)) - tf.close() + httphdr('application/octet-stream', name[:-1] + '.tar.' + type) + for fname in mf.keys(): + r = self.repo.file(fname) + rcont = r.read(mf[fname]) + finfo = tarfile.TarInfo(name + fname) + finfo.mtime = mtime + finfo.size = len(rcont) + finfo.mode = mff[fname] and 0755 or 0644 + tf.addfile(finfo, StringIO.StringIO(rcont)) + tf.close() # add tags to things # tags -> list of changesets corresponding to tags @@ -815,14 +813,12 @@ elif args['cmd'][0] == 'tarball': manifest = args['manifest'][0] type = args['type'][0] - if type == 'zip' and self.allowzip: - self.ziparchive(manifest) - elif type == 'gz' and self.allowgz: - self.tararchive(manifest, 'gz') - elif type == 'bz2' and self.allowbz2: - self.tararchive(manifest, 'bz2') - else: - write(self.t("error")) + for i in self.supportedtarballs: + if type == i and i in self.allowedtarballs: + self.tarball(manifest, type) + return + + write(self.t("error")) else: write(self.t("error"))
--- a/templates/changeset.tmpl Fri Aug 26 20:51:34 2005 -0700 +++ b/templates/changeset.tmpl Fri Aug 26 20:51:48 2005 -0700 @@ -8,7 +8,7 @@ <a href="?cmd=tags">tags</a> <a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a> <a href="?cmd=changeset;node=#node#;style=raw">raw</a> -#tarballbuttons# +#tarballs%tarballentry# </div> <h2>changeset: #desc|escape|firstline#</h2>
--- a/templates/map Fri Aug 26 20:51:34 2005 -0700 +++ b/templates/map Fri Aug 26 20:51:48 2005 -0700 @@ -37,3 +37,4 @@ filelogparent = "<tr><td align="right">parent #rev#: </td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>" indexentry = "<tr class="parity#parity#"><td><a href="#url#">#name#</a></td><td>#shortdesc#</td><td>#author# <i>#email|obfuscate#</i></td><td>#lastupdate|age# ago</td></tr>" index = index.tmpl +archiveentry = "<a href="?cmd=archive;node=#node#;type=#type#">#type#</a> " \ No newline at end of file