--- a/mercurial/templates/json/map Fri Apr 10 22:39:22 2015 -0400
+++ b/mercurial/templates/json/map Fri Apr 10 22:26:53 2015 -0400
@@ -112,7 +112,28 @@
"n": {lineno|json},
"l": {line|json}
}'
-filecomparison = '"not yet implemented"'
+filecomparison = '\{
+ "path": {file|json},
+ "node": {node|json},
+ "date": {date|json},
+ "desc": {desc|json},
+ "author": {author|json},
+ "parents": [{join(parent%changesetparent, ", ")}],
+ "children": [{join(child%changesetparent, ", ")}],
+ "leftnode": {leftnode|json},
+ "rightnode": {rightnode|json},
+ "comparison": [{join(comparison, ", ")}]
+ }'
+comparisonblock = '\{
+ "lines": [{join(lines, ", ")}]
+ }'
+comparisonline = '\{
+ "t": {type|json},
+ "ln": {leftlineno|json},
+ "ll": {leftline|json},
+ "rn": {rightlineno|json},
+ "rl": {rightline|json}
+ }'
fileannotate = '"not yet implemented"'
filelog = '"not yet implemented"'
graph = '"not yet implemented"'