##// END OF EJS Templates
json: implement {filediff} template...
Gregory Szorc -
r24713:2f43f8cf default
parent child Browse files
Show More
@@ -78,7 +78,40 b" branchentry = '\\{"
78 "status": {status|json}
78 "status": {status|json}
79 }'
79 }'
80 summary = '"not yet implemented"'
80 summary = '"not yet implemented"'
81 filediff = '"not yet implemented"'
81 filediff = '\{
82 "path": {file|json},
83 "node": {node|json},
84 "date": {date|json},
85 "desc": {desc|json},
86 "author": {author|json},
87 "parents": [{join(parent%changesetparent, ", ")}],
88 "children": [{join(child%changesetparent, ", ")}],
89 "diff": [{join(diff%diffblock, ", ")}]
90 }'
91 diffblock = '\{
92 "blockno": {blockno|json},
93 "lines": [{join(lines, ", ")}]
94 }'
95 difflineplus = '\{
96 "t": "+",
97 "n": {lineno|json},
98 "l": {line|json}
99 }'
100 difflineminus = '\{
101 "t": "-",
102 "n": {lineno|json},
103 "l": {line|json}
104 }'
105 difflineat = '\{
106 "t": "@",
107 "n": {lineno|json},
108 "l": {line|json}
109 }'
110 diffline = '\{
111 "t": "",
112 "n": {lineno|json},
113 "l": {line|json}
114 }'
82 filecomparison = '"not yet implemented"'
115 filecomparison = '"not yet implemented"'
83 fileannotate = '"not yet implemented"'
116 fileannotate = '"not yet implemented"'
84 filelog = '"not yet implemented"'
117 filelog = '"not yet implemented"'
@@ -678,7 +678,52 b' filediff/{revision}/{path} shows changes'
678 $ request json-diff/f8bbb9024b10/foo
678 $ request json-diff/f8bbb9024b10/foo
679 200 Script output follows
679 200 Script output follows
680
680
681 "not yet implemented"
681 {
682 "author": "test",
683 "children": [],
684 "date": [
685 0.0,
686 0
687 ],
688 "desc": "modify foo",
689 "diff": [
690 {
691 "blockno": 1,
692 "lines": [
693 {
694 "l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n",
695 "n": 1,
696 "t": "-"
697 },
698 {
699 "l": "+++ b/foo\tThu Jan 01 00:00:00 1970 +0000\n",
700 "n": 2,
701 "t": "+"
702 },
703 {
704 "l": "@@ -1,1 +1,1 @@\n",
705 "n": 3,
706 "t": "@"
707 },
708 {
709 "l": "-foo\n",
710 "n": 4,
711 "t": "-"
712 },
713 {
714 "l": "+bar\n",
715 "n": 5,
716 "t": "+"
717 }
718 ]
719 }
720 ],
721 "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8",
722 "parents": [
723 "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e"
724 ],
725 "path": "foo"
726 }
682
727
683 comparison/{revision}/{path} shows information about before and after for a file
728 comparison/{revision}/{path} shows information about before and after for a file
684
729
General Comments 0
You need to be logged in to leave comments. Login now