Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/webcommands.py @ 16727:3e24ce3de5f1
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 May 2012 07:00:55 +0200 |
parents | e825a89de5d7 7bf48bc7de23 |
children | d490edc71146 |
line wrap: on
line diff
--- a/mercurial/hgweb/webcommands.py Sun May 13 22:59:22 2012 +0200 +++ b/mercurial/hgweb/webcommands.py Tue May 15 07:00:55 2012 +0200 @@ -558,6 +558,7 @@ if fctx is not None: n = fctx.node() path = fctx.path() + ctx = fctx.changectx() else: n = ctx.node() # path already defined in except clause @@ -567,7 +568,7 @@ if 'style' in req.form: style = req.form['style'][0] - diffs = webutil.diffs(web.repo, tmpl, fctx or ctx, [path], parity, style) + diffs = webutil.diffs(web.repo, tmpl, ctx, [path], parity, style) rename = fctx and webutil.renamelink(fctx) or [] ctx = fctx and fctx or ctx return tmpl("filediff",