diff -r 84859415a4c9 -r 1439bacf0ec7 mercurial/templates/json/map
--- a/mercurial/templates/json/map	Fri Apr 10 22:26:53 2015 -0400
+++ b/mercurial/templates/json/map	Fri Apr 10 22:37:40 2015 -0400
@@ -134,7 +134,27 @@
   "rn": {rightlineno|json},
   "rl": {rightline|json}
   }'
-fileannotate = '"not yet implemented"'
+fileannotate = '\{
+  "abspath": {file|json},
+  "node": {node|json},
+  "author": {author|json},
+  "date": {date|json},
+  "desc": {desc|json},
+  "parents": [{join(parent%changesetparent, ", ")}],
+  "children": [{join(child%changesetparent, ", ")}],
+  "permissions": {permissions|json},
+  "annotate": [{join(annotate%fileannotation, ", ")}]
+  }'
+fileannotation = '\{
+  "node": {node|json},
+  "author": {author|json},
+  "desc": {desc|json},
+  "abspath": {file|json},
+  "targetline": {targetline|json},
+  "line": {line|json},
+  "lineno": {lineno|json},
+  "revdate": {revdate|json}
+  }'
 filelog = '"not yet implemented"'
 graph = '"not yet implemented"'
 helptopics = '\{