Skip to content
Snippets Groups Projects
Commit 22005819 authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

hgweb: don't use dict(key=value) to build a mapping dict in filelog

It wasn't Py3 compatible because mapping keys must be bytes.
parent d32f0706
No related branches found
No related tags found
No related merge requests found
......@@ -1090,13 +1090,15 @@
diffs = diff(c, linerange=lr)
# follow renames accross filtered (not in range) revisions
path = c.path()
entries.append(dict(
parity=next(parity),
filerev=c.rev(),
file=path,
diff=diffs,
linerange=webutil.formatlinerange(*lr),
**pycompat.strkwargs(webutil.commonentry(repo, c))))
lm = webutil.commonentry(repo, c)
lm.update({
'parity': next(parity),
'filerev': c.rev(),
'file': path,
'diff': diffs,
'linerange': webutil.formatlinerange(*lr),
})
entries.append(lm)
if i == revcount:
break
lessvars['linerange'] = webutil.formatlinerange(*lrange)
......@@ -1107,13 +1109,15 @@
diffs = None
if patch:
diffs = diff(iterfctx)
entries.append(dict(
parity=next(parity),
filerev=i,
file=f,
diff=diffs,
rename=webutil.renamelink(iterfctx),
**pycompat.strkwargs(webutil.commonentry(repo, iterfctx))))
lm = webutil.commonentry(repo, iterfctx)
lm.update({
'parity': next(parity),
'filerev': i,
'file': f,
'diff': diffs,
'rename': webutil.renamelink(iterfctx),
})
entries.append(lm)
entries.reverse()
revnav = webutil.filerevnav(web.repo, fctx.path())
nav = revnav.gen(end - 1, revcount, count)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment