tarball support v0.3 pt 2

mercurial/hgweb.py

@@ -158,6 +158,7 b' class hgweb:'
         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 b' class hgweb:'
             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 b' class hgweb:'
         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 b' class hgweb:'
         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 b' class hgweb:'
                      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,7 +640,8 b' class hgweb:'
                                          cl.parents(n), cl.rev),
                      diff=diff)
 
-    def ziparchive(self, mnode):
+    def tarball(self, mnode, type):
+        if type == 'zip':
         import zipfile
 
         tmp = tempfile.mkstemp()[1]
@@ -665,7 +663,7 b' class hgweb:'
         f.close()
         os.unlink(tmp)
 
-    def tararchive(self, mnode, type):
+        else:
         import StringIO
         import time
         import tarfile
@@ -815,13 +813,11 b' class hgweb:'
         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:
+            for i in self.supportedtarballs:
+                if type == i and i in self.allowedtarballs:
+                    self.tarball(manifest, type)
+                    return
+
                 write(self.t("error"))
 
         else:

templates/changeset.tmpl

@@ -8,7 +8,7 b''
 <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>

templates/map

@@ -37,3 +37,4 b' filediffparent = "<tr><th class="parent"'
 filelogparent = "<tr><td align="right">parent #rev#:&nbsp;</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