##// END OF EJS Templates
json: implement {comparison} template...
Gregory Szorc -
r24714:84859415 default
parent child Browse files
Show More
@@ -112,7 +112,28 b" diffline = '\\{"
112 "n": {lineno|json},
112 "n": {lineno|json},
113 "l": {line|json}
113 "l": {line|json}
114 }'
114 }'
115 filecomparison = '"not yet implemented"'
115 filecomparison = '\{
116 "path": {file|json},
117 "node": {node|json},
118 "date": {date|json},
119 "desc": {desc|json},
120 "author": {author|json},
121 "parents": [{join(parent%changesetparent, ", ")}],
122 "children": [{join(child%changesetparent, ", ")}],
123 "leftnode": {leftnode|json},
124 "rightnode": {rightnode|json},
125 "comparison": [{join(comparison, ", ")}]
126 }'
127 comparisonblock = '\{
128 "lines": [{join(lines, ", ")}]
129 }'
130 comparisonline = '\{
131 "t": {type|json},
132 "ln": {leftlineno|json},
133 "ll": {leftline|json},
134 "rn": {rightlineno|json},
135 "rl": {rightline|json}
136 }'
116 fileannotate = '"not yet implemented"'
137 fileannotate = '"not yet implemented"'
117 filelog = '"not yet implemented"'
138 filelog = '"not yet implemented"'
118 graph = '"not yet implemented"'
139 graph = '"not yet implemented"'
@@ -730,7 +730,35 b' comparison/{revision}/{path} shows infor'
730 $ request json-comparison/f8bbb9024b10/foo
730 $ request json-comparison/f8bbb9024b10/foo
731 200 Script output follows
731 200 Script output follows
732
732
733 "not yet implemented"
733 {
734 "author": "test",
735 "children": [],
736 "comparison": [
737 {
738 "lines": [
739 {
740 "ll": "foo",
741 "ln": 1,
742 "rl": "bar",
743 "rn": 1,
744 "t": "replace"
745 }
746 ]
747 }
748 ],
749 "date": [
750 0.0,
751 0
752 ],
753 "desc": "modify foo",
754 "leftnode": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e",
755 "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
756 "parents": [
757 "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
758 ],
759 "path": "foo",
760 "rightnode": "f8bbb9024b10f93cdbb8d940337398291d40dea8"
761 }
734
762
735 annotate/{revision}/{path} shows annotations for each line
763 annotate/{revision}/{path} shows annotations for each line
736
764
General Comments 0
You need to be logged in to leave comments. Login now