[PATCH 1 of 1] hgweb: add environ to template variables

[FZiegler]

# HG changeset patch
# User Francois Ziegler <zarf at klacto.net>
# Date 1285037654 14400
# Node ID e3cc8824b58e548043910311a4056aab5095be94
# Parent  a7bba5966d5d135695cf95c74d959c18309be7da
hgweb: add environ to template variables

diff -r a7bba5966d5d -r e3cc8824b58e mercurial/hgweb/common.py
--- a/mercurial/hgweb/common.py	Sun Sep 19 21:07:08 2010 +0200
+++ b/mercurial/hgweb/common.py	Mon Sep 20 22:54:14 2010 -0400
@@ -155,7 +155,8 @@
             os.environ.get("EMAIL") or "")
 
 def caching(web, req):
-    tag = str(web.mtime)
+    user = req.env.get('REMOTE_USER', '')
+    tag = str(web.mtime)+'/'+str(user)
     if req.env.get('HTTP_IF_NONE_MATCH') == tag:
         raise ErrorResponse(HTTP_NOT_MODIFIED)
     req.headers.append(('ETag', tag))
diff -r a7bba5966d5d -r e3cc8824b58e mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py	Sun Sep 19 21:07:08 2010 +0200
+++ b/mercurial/hgweb/hgweb_mod.py	Mon Sep 20 22:54:14 2010 -0400
@@ -261,6 +261,7 @@
                                    defaults={"url": req.url,
                                              "staticurl": staticurl,
                                              "urlbase": urlbase,
+                                             "environ": req.env,
                                              "repo": self.reponame,
                                              "header": header,
                                              "footer": footer,
diff -r a7bba5966d5d -r e3cc8824b58e mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Sun Sep 19 21:07:08 2010 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Mon Sep 20 22:54:14 2010 -0400
@@ -334,6 +334,7 @@
                                    defaults={"header": header,
                                              "footer": footer,
                                              "motd": motd,
+                                             "environ": req.env,
                                              "url": url,
                                              "staticurl": staticurl,
                                              "sessionvars": sessionvars})