Show More
@@ -1,241 +1,243 | |||||
|
1 | default = 'shortlog' | |||
1 | mimetype = 'application/json' |
|
2 | mimetype = 'application/json' | |
|
3 | ||||
2 | filerevision = '\{ |
|
4 | filerevision = '\{ | |
3 | "node": {node|json}, |
|
5 | "node": {node|json}, | |
4 | "path": {file|json}, |
|
6 | "path": {file|json}, | |
5 | "date": {date|json}, |
|
7 | "date": {date|json}, | |
6 | "desc": {desc|utf8|json}, |
|
8 | "desc": {desc|utf8|json}, | |
7 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, |
|
9 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, | |
8 | "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], |
|
10 | "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], | |
9 | "tags": [{join(tags%changelistentryname, ", ")}], |
|
11 | "tags": [{join(tags%changelistentryname, ", ")}], | |
10 | "user": {author|utf8|json}, |
|
12 | "user": {author|utf8|json}, | |
11 | "parents": [{join(parent%changesetparent, ", ")}], |
|
13 | "parents": [{join(parent%changesetparent, ", ")}], | |
12 | "phase": {phase|json}, |
|
14 | "phase": {phase|json}, | |
13 | "lines": [{join(text%lineentry, ", ")}] |
|
15 | "lines": [{join(text%lineentry, ", ")}] | |
14 | }' |
|
16 | }' | |
15 | lineentry = '\{ |
|
17 | lineentry = '\{ | |
16 | "line": {line|json} |
|
18 | "line": {line|json} | |
17 | }' |
|
19 | }' | |
18 | search = '\{ |
|
20 | search = '\{ | |
19 | "node": {node|json}, |
|
21 | "node": {node|json}, | |
20 | "query": {query|json}, |
|
22 | "query": {query|json}, | |
21 | "entries": [{join(entries%changelistentry, ", ")}] |
|
23 | "entries": [{join(entries%changelistentry, ", ")}] | |
22 | }' |
|
24 | }' | |
23 | # changelog and shortlog are the same web API but with different |
|
25 | # changelog and shortlog are the same web API but with different | |
24 | # number of entries. |
|
26 | # number of entries. | |
25 | changelog = changelist.tmpl |
|
27 | changelog = changelist.tmpl | |
26 | shortlog = changelist.tmpl |
|
28 | shortlog = changelist.tmpl | |
27 | graph = graph.tmpl |
|
29 | graph = graph.tmpl | |
28 | changelistentry = '\{ |
|
30 | changelistentry = '\{ | |
29 | "node": {node|json}, |
|
31 | "node": {node|json}, | |
30 | "date": {date|json}, |
|
32 | "date": {date|json}, | |
31 | "desc": {desc|utf8|json}, |
|
33 | "desc": {desc|utf8|json}, | |
32 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, |
|
34 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, | |
33 | "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], |
|
35 | "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], | |
34 | "tags": [{join(tags%changelistentryname, ", ")}], |
|
36 | "tags": [{join(tags%changelistentryname, ", ")}], | |
35 | "user": {author|utf8|json}, |
|
37 | "user": {author|utf8|json}, | |
36 | "phase": {phase|json}, |
|
38 | "phase": {phase|json}, | |
37 | "parents": [{if(allparents, join(allparents%changesetparent, ", "), |
|
39 | "parents": [{if(allparents, join(allparents%changesetparent, ", "), | |
38 | join(parent%changesetparent, ", "))}] |
|
40 | join(parent%changesetparent, ", "))}] | |
39 | }' |
|
41 | }' | |
40 | graphentry = '\{ |
|
42 | graphentry = '\{ | |
41 | "node": {node|json}, |
|
43 | "node": {node|json}, | |
42 | "date": {date|json}, |
|
44 | "date": {date|json}, | |
43 | "desc": {desc|utf8|json}, |
|
45 | "desc": {desc|utf8|json}, | |
44 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, |
|
46 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, | |
45 | "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], |
|
47 | "bookmarks": [{join(bookmarks%changelistentryname, ", ")}], | |
46 | "tags": [{join(tags%changelistentryname, ", ")}], |
|
48 | "tags": [{join(tags%changelistentryname, ", ")}], | |
47 | "user": {author|utf8|json}, |
|
49 | "user": {author|utf8|json}, | |
48 | "phase": {phase|json}, |
|
50 | "phase": {phase|json}, | |
49 | "col": {col|json}, |
|
51 | "col": {col|json}, | |
50 | "row": {row|json}, |
|
52 | "row": {row|json}, | |
51 | "color": {color|json}, |
|
53 | "color": {color|json}, | |
52 | "edges": {edges|json}, |
|
54 | "edges": {edges|json}, | |
53 | "parents": [{if(allparents, join(allparents%changesetparent, ", "), |
|
55 | "parents": [{if(allparents, join(allparents%changesetparent, ", "), | |
54 | join(parent%changesetparent, ", "))}] |
|
56 | join(parent%changesetparent, ", "))}] | |
55 | }' |
|
57 | }' | |
56 | changelistentryname = '{name|utf8|json}' |
|
58 | changelistentryname = '{name|utf8|json}' | |
57 | changeset = '\{ |
|
59 | changeset = '\{ | |
58 | "node": {node|json}, |
|
60 | "node": {node|json}, | |
59 | "date": {date|json}, |
|
61 | "date": {date|json}, | |
60 | "desc": {desc|utf8|json}, |
|
62 | "desc": {desc|utf8|json}, | |
61 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, |
|
63 | "branch": {if(branch, branch%changesetbranch, "default"|json)}, | |
62 | "bookmarks": [{join(changesetbookmark, ", ")}], |
|
64 | "bookmarks": [{join(changesetbookmark, ", ")}], | |
63 | "tags": [{join(changesettag, ", ")}], |
|
65 | "tags": [{join(changesettag, ", ")}], | |
64 | "user": {author|utf8|json}, |
|
66 | "user": {author|utf8|json}, | |
65 | "parents": [{join(parent%changesetparent, ", ")}], |
|
67 | "parents": [{join(parent%changesetparent, ", ")}], | |
66 | "phase": {phase|json} |
|
68 | "phase": {phase|json} | |
67 | }' |
|
69 | }' | |
68 | changesetbranch = '{name|utf8|json}' |
|
70 | changesetbranch = '{name|utf8|json}' | |
69 | changesetbookmark = '{bookmark|utf8|json}' |
|
71 | changesetbookmark = '{bookmark|utf8|json}' | |
70 | changesettag = '{tag|utf8|json}' |
|
72 | changesettag = '{tag|utf8|json}' | |
71 | changesetparent = '{node|json}' |
|
73 | changesetparent = '{node|json}' | |
72 | manifest = '\{ |
|
74 | manifest = '\{ | |
73 | "node": {node|json}, |
|
75 | "node": {node|json}, | |
74 | "abspath": {path|json}, |
|
76 | "abspath": {path|json}, | |
75 | "directories": [{join(dentries%direntry, ", ")}], |
|
77 | "directories": [{join(dentries%direntry, ", ")}], | |
76 | "files": [{join(fentries%fileentry, ", ")}], |
|
78 | "files": [{join(fentries%fileentry, ", ")}], | |
77 | "bookmarks": [{join(bookmarks%name, ", ")}], |
|
79 | "bookmarks": [{join(bookmarks%name, ", ")}], | |
78 | "tags": [{join(tags%name, ", ")}] |
|
80 | "tags": [{join(tags%name, ", ")}] | |
79 | }' |
|
81 | }' | |
80 | name = '{name|utf8|json}' |
|
82 | name = '{name|utf8|json}' | |
81 | direntry = '\{ |
|
83 | direntry = '\{ | |
82 | "abspath": {path|json}, |
|
84 | "abspath": {path|json}, | |
83 | "basename": {basename|json}, |
|
85 | "basename": {basename|json}, | |
84 | "emptydirs": {emptydirs|json} |
|
86 | "emptydirs": {emptydirs|json} | |
85 | }' |
|
87 | }' | |
86 | fileentry = '\{ |
|
88 | fileentry = '\{ | |
87 | "abspath": {file|json}, |
|
89 | "abspath": {file|json}, | |
88 | "basename": {basename|json}, |
|
90 | "basename": {basename|json}, | |
89 | "date": {date|json}, |
|
91 | "date": {date|json}, | |
90 | "size": {size|json}, |
|
92 | "size": {size|json}, | |
91 | "flags": {permissions|json} |
|
93 | "flags": {permissions|json} | |
92 | }' |
|
94 | }' | |
93 | tags = '\{ |
|
95 | tags = '\{ | |
94 | "node": {node|json}, |
|
96 | "node": {node|json}, | |
95 | "tags": [{join(entriesnotip%tagentry, ", ")}] |
|
97 | "tags": [{join(entriesnotip%tagentry, ", ")}] | |
96 | }' |
|
98 | }' | |
97 | tagentry = '\{ |
|
99 | tagentry = '\{ | |
98 | "tag": {tag|utf8|json}, |
|
100 | "tag": {tag|utf8|json}, | |
99 | "node": {node|json}, |
|
101 | "node": {node|json}, | |
100 | "date": {date|json} |
|
102 | "date": {date|json} | |
101 | }' |
|
103 | }' | |
102 | bookmarks = '\{ |
|
104 | bookmarks = '\{ | |
103 | "node": {node|json}, |
|
105 | "node": {node|json}, | |
104 | "bookmarks": [{join(entries%bookmarkentry, ", ")}] |
|
106 | "bookmarks": [{join(entries%bookmarkentry, ", ")}] | |
105 | }' |
|
107 | }' | |
106 | bookmarkentry = '\{ |
|
108 | bookmarkentry = '\{ | |
107 | "bookmark": {bookmark|utf8|json}, |
|
109 | "bookmark": {bookmark|utf8|json}, | |
108 | "node": {node|json}, |
|
110 | "node": {node|json}, | |
109 | "date": {date|json} |
|
111 | "date": {date|json} | |
110 | }' |
|
112 | }' | |
111 | branches = '\{ |
|
113 | branches = '\{ | |
112 | "branches": [{join(entries%branchentry, ", ")}] |
|
114 | "branches": [{join(entries%branchentry, ", ")}] | |
113 | }' |
|
115 | }' | |
114 | branchentry = '\{ |
|
116 | branchentry = '\{ | |
115 | "branch": {branch|utf8|json}, |
|
117 | "branch": {branch|utf8|json}, | |
116 | "node": {node|json}, |
|
118 | "node": {node|json}, | |
117 | "date": {date|json}, |
|
119 | "date": {date|json}, | |
118 | "status": {status|json} |
|
120 | "status": {status|json} | |
119 | }' |
|
121 | }' | |
120 | shortlogentry = '{changelistentry}' |
|
122 | shortlogentry = '{changelistentry}' | |
121 | summary = '\{ |
|
123 | summary = '\{ | |
122 | "node": {node|json}, |
|
124 | "node": {node|json}, | |
123 | "lastchange": {lastchange|json}, |
|
125 | "lastchange": {lastchange|json}, | |
124 | "bookmarks": [{join(bookmarks%bookmarkentry, ", ")}], |
|
126 | "bookmarks": [{join(bookmarks%bookmarkentry, ", ")}], | |
125 | "branches": [{join(branches%branchentry, ", ")}], |
|
127 | "branches": [{join(branches%branchentry, ", ")}], | |
126 | "shortlog": [{join(shortlog%shortlogentry, ", ")}], |
|
128 | "shortlog": [{join(shortlog%shortlogentry, ", ")}], | |
127 | "tags": [{join(tags%tagentry, ", ")}], |
|
129 | "tags": [{join(tags%tagentry, ", ")}], | |
128 | "archives": [{join(archives%archiveentry, ", ")}], |
|
130 | "archives": [{join(archives%archiveentry, ", ")}], | |
129 | "labels": {labels|json} |
|
131 | "labels": {labels|json} | |
130 | }' |
|
132 | }' | |
131 | archiveentry = '\{ |
|
133 | archiveentry = '\{ | |
132 | "node": {node|json}, |
|
134 | "node": {node|json}, | |
133 | "extension": {extension|json}, |
|
135 | "extension": {extension|json}, | |
134 | "type": {type|json}, |
|
136 | "type": {type|json}, | |
135 | "url": {"{urlbase}{url}archive/{node}{extension}"|json} |
|
137 | "url": {"{urlbase}{url}archive/{node}{extension}"|json} | |
136 | }' |
|
138 | }' | |
137 | filediff = '\{ |
|
139 | filediff = '\{ | |
138 | "path": {file|json}, |
|
140 | "path": {file|json}, | |
139 | "node": {node|json}, |
|
141 | "node": {node|json}, | |
140 | "date": {date|json}, |
|
142 | "date": {date|json}, | |
141 | "desc": {desc|utf8|json}, |
|
143 | "desc": {desc|utf8|json}, | |
142 | "author": {author|utf8|json}, |
|
144 | "author": {author|utf8|json}, | |
143 | "parents": [{join(parent%changesetparent, ", ")}], |
|
145 | "parents": [{join(parent%changesetparent, ", ")}], | |
144 | "children": [{join(child%changesetparent, ", ")}], |
|
146 | "children": [{join(child%changesetparent, ", ")}], | |
145 | "diff": [{join(diff, ", ")}] |
|
147 | "diff": [{join(diff, ", ")}] | |
146 | }' |
|
148 | }' | |
147 | diffblock = '\{ |
|
149 | diffblock = '\{ | |
148 | "blockno": {blockno|json}, |
|
150 | "blockno": {blockno|json}, | |
149 | "lines": [{join(lines, ", ")}] |
|
151 | "lines": [{join(lines, ", ")}] | |
150 | }' |
|
152 | }' | |
151 | difflineplus = '\{ |
|
153 | difflineplus = '\{ | |
152 | "t": "+", |
|
154 | "t": "+", | |
153 | "n": {lineno|json}, |
|
155 | "n": {lineno|json}, | |
154 | "l": {line|json} |
|
156 | "l": {line|json} | |
155 | }' |
|
157 | }' | |
156 | difflineminus = '\{ |
|
158 | difflineminus = '\{ | |
157 | "t": "-", |
|
159 | "t": "-", | |
158 | "n": {lineno|json}, |
|
160 | "n": {lineno|json}, | |
159 | "l": {line|json} |
|
161 | "l": {line|json} | |
160 | }' |
|
162 | }' | |
161 | difflineat = '\{ |
|
163 | difflineat = '\{ | |
162 | "t": "@", |
|
164 | "t": "@", | |
163 | "n": {lineno|json}, |
|
165 | "n": {lineno|json}, | |
164 | "l": {line|json} |
|
166 | "l": {line|json} | |
165 | }' |
|
167 | }' | |
166 | diffline = '\{ |
|
168 | diffline = '\{ | |
167 | "t": "", |
|
169 | "t": "", | |
168 | "n": {lineno|json}, |
|
170 | "n": {lineno|json}, | |
169 | "l": {line|json} |
|
171 | "l": {line|json} | |
170 | }' |
|
172 | }' | |
171 | filecomparison = '\{ |
|
173 | filecomparison = '\{ | |
172 | "path": {file|json}, |
|
174 | "path": {file|json}, | |
173 | "node": {node|json}, |
|
175 | "node": {node|json}, | |
174 | "date": {date|json}, |
|
176 | "date": {date|json}, | |
175 | "desc": {desc|utf8|json}, |
|
177 | "desc": {desc|utf8|json}, | |
176 | "author": {author|utf8|json}, |
|
178 | "author": {author|utf8|json}, | |
177 | "parents": [{join(parent%changesetparent, ", ")}], |
|
179 | "parents": [{join(parent%changesetparent, ", ")}], | |
178 | "children": [{join(child%changesetparent, ", ")}], |
|
180 | "children": [{join(child%changesetparent, ", ")}], | |
179 | "leftnode": {leftnode|json}, |
|
181 | "leftnode": {leftnode|json}, | |
180 | "rightnode": {rightnode|json}, |
|
182 | "rightnode": {rightnode|json}, | |
181 | "comparison": [{join(comparison, ", ")}] |
|
183 | "comparison": [{join(comparison, ", ")}] | |
182 | }' |
|
184 | }' | |
183 | comparisonblock = '\{ |
|
185 | comparisonblock = '\{ | |
184 | "lines": [{join(lines, ", ")}] |
|
186 | "lines": [{join(lines, ", ")}] | |
185 | }' |
|
187 | }' | |
186 | comparisonline = '\{ |
|
188 | comparisonline = '\{ | |
187 | "t": {type|json}, |
|
189 | "t": {type|json}, | |
188 | "ln": {leftlineno|json}, |
|
190 | "ln": {leftlineno|json}, | |
189 | "ll": {leftline|json}, |
|
191 | "ll": {leftline|json}, | |
190 | "rn": {rightlineno|json}, |
|
192 | "rn": {rightlineno|json}, | |
191 | "rl": {rightline|json} |
|
193 | "rl": {rightline|json} | |
192 | }' |
|
194 | }' | |
193 | fileannotate = '\{ |
|
195 | fileannotate = '\{ | |
194 | "abspath": {file|json}, |
|
196 | "abspath": {file|json}, | |
195 | "node": {node|json}, |
|
197 | "node": {node|json}, | |
196 | "author": {author|utf8|json}, |
|
198 | "author": {author|utf8|json}, | |
197 | "date": {date|json}, |
|
199 | "date": {date|json}, | |
198 | "desc": {desc|utf8|json}, |
|
200 | "desc": {desc|utf8|json}, | |
199 | "parents": [{join(parent%changesetparent, ", ")}], |
|
201 | "parents": [{join(parent%changesetparent, ", ")}], | |
200 | "children": [{join(child%changesetparent, ", ")}], |
|
202 | "children": [{join(child%changesetparent, ", ")}], | |
201 | "permissions": {permissions|json}, |
|
203 | "permissions": {permissions|json}, | |
202 | "annotate": [{join(annotate%fileannotation, ", ")}] |
|
204 | "annotate": [{join(annotate%fileannotation, ", ")}] | |
203 | }' |
|
205 | }' | |
204 | fileannotation = '\{ |
|
206 | fileannotation = '\{ | |
205 | "node": {node|json}, |
|
207 | "node": {node|json}, | |
206 | "author": {author|utf8|json}, |
|
208 | "author": {author|utf8|json}, | |
207 | "desc": {desc|utf8|json}, |
|
209 | "desc": {desc|utf8|json}, | |
208 | "abspath": {file|json}, |
|
210 | "abspath": {file|json}, | |
209 | "targetline": {targetline|json}, |
|
211 | "targetline": {targetline|json}, | |
210 | "line": {line|json}, |
|
212 | "line": {line|json}, | |
211 | "lineno": {lineno|json}, |
|
213 | "lineno": {lineno|json}, | |
212 | "revdate": {revdate|json} |
|
214 | "revdate": {revdate|json} | |
213 | }' |
|
215 | }' | |
214 | filelog = '\{ |
|
216 | filelog = '\{ | |
215 | "entries": [{join(entries%changelistentry, ", ")}] |
|
217 | "entries": [{join(entries%changelistentry, ", ")}] | |
216 | }' |
|
218 | }' | |
217 | helptopics = '\{ |
|
219 | helptopics = '\{ | |
218 | "topics": [{join(topics%helptopicentry, ", ")}], |
|
220 | "topics": [{join(topics%helptopicentry, ", ")}], | |
219 | "earlycommands": [{join(earlycommands%helptopicentry, ", ")}], |
|
221 | "earlycommands": [{join(earlycommands%helptopicentry, ", ")}], | |
220 | "othercommands": [{join(othercommands%helptopicentry, ", ")}] |
|
222 | "othercommands": [{join(othercommands%helptopicentry, ", ")}] | |
221 | }' |
|
223 | }' | |
222 | helptopicentry = '\{ |
|
224 | helptopicentry = '\{ | |
223 | "topic": {topic|utf8|json}, |
|
225 | "topic": {topic|utf8|json}, | |
224 | "summary": {summary|utf8|json} |
|
226 | "summary": {summary|utf8|json} | |
225 | }' |
|
227 | }' | |
226 | help = '\{ |
|
228 | help = '\{ | |
227 | "topic": {topic|utf8|json}, |
|
229 | "topic": {topic|utf8|json}, | |
228 | "rawdoc": {doc|utf8|json} |
|
230 | "rawdoc": {doc|utf8|json} | |
229 | }' |
|
231 | }' | |
230 | filenodelink = '' |
|
232 | filenodelink = '' | |
231 | filenolink = '' |
|
233 | filenolink = '' | |
232 | index = '\{ |
|
234 | index = '\{ | |
233 | "entries": [{join(entries%indexentry, ", ")}] |
|
235 | "entries": [{join(entries%indexentry, ", ")}] | |
234 | }' |
|
236 | }' | |
235 | indexentry = '\{ |
|
237 | indexentry = '\{ | |
236 | "name": {name|utf8|json}, |
|
238 | "name": {name|utf8|json}, | |
237 | "description": {description|utf8|json}, |
|
239 | "description": {description|utf8|json}, | |
238 | "contact": {contact|utf8|json}, |
|
240 | "contact": {contact|utf8|json}, | |
239 | "lastchange": {lastchange|json}, |
|
241 | "lastchange": {lastchange|json}, | |
240 | "labels": {labels|json} |
|
242 | "labels": {labels|json} | |
241 | }' |
|
243 | }' |
@@ -1,2028 +1,2209 | |||||
1 | #require serve |
|
1 | #require serve | |
2 |
|
2 | |||
3 | $ request() { |
|
3 | $ request() { | |
4 | > get-with-headers.py --json localhost:$HGPORT "$1" |
|
4 | > get-with-headers.py --json localhost:$HGPORT "$1" | |
5 | > } |
|
5 | > } | |
6 |
|
6 | |||
7 | $ hg init test |
|
7 | $ hg init test | |
8 | $ cd test |
|
8 | $ cd test | |
9 | $ mkdir da |
|
9 | $ mkdir da | |
10 | $ echo foo > da/foo |
|
10 | $ echo foo > da/foo | |
11 | $ echo foo > foo |
|
11 | $ echo foo > foo | |
12 | $ hg -q ci -A -m initial |
|
12 | $ hg -q ci -A -m initial | |
13 | $ echo bar > foo |
|
13 | $ echo bar > foo | |
14 | $ hg ci -m 'modify foo' |
|
14 | $ hg ci -m 'modify foo' | |
15 | $ echo bar > da/foo |
|
15 | $ echo bar > da/foo | |
16 | $ hg ci -m 'modify da/foo' |
|
16 | $ hg ci -m 'modify da/foo' | |
17 | $ hg bookmark bookmark1 |
|
17 | $ hg bookmark bookmark1 | |
18 | $ hg up default |
|
18 | $ hg up default | |
19 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
20 | (leaving bookmark bookmark1) |
|
20 | (leaving bookmark bookmark1) | |
21 | $ hg mv foo foo-new |
|
21 | $ hg mv foo foo-new | |
22 | $ hg commit -m 'move foo' |
|
22 | $ hg commit -m 'move foo' | |
23 | $ hg tag -m 'create tag' tag1 |
|
23 | $ hg tag -m 'create tag' tag1 | |
24 | $ hg phase --public -r . |
|
24 | $ hg phase --public -r . | |
25 | $ echo baz > da/foo |
|
25 | $ echo baz > da/foo | |
26 | $ hg commit -m 'another commit to da/foo' |
|
26 | $ hg commit -m 'another commit to da/foo' | |
27 | $ hg tag -m 'create tag2' tag2 |
|
27 | $ hg tag -m 'create tag2' tag2 | |
28 | $ hg bookmark bookmark2 |
|
28 | $ hg bookmark bookmark2 | |
29 | $ hg -q up -r 0 |
|
29 | $ hg -q up -r 0 | |
30 | $ hg -q branch test-branch |
|
30 | $ hg -q branch test-branch | |
31 | $ echo branch > foo |
|
31 | $ echo branch > foo | |
32 | $ hg commit -m 'create test branch' |
|
32 | $ hg commit -m 'create test branch' | |
33 | $ echo branch_commit_2 > foo |
|
33 | $ echo branch_commit_2 > foo | |
34 | $ hg commit -m 'another commit in test-branch' |
|
34 | $ hg commit -m 'another commit in test-branch' | |
35 | $ hg -q up default |
|
35 | $ hg -q up default | |
36 | $ hg merge --tool :local test-branch |
|
36 | $ hg merge --tool :local test-branch | |
37 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
37 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
38 | (branch merge, don't forget to commit) |
|
38 | (branch merge, don't forget to commit) | |
39 | $ hg commit -m 'merge test-branch into default' |
|
39 | $ hg commit -m 'merge test-branch into default' | |
40 |
|
40 | |||
41 | $ hg log -G |
|
41 | $ hg log -G | |
42 | @ changeset: 9:cc725e08502a |
|
42 | @ changeset: 9:cc725e08502a | |
43 | |\ tag: tip |
|
43 | |\ tag: tip | |
44 | | | parent: 6:ceed296fe500 |
|
44 | | | parent: 6:ceed296fe500 | |
45 | | | parent: 8:ed66c30e87eb |
|
45 | | | parent: 8:ed66c30e87eb | |
46 | | | user: test |
|
46 | | | user: test | |
47 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
47 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
48 | | | summary: merge test-branch into default |
|
48 | | | summary: merge test-branch into default | |
49 | | | |
|
49 | | | | |
50 | | o changeset: 8:ed66c30e87eb |
|
50 | | o changeset: 8:ed66c30e87eb | |
51 | | | branch: test-branch |
|
51 | | | branch: test-branch | |
52 | | | user: test |
|
52 | | | user: test | |
53 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
53 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
54 | | | summary: another commit in test-branch |
|
54 | | | summary: another commit in test-branch | |
55 | | | |
|
55 | | | | |
56 | | o changeset: 7:6ab967a8ab34 |
|
56 | | o changeset: 7:6ab967a8ab34 | |
57 | | | branch: test-branch |
|
57 | | | branch: test-branch | |
58 | | | parent: 0:06e557f3edf6 |
|
58 | | | parent: 0:06e557f3edf6 | |
59 | | | user: test |
|
59 | | | user: test | |
60 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
60 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
61 | | | summary: create test branch |
|
61 | | | summary: create test branch | |
62 | | | |
|
62 | | | | |
63 | o | changeset: 6:ceed296fe500 |
|
63 | o | changeset: 6:ceed296fe500 | |
64 | | | bookmark: bookmark2 |
|
64 | | | bookmark: bookmark2 | |
65 | | | user: test |
|
65 | | | user: test | |
66 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
66 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
67 | | | summary: create tag2 |
|
67 | | | summary: create tag2 | |
68 | | | |
|
68 | | | | |
69 | o | changeset: 5:f2890a05fea4 |
|
69 | o | changeset: 5:f2890a05fea4 | |
70 | | | tag: tag2 |
|
70 | | | tag: tag2 | |
71 | | | user: test |
|
71 | | | user: test | |
72 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
72 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
73 | | | summary: another commit to da/foo |
|
73 | | | summary: another commit to da/foo | |
74 | | | |
|
74 | | | | |
75 | o | changeset: 4:93a8ce14f891 |
|
75 | o | changeset: 4:93a8ce14f891 | |
76 | | | user: test |
|
76 | | | user: test | |
77 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
77 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
78 | | | summary: create tag |
|
78 | | | summary: create tag | |
79 | | | |
|
79 | | | | |
80 | o | changeset: 3:78896eb0e102 |
|
80 | o | changeset: 3:78896eb0e102 | |
81 | | | tag: tag1 |
|
81 | | | tag: tag1 | |
82 | | | user: test |
|
82 | | | user: test | |
83 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
83 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
84 | | | summary: move foo |
|
84 | | | summary: move foo | |
85 | | | |
|
85 | | | | |
86 | o | changeset: 2:8d7c456572ac |
|
86 | o | changeset: 2:8d7c456572ac | |
87 | | | bookmark: bookmark1 |
|
87 | | | bookmark: bookmark1 | |
88 | | | user: test |
|
88 | | | user: test | |
89 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
89 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
90 | | | summary: modify da/foo |
|
90 | | | summary: modify da/foo | |
91 | | | |
|
91 | | | | |
92 | o | changeset: 1:f8bbb9024b10 |
|
92 | o | changeset: 1:f8bbb9024b10 | |
93 | |/ user: test |
|
93 | |/ user: test | |
94 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
94 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
95 | | summary: modify foo |
|
95 | | summary: modify foo | |
96 | | |
|
96 | | | |
97 | o changeset: 0:06e557f3edf6 |
|
97 | o changeset: 0:06e557f3edf6 | |
98 | user: test |
|
98 | user: test | |
99 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
99 | date: Thu Jan 01 00:00:00 1970 +0000 | |
100 | summary: initial |
|
100 | summary: initial | |
101 |
|
101 | |||
102 |
|
102 | |||
103 | $ echo '[web]' >> .hg/hgrc |
|
103 | $ echo '[web]' >> .hg/hgrc | |
104 | $ echo 'allow-archive = bz2' >> .hg/hgrc |
|
104 | $ echo 'allow-archive = bz2' >> .hg/hgrc | |
105 | $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log |
|
105 | $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log | |
106 | $ cat hg.pid >> $DAEMON_PIDS |
|
106 | $ cat hg.pid >> $DAEMON_PIDS | |
107 |
|
107 | |||
108 | (Try to keep these in roughly the order they are defined in webcommands.py) |
|
108 | (Try to keep these in roughly the order they are defined in webcommands.py) | |
109 |
|
109 | |||
110 | (log is handled by filelog/ and changelog/ - ignore it) |
|
110 | (log is handled by filelog/ and changelog/ - ignore it) | |
111 |
|
111 | |||
112 | (rawfile/ doesn't use templating - nothing to test) |
|
112 | (rawfile/ doesn't use templating - nothing to test) | |
113 |
|
113 | |||
114 | file/{revision}/{path} shows file revision |
|
114 | file/{revision}/{path} shows file revision | |
115 |
|
115 | |||
116 | $ request json-file/78896eb0e102/foo-new |
|
116 | $ request json-file/78896eb0e102/foo-new | |
117 | 200 Script output follows |
|
117 | 200 Script output follows | |
118 |
|
118 | |||
119 | { |
|
119 | { | |
120 | "bookmarks": [], |
|
120 | "bookmarks": [], | |
121 | "branch": "default", |
|
121 | "branch": "default", | |
122 | "date": [ |
|
122 | "date": [ | |
123 | 0.0, |
|
123 | 0.0, | |
124 | 0 |
|
124 | 0 | |
125 | ], |
|
125 | ], | |
126 | "desc": "move foo", |
|
126 | "desc": "move foo", | |
127 | "lines": [ |
|
127 | "lines": [ | |
128 | { |
|
128 | { | |
129 | "line": "bar\n" |
|
129 | "line": "bar\n" | |
130 | } |
|
130 | } | |
131 | ], |
|
131 | ], | |
132 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
132 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
133 | "parents": [ |
|
133 | "parents": [ | |
134 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
134 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
135 | ], |
|
135 | ], | |
136 | "path": "foo-new", |
|
136 | "path": "foo-new", | |
137 | "phase": "public", |
|
137 | "phase": "public", | |
138 | "tags": [ |
|
138 | "tags": [ | |
139 | "tag1" |
|
139 | "tag1" | |
140 | ], |
|
140 | ], | |
141 | "user": "test" |
|
141 | "user": "test" | |
142 | } |
|
142 | } | |
143 |
|
143 | |||
144 | file/{revision} shows root directory info |
|
144 | file/{revision} shows root directory info | |
145 |
|
145 | |||
146 | $ request json-file/cc725e08502a |
|
146 | $ request json-file/cc725e08502a | |
147 | 200 Script output follows |
|
147 | 200 Script output follows | |
148 |
|
148 | |||
149 | { |
|
149 | { | |
150 | "abspath": "/", |
|
150 | "abspath": "/", | |
151 | "bookmarks": [], |
|
151 | "bookmarks": [], | |
152 | "directories": [ |
|
152 | "directories": [ | |
153 | { |
|
153 | { | |
154 | "abspath": "/da", |
|
154 | "abspath": "/da", | |
155 | "basename": "da", |
|
155 | "basename": "da", | |
156 | "emptydirs": "" |
|
156 | "emptydirs": "" | |
157 | } |
|
157 | } | |
158 | ], |
|
158 | ], | |
159 | "files": [ |
|
159 | "files": [ | |
160 | { |
|
160 | { | |
161 | "abspath": ".hgtags", |
|
161 | "abspath": ".hgtags", | |
162 | "basename": ".hgtags", |
|
162 | "basename": ".hgtags", | |
163 | "date": [ |
|
163 | "date": [ | |
164 | 0.0, |
|
164 | 0.0, | |
165 | 0 |
|
165 | 0 | |
166 | ], |
|
166 | ], | |
167 | "flags": "", |
|
167 | "flags": "", | |
168 | "size": 92 |
|
168 | "size": 92 | |
169 | }, |
|
169 | }, | |
170 | { |
|
170 | { | |
171 | "abspath": "foo-new", |
|
171 | "abspath": "foo-new", | |
172 | "basename": "foo-new", |
|
172 | "basename": "foo-new", | |
173 | "date": [ |
|
173 | "date": [ | |
174 | 0.0, |
|
174 | 0.0, | |
175 | 0 |
|
175 | 0 | |
176 | ], |
|
176 | ], | |
177 | "flags": "", |
|
177 | "flags": "", | |
178 | "size": 4 |
|
178 | "size": 4 | |
179 | } |
|
179 | } | |
180 | ], |
|
180 | ], | |
181 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
181 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
182 | "tags": [ |
|
182 | "tags": [ | |
183 | "tip" |
|
183 | "tip" | |
184 | ] |
|
184 | ] | |
185 | } |
|
185 | } | |
186 |
|
186 | |||
187 | changelog/ shows information about several changesets |
|
187 | changelog/ shows information about several changesets | |
188 |
|
188 | |||
189 | $ request json-changelog |
|
189 | $ request json-changelog | |
190 | 200 Script output follows |
|
190 | 200 Script output follows | |
191 |
|
191 | |||
192 | { |
|
192 | { | |
193 | "changeset_count": 10, |
|
193 | "changeset_count": 10, | |
194 | "changesets": [ |
|
194 | "changesets": [ | |
195 | { |
|
195 | { | |
196 | "bookmarks": [], |
|
196 | "bookmarks": [], | |
197 | "branch": "default", |
|
197 | "branch": "default", | |
198 | "date": [ |
|
198 | "date": [ | |
199 | 0.0, |
|
199 | 0.0, | |
200 | 0 |
|
200 | 0 | |
201 | ], |
|
201 | ], | |
202 | "desc": "merge test-branch into default", |
|
202 | "desc": "merge test-branch into default", | |
203 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
203 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
204 | "parents": [ |
|
204 | "parents": [ | |
205 | "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
205 | "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
206 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" |
|
206 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" | |
207 | ], |
|
207 | ], | |
208 | "phase": "draft", |
|
208 | "phase": "draft", | |
209 | "tags": [ |
|
209 | "tags": [ | |
210 | "tip" |
|
210 | "tip" | |
211 | ], |
|
211 | ], | |
212 | "user": "test" |
|
212 | "user": "test" | |
213 | }, |
|
213 | }, | |
214 | { |
|
214 | { | |
215 | "bookmarks": [], |
|
215 | "bookmarks": [], | |
216 | "branch": "test-branch", |
|
216 | "branch": "test-branch", | |
217 | "date": [ |
|
217 | "date": [ | |
218 | 0.0, |
|
218 | 0.0, | |
219 | 0 |
|
219 | 0 | |
220 | ], |
|
220 | ], | |
221 | "desc": "another commit in test-branch", |
|
221 | "desc": "another commit in test-branch", | |
222 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", |
|
222 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |
223 | "parents": [ |
|
223 | "parents": [ | |
224 | "6ab967a8ab3489227a83f80e920faa039a71819f" |
|
224 | "6ab967a8ab3489227a83f80e920faa039a71819f" | |
225 | ], |
|
225 | ], | |
226 | "phase": "draft", |
|
226 | "phase": "draft", | |
227 | "tags": [], |
|
227 | "tags": [], | |
228 | "user": "test" |
|
228 | "user": "test" | |
229 | }, |
|
229 | }, | |
230 | { |
|
230 | { | |
231 | "bookmarks": [], |
|
231 | "bookmarks": [], | |
232 | "branch": "test-branch", |
|
232 | "branch": "test-branch", | |
233 | "date": [ |
|
233 | "date": [ | |
234 | 0.0, |
|
234 | 0.0, | |
235 | 0 |
|
235 | 0 | |
236 | ], |
|
236 | ], | |
237 | "desc": "create test branch", |
|
237 | "desc": "create test branch", | |
238 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", |
|
238 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |
239 | "parents": [ |
|
239 | "parents": [ | |
240 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
240 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
241 | ], |
|
241 | ], | |
242 | "phase": "draft", |
|
242 | "phase": "draft", | |
243 | "tags": [], |
|
243 | "tags": [], | |
244 | "user": "test" |
|
244 | "user": "test" | |
245 | }, |
|
245 | }, | |
246 | { |
|
246 | { | |
247 | "bookmarks": [ |
|
247 | "bookmarks": [ | |
248 | "bookmark2" |
|
248 | "bookmark2" | |
249 | ], |
|
249 | ], | |
250 | "branch": "default", |
|
250 | "branch": "default", | |
251 | "date": [ |
|
251 | "date": [ | |
252 | 0.0, |
|
252 | 0.0, | |
253 | 0 |
|
253 | 0 | |
254 | ], |
|
254 | ], | |
255 | "desc": "create tag2", |
|
255 | "desc": "create tag2", | |
256 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
256 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
257 | "parents": [ |
|
257 | "parents": [ | |
258 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" |
|
258 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" | |
259 | ], |
|
259 | ], | |
260 | "phase": "draft", |
|
260 | "phase": "draft", | |
261 | "tags": [], |
|
261 | "tags": [], | |
262 | "user": "test" |
|
262 | "user": "test" | |
263 | }, |
|
263 | }, | |
264 | { |
|
264 | { | |
265 | "bookmarks": [], |
|
265 | "bookmarks": [], | |
266 | "branch": "default", |
|
266 | "branch": "default", | |
267 | "date": [ |
|
267 | "date": [ | |
268 | 0.0, |
|
268 | 0.0, | |
269 | 0 |
|
269 | 0 | |
270 | ], |
|
270 | ], | |
271 | "desc": "another commit to da/foo", |
|
271 | "desc": "another commit to da/foo", | |
272 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
272 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
273 | "parents": [ |
|
273 | "parents": [ | |
274 | "93a8ce14f89156426b7fa981af8042da53f03aa0" |
|
274 | "93a8ce14f89156426b7fa981af8042da53f03aa0" | |
275 | ], |
|
275 | ], | |
276 | "phase": "draft", |
|
276 | "phase": "draft", | |
277 | "tags": [ |
|
277 | "tags": [ | |
278 | "tag2" |
|
278 | "tag2" | |
279 | ], |
|
279 | ], | |
280 | "user": "test" |
|
280 | "user": "test" | |
281 | }, |
|
281 | }, | |
282 | { |
|
282 | { | |
283 | "bookmarks": [], |
|
283 | "bookmarks": [], | |
284 | "branch": "default", |
|
284 | "branch": "default", | |
285 | "date": [ |
|
285 | "date": [ | |
286 | 0.0, |
|
286 | 0.0, | |
287 | 0 |
|
287 | 0 | |
288 | ], |
|
288 | ], | |
289 | "desc": "create tag", |
|
289 | "desc": "create tag", | |
290 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", |
|
290 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", | |
291 | "parents": [ |
|
291 | "parents": [ | |
292 | "78896eb0e102174ce9278438a95e12543e4367a7" |
|
292 | "78896eb0e102174ce9278438a95e12543e4367a7" | |
293 | ], |
|
293 | ], | |
294 | "phase": "public", |
|
294 | "phase": "public", | |
295 | "tags": [], |
|
295 | "tags": [], | |
296 | "user": "test" |
|
296 | "user": "test" | |
297 | }, |
|
297 | }, | |
298 | { |
|
298 | { | |
299 | "bookmarks": [], |
|
299 | "bookmarks": [], | |
300 | "branch": "default", |
|
300 | "branch": "default", | |
301 | "date": [ |
|
301 | "date": [ | |
302 | 0.0, |
|
302 | 0.0, | |
303 | 0 |
|
303 | 0 | |
304 | ], |
|
304 | ], | |
305 | "desc": "move foo", |
|
305 | "desc": "move foo", | |
306 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
306 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
307 | "parents": [ |
|
307 | "parents": [ | |
308 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
308 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
309 | ], |
|
309 | ], | |
310 | "phase": "public", |
|
310 | "phase": "public", | |
311 | "tags": [ |
|
311 | "tags": [ | |
312 | "tag1" |
|
312 | "tag1" | |
313 | ], |
|
313 | ], | |
314 | "user": "test" |
|
314 | "user": "test" | |
315 | }, |
|
315 | }, | |
316 | { |
|
316 | { | |
317 | "bookmarks": [ |
|
317 | "bookmarks": [ | |
318 | "bookmark1" |
|
318 | "bookmark1" | |
319 | ], |
|
319 | ], | |
320 | "branch": "default", |
|
320 | "branch": "default", | |
321 | "date": [ |
|
321 | "date": [ | |
322 | 0.0, |
|
322 | 0.0, | |
323 | 0 |
|
323 | 0 | |
324 | ], |
|
324 | ], | |
325 | "desc": "modify da/foo", |
|
325 | "desc": "modify da/foo", | |
326 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", |
|
326 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |
327 | "parents": [ |
|
327 | "parents": [ | |
328 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
328 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
329 | ], |
|
329 | ], | |
330 | "phase": "public", |
|
330 | "phase": "public", | |
331 | "tags": [], |
|
331 | "tags": [], | |
332 | "user": "test" |
|
332 | "user": "test" | |
333 | }, |
|
333 | }, | |
334 | { |
|
334 | { | |
335 | "bookmarks": [], |
|
335 | "bookmarks": [], | |
336 | "branch": "default", |
|
336 | "branch": "default", | |
337 | "date": [ |
|
337 | "date": [ | |
338 | 0.0, |
|
338 | 0.0, | |
339 | 0 |
|
339 | 0 | |
340 | ], |
|
340 | ], | |
341 | "desc": "modify foo", |
|
341 | "desc": "modify foo", | |
342 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
342 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
343 | "parents": [ |
|
343 | "parents": [ | |
344 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
344 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
345 | ], |
|
345 | ], | |
346 | "phase": "public", |
|
346 | "phase": "public", | |
347 | "tags": [], |
|
347 | "tags": [], | |
348 | "user": "test" |
|
348 | "user": "test" | |
349 | }, |
|
349 | }, | |
350 | { |
|
350 | { | |
351 | "bookmarks": [], |
|
351 | "bookmarks": [], | |
352 | "branch": "default", |
|
352 | "branch": "default", | |
353 | "date": [ |
|
353 | "date": [ | |
354 | 0.0, |
|
354 | 0.0, | |
355 | 0 |
|
355 | 0 | |
356 | ], |
|
356 | ], | |
357 | "desc": "initial", |
|
357 | "desc": "initial", | |
358 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
358 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
359 | "parents": [], |
|
359 | "parents": [], | |
360 | "phase": "public", |
|
360 | "phase": "public", | |
361 | "tags": [], |
|
361 | "tags": [], | |
362 | "user": "test" |
|
362 | "user": "test" | |
363 | } |
|
363 | } | |
364 | ], |
|
364 | ], | |
365 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" |
|
365 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" | |
366 | } |
|
366 | } | |
367 |
|
367 | |||
368 | changelog/{revision} shows information starting at a specific changeset |
|
368 | changelog/{revision} shows information starting at a specific changeset | |
369 |
|
369 | |||
370 | $ request json-changelog/f8bbb9024b10 |
|
370 | $ request json-changelog/f8bbb9024b10 | |
371 | 200 Script output follows |
|
371 | 200 Script output follows | |
372 |
|
372 | |||
373 | { |
|
373 | { | |
374 | "changeset_count": 10, |
|
374 | "changeset_count": 10, | |
375 | "changesets": [ |
|
375 | "changesets": [ | |
376 | { |
|
376 | { | |
377 | "bookmarks": [], |
|
377 | "bookmarks": [], | |
378 | "branch": "default", |
|
378 | "branch": "default", | |
379 | "date": [ |
|
379 | "date": [ | |
380 | 0.0, |
|
380 | 0.0, | |
381 | 0 |
|
381 | 0 | |
382 | ], |
|
382 | ], | |
383 | "desc": "modify foo", |
|
383 | "desc": "modify foo", | |
384 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
384 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
385 | "parents": [ |
|
385 | "parents": [ | |
386 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
386 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
387 | ], |
|
387 | ], | |
388 | "phase": "public", |
|
388 | "phase": "public", | |
389 | "tags": [], |
|
389 | "tags": [], | |
390 | "user": "test" |
|
390 | "user": "test" | |
391 | }, |
|
391 | }, | |
392 | { |
|
392 | { | |
393 | "bookmarks": [], |
|
393 | "bookmarks": [], | |
394 | "branch": "default", |
|
394 | "branch": "default", | |
395 | "date": [ |
|
395 | "date": [ | |
396 | 0.0, |
|
396 | 0.0, | |
397 | 0 |
|
397 | 0 | |
398 | ], |
|
398 | ], | |
399 | "desc": "initial", |
|
399 | "desc": "initial", | |
400 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
400 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
401 | "parents": [], |
|
401 | "parents": [], | |
402 | "phase": "public", |
|
402 | "phase": "public", | |
403 | "tags": [], |
|
403 | "tags": [], | |
404 | "user": "test" |
|
404 | "user": "test" | |
405 | } |
|
405 | } | |
406 | ], |
|
406 | ], | |
407 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
407 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
408 | } |
|
408 | } | |
409 |
|
409 | |||
410 | shortlog/ shows information about a set of changesets |
|
410 | shortlog/ shows information about a set of changesets | |
411 |
|
411 | |||
412 | $ request json-shortlog |
|
412 | $ request json-shortlog | |
413 | 200 Script output follows |
|
413 | 200 Script output follows | |
414 |
|
414 | |||
415 | { |
|
415 | { | |
416 | "changeset_count": 10, |
|
416 | "changeset_count": 10, | |
417 | "changesets": [ |
|
417 | "changesets": [ | |
418 | { |
|
418 | { | |
419 | "bookmarks": [], |
|
419 | "bookmarks": [], | |
420 | "branch": "default", |
|
420 | "branch": "default", | |
421 | "date": [ |
|
421 | "date": [ | |
422 | 0.0, |
|
422 | 0.0, | |
423 | 0 |
|
423 | 0 | |
424 | ], |
|
424 | ], | |
425 | "desc": "merge test-branch into default", |
|
425 | "desc": "merge test-branch into default", | |
426 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
426 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
427 | "parents": [ |
|
427 | "parents": [ | |
428 | "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
428 | "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
429 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" |
|
429 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" | |
430 | ], |
|
430 | ], | |
431 | "phase": "draft", |
|
431 | "phase": "draft", | |
432 | "tags": [ |
|
432 | "tags": [ | |
433 | "tip" |
|
433 | "tip" | |
434 | ], |
|
434 | ], | |
435 | "user": "test" |
|
435 | "user": "test" | |
436 | }, |
|
436 | }, | |
437 | { |
|
437 | { | |
438 | "bookmarks": [], |
|
438 | "bookmarks": [], | |
439 | "branch": "test-branch", |
|
439 | "branch": "test-branch", | |
440 | "date": [ |
|
440 | "date": [ | |
441 | 0.0, |
|
441 | 0.0, | |
442 | 0 |
|
442 | 0 | |
443 | ], |
|
443 | ], | |
444 | "desc": "another commit in test-branch", |
|
444 | "desc": "another commit in test-branch", | |
445 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", |
|
445 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |
446 | "parents": [ |
|
446 | "parents": [ | |
447 | "6ab967a8ab3489227a83f80e920faa039a71819f" |
|
447 | "6ab967a8ab3489227a83f80e920faa039a71819f" | |
448 | ], |
|
448 | ], | |
449 | "phase": "draft", |
|
449 | "phase": "draft", | |
450 | "tags": [], |
|
450 | "tags": [], | |
451 | "user": "test" |
|
451 | "user": "test" | |
452 | }, |
|
452 | }, | |
453 | { |
|
453 | { | |
454 | "bookmarks": [], |
|
454 | "bookmarks": [], | |
455 | "branch": "test-branch", |
|
455 | "branch": "test-branch", | |
456 | "date": [ |
|
456 | "date": [ | |
457 | 0.0, |
|
457 | 0.0, | |
458 | 0 |
|
458 | 0 | |
459 | ], |
|
459 | ], | |
460 | "desc": "create test branch", |
|
460 | "desc": "create test branch", | |
461 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", |
|
461 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |
462 | "parents": [ |
|
462 | "parents": [ | |
463 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
463 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
464 | ], |
|
464 | ], | |
465 | "phase": "draft", |
|
465 | "phase": "draft", | |
466 | "tags": [], |
|
466 | "tags": [], | |
467 | "user": "test" |
|
467 | "user": "test" | |
468 | }, |
|
468 | }, | |
469 | { |
|
469 | { | |
470 | "bookmarks": [ |
|
470 | "bookmarks": [ | |
471 | "bookmark2" |
|
471 | "bookmark2" | |
472 | ], |
|
472 | ], | |
473 | "branch": "default", |
|
473 | "branch": "default", | |
474 | "date": [ |
|
474 | "date": [ | |
475 | 0.0, |
|
475 | 0.0, | |
476 | 0 |
|
476 | 0 | |
477 | ], |
|
477 | ], | |
478 | "desc": "create tag2", |
|
478 | "desc": "create tag2", | |
479 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
479 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
480 | "parents": [ |
|
480 | "parents": [ | |
481 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" |
|
481 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" | |
482 | ], |
|
482 | ], | |
483 | "phase": "draft", |
|
483 | "phase": "draft", | |
484 | "tags": [], |
|
484 | "tags": [], | |
485 | "user": "test" |
|
485 | "user": "test" | |
486 | }, |
|
486 | }, | |
487 | { |
|
487 | { | |
488 | "bookmarks": [], |
|
488 | "bookmarks": [], | |
489 | "branch": "default", |
|
489 | "branch": "default", | |
490 | "date": [ |
|
490 | "date": [ | |
491 | 0.0, |
|
491 | 0.0, | |
492 | 0 |
|
492 | 0 | |
493 | ], |
|
493 | ], | |
494 | "desc": "another commit to da/foo", |
|
494 | "desc": "another commit to da/foo", | |
495 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
495 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
496 | "parents": [ |
|
496 | "parents": [ | |
497 | "93a8ce14f89156426b7fa981af8042da53f03aa0" |
|
497 | "93a8ce14f89156426b7fa981af8042da53f03aa0" | |
498 | ], |
|
498 | ], | |
499 | "phase": "draft", |
|
499 | "phase": "draft", | |
500 | "tags": [ |
|
500 | "tags": [ | |
501 | "tag2" |
|
501 | "tag2" | |
502 | ], |
|
502 | ], | |
503 | "user": "test" |
|
503 | "user": "test" | |
504 | }, |
|
504 | }, | |
505 | { |
|
505 | { | |
506 | "bookmarks": [], |
|
506 | "bookmarks": [], | |
507 | "branch": "default", |
|
507 | "branch": "default", | |
508 | "date": [ |
|
508 | "date": [ | |
509 | 0.0, |
|
509 | 0.0, | |
510 | 0 |
|
510 | 0 | |
511 | ], |
|
511 | ], | |
512 | "desc": "create tag", |
|
512 | "desc": "create tag", | |
513 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", |
|
513 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", | |
514 | "parents": [ |
|
514 | "parents": [ | |
515 | "78896eb0e102174ce9278438a95e12543e4367a7" |
|
515 | "78896eb0e102174ce9278438a95e12543e4367a7" | |
516 | ], |
|
516 | ], | |
517 | "phase": "public", |
|
517 | "phase": "public", | |
518 | "tags": [], |
|
518 | "tags": [], | |
519 | "user": "test" |
|
519 | "user": "test" | |
520 | }, |
|
520 | }, | |
521 | { |
|
521 | { | |
522 | "bookmarks": [], |
|
522 | "bookmarks": [], | |
523 | "branch": "default", |
|
523 | "branch": "default", | |
524 | "date": [ |
|
524 | "date": [ | |
525 | 0.0, |
|
525 | 0.0, | |
526 | 0 |
|
526 | 0 | |
527 | ], |
|
527 | ], | |
528 | "desc": "move foo", |
|
528 | "desc": "move foo", | |
529 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
529 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
530 | "parents": [ |
|
530 | "parents": [ | |
531 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
531 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
532 | ], |
|
532 | ], | |
533 | "phase": "public", |
|
533 | "phase": "public", | |
534 | "tags": [ |
|
534 | "tags": [ | |
535 | "tag1" |
|
535 | "tag1" | |
536 | ], |
|
536 | ], | |
537 | "user": "test" |
|
537 | "user": "test" | |
538 | }, |
|
538 | }, | |
539 | { |
|
539 | { | |
540 | "bookmarks": [ |
|
540 | "bookmarks": [ | |
541 | "bookmark1" |
|
541 | "bookmark1" | |
542 | ], |
|
542 | ], | |
543 | "branch": "default", |
|
543 | "branch": "default", | |
544 | "date": [ |
|
544 | "date": [ | |
545 | 0.0, |
|
545 | 0.0, | |
546 | 0 |
|
546 | 0 | |
547 | ], |
|
547 | ], | |
548 | "desc": "modify da/foo", |
|
548 | "desc": "modify da/foo", | |
549 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", |
|
549 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |
550 | "parents": [ |
|
550 | "parents": [ | |
551 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
551 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
552 | ], |
|
552 | ], | |
553 | "phase": "public", |
|
553 | "phase": "public", | |
554 | "tags": [], |
|
554 | "tags": [], | |
555 | "user": "test" |
|
555 | "user": "test" | |
556 | }, |
|
556 | }, | |
557 | { |
|
557 | { | |
558 | "bookmarks": [], |
|
558 | "bookmarks": [], | |
559 | "branch": "default", |
|
559 | "branch": "default", | |
560 | "date": [ |
|
560 | "date": [ | |
561 | 0.0, |
|
561 | 0.0, | |
562 | 0 |
|
562 | 0 | |
563 | ], |
|
563 | ], | |
564 | "desc": "modify foo", |
|
564 | "desc": "modify foo", | |
565 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
565 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
566 | "parents": [ |
|
566 | "parents": [ | |
567 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
567 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
568 | ], |
|
568 | ], | |
569 | "phase": "public", |
|
569 | "phase": "public", | |
570 | "tags": [], |
|
570 | "tags": [], | |
571 | "user": "test" |
|
571 | "user": "test" | |
572 | }, |
|
572 | }, | |
573 | { |
|
573 | { | |
574 | "bookmarks": [], |
|
574 | "bookmarks": [], | |
575 | "branch": "default", |
|
575 | "branch": "default", | |
576 | "date": [ |
|
576 | "date": [ | |
577 | 0.0, |
|
577 | 0.0, | |
578 | 0 |
|
578 | 0 | |
579 | ], |
|
579 | ], | |
580 | "desc": "initial", |
|
580 | "desc": "initial", | |
581 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
581 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
582 | "parents": [], |
|
582 | "parents": [], | |
583 | "phase": "public", |
|
583 | "phase": "public", | |
584 | "tags": [], |
|
584 | "tags": [], | |
585 | "user": "test" |
|
585 | "user": "test" | |
586 | } |
|
586 | } | |
587 | ], |
|
587 | ], | |
588 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" |
|
588 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" | |
589 | } |
|
589 | } | |
590 |
|
590 | |||
|
591 | shortlog is displayed by default (issue5978) | |||
|
592 | ||||
|
593 | $ request '?style=json' | |||
|
594 | 200 Script output follows | |||
|
595 | ||||
|
596 | { | |||
|
597 | "changeset_count": 10, | |||
|
598 | "changesets": [ | |||
|
599 | { | |||
|
600 | "bookmarks": [], | |||
|
601 | "branch": "default", | |||
|
602 | "date": [ | |||
|
603 | 0.0, | |||
|
604 | 0 | |||
|
605 | ], | |||
|
606 | "desc": "merge test-branch into default", | |||
|
607 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |||
|
608 | "parents": [ | |||
|
609 | "ceed296fe500c3fac9541e31dad860cb49c89e45", | |||
|
610 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" | |||
|
611 | ], | |||
|
612 | "phase": "draft", | |||
|
613 | "tags": [ | |||
|
614 | "tip" | |||
|
615 | ], | |||
|
616 | "user": "test" | |||
|
617 | }, | |||
|
618 | { | |||
|
619 | "bookmarks": [], | |||
|
620 | "branch": "test-branch", | |||
|
621 | "date": [ | |||
|
622 | 0.0, | |||
|
623 | 0 | |||
|
624 | ], | |||
|
625 | "desc": "another commit in test-branch", | |||
|
626 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |||
|
627 | "parents": [ | |||
|
628 | "6ab967a8ab3489227a83f80e920faa039a71819f" | |||
|
629 | ], | |||
|
630 | "phase": "draft", | |||
|
631 | "tags": [], | |||
|
632 | "user": "test" | |||
|
633 | }, | |||
|
634 | { | |||
|
635 | "bookmarks": [], | |||
|
636 | "branch": "test-branch", | |||
|
637 | "date": [ | |||
|
638 | 0.0, | |||
|
639 | 0 | |||
|
640 | ], | |||
|
641 | "desc": "create test branch", | |||
|
642 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |||
|
643 | "parents": [ | |||
|
644 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |||
|
645 | ], | |||
|
646 | "phase": "draft", | |||
|
647 | "tags": [], | |||
|
648 | "user": "test" | |||
|
649 | }, | |||
|
650 | { | |||
|
651 | "bookmarks": [ | |||
|
652 | "bookmark2" | |||
|
653 | ], | |||
|
654 | "branch": "default", | |||
|
655 | "date": [ | |||
|
656 | 0.0, | |||
|
657 | 0 | |||
|
658 | ], | |||
|
659 | "desc": "create tag2", | |||
|
660 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", | |||
|
661 | "parents": [ | |||
|
662 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" | |||
|
663 | ], | |||
|
664 | "phase": "draft", | |||
|
665 | "tags": [], | |||
|
666 | "user": "test" | |||
|
667 | }, | |||
|
668 | { | |||
|
669 | "bookmarks": [], | |||
|
670 | "branch": "default", | |||
|
671 | "date": [ | |||
|
672 | 0.0, | |||
|
673 | 0 | |||
|
674 | ], | |||
|
675 | "desc": "another commit to da/foo", | |||
|
676 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |||
|
677 | "parents": [ | |||
|
678 | "93a8ce14f89156426b7fa981af8042da53f03aa0" | |||
|
679 | ], | |||
|
680 | "phase": "draft", | |||
|
681 | "tags": [ | |||
|
682 | "tag2" | |||
|
683 | ], | |||
|
684 | "user": "test" | |||
|
685 | }, | |||
|
686 | { | |||
|
687 | "bookmarks": [], | |||
|
688 | "branch": "default", | |||
|
689 | "date": [ | |||
|
690 | 0.0, | |||
|
691 | 0 | |||
|
692 | ], | |||
|
693 | "desc": "create tag", | |||
|
694 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", | |||
|
695 | "parents": [ | |||
|
696 | "78896eb0e102174ce9278438a95e12543e4367a7" | |||
|
697 | ], | |||
|
698 | "phase": "public", | |||
|
699 | "tags": [], | |||
|
700 | "user": "test" | |||
|
701 | }, | |||
|
702 | { | |||
|
703 | "bookmarks": [], | |||
|
704 | "branch": "default", | |||
|
705 | "date": [ | |||
|
706 | 0.0, | |||
|
707 | 0 | |||
|
708 | ], | |||
|
709 | "desc": "move foo", | |||
|
710 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |||
|
711 | "parents": [ | |||
|
712 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |||
|
713 | ], | |||
|
714 | "phase": "public", | |||
|
715 | "tags": [ | |||
|
716 | "tag1" | |||
|
717 | ], | |||
|
718 | "user": "test" | |||
|
719 | }, | |||
|
720 | { | |||
|
721 | "bookmarks": [ | |||
|
722 | "bookmark1" | |||
|
723 | ], | |||
|
724 | "branch": "default", | |||
|
725 | "date": [ | |||
|
726 | 0.0, | |||
|
727 | 0 | |||
|
728 | ], | |||
|
729 | "desc": "modify da/foo", | |||
|
730 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |||
|
731 | "parents": [ | |||
|
732 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |||
|
733 | ], | |||
|
734 | "phase": "public", | |||
|
735 | "tags": [], | |||
|
736 | "user": "test" | |||
|
737 | }, | |||
|
738 | { | |||
|
739 | "bookmarks": [], | |||
|
740 | "branch": "default", | |||
|
741 | "date": [ | |||
|
742 | 0.0, | |||
|
743 | 0 | |||
|
744 | ], | |||
|
745 | "desc": "modify foo", | |||
|
746 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |||
|
747 | "parents": [ | |||
|
748 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |||
|
749 | ], | |||
|
750 | "phase": "public", | |||
|
751 | "tags": [], | |||
|
752 | "user": "test" | |||
|
753 | }, | |||
|
754 | { | |||
|
755 | "bookmarks": [], | |||
|
756 | "branch": "default", | |||
|
757 | "date": [ | |||
|
758 | 0.0, | |||
|
759 | 0 | |||
|
760 | ], | |||
|
761 | "desc": "initial", | |||
|
762 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |||
|
763 | "parents": [], | |||
|
764 | "phase": "public", | |||
|
765 | "tags": [], | |||
|
766 | "user": "test" | |||
|
767 | } | |||
|
768 | ], | |||
|
769 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" | |||
|
770 | } | |||
|
771 | ||||
591 | changeset/ renders the tip changeset |
|
772 | changeset/ renders the tip changeset | |
592 |
|
773 | |||
593 | $ request json-rev |
|
774 | $ request json-rev | |
594 | 200 Script output follows |
|
775 | 200 Script output follows | |
595 |
|
776 | |||
596 | { |
|
777 | { | |
597 | "bookmarks": [], |
|
778 | "bookmarks": [], | |
598 | "branch": "default", |
|
779 | "branch": "default", | |
599 | "date": [ |
|
780 | "date": [ | |
600 | 0.0, |
|
781 | 0.0, | |
601 | 0 |
|
782 | 0 | |
602 | ], |
|
783 | ], | |
603 | "desc": "merge test-branch into default", |
|
784 | "desc": "merge test-branch into default", | |
604 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
785 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
605 | "parents": [ |
|
786 | "parents": [ | |
606 | "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
787 | "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
607 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" |
|
788 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" | |
608 | ], |
|
789 | ], | |
609 | "phase": "draft", |
|
790 | "phase": "draft", | |
610 | "tags": [ |
|
791 | "tags": [ | |
611 | "tip" |
|
792 | "tip" | |
612 | ], |
|
793 | ], | |
613 | "user": "test" |
|
794 | "user": "test" | |
614 | } |
|
795 | } | |
615 |
|
796 | |||
616 | changeset/{revision} shows tags |
|
797 | changeset/{revision} shows tags | |
617 |
|
798 | |||
618 | $ request json-rev/78896eb0e102 |
|
799 | $ request json-rev/78896eb0e102 | |
619 | 200 Script output follows |
|
800 | 200 Script output follows | |
620 |
|
801 | |||
621 | { |
|
802 | { | |
622 | "bookmarks": [], |
|
803 | "bookmarks": [], | |
623 | "branch": "default", |
|
804 | "branch": "default", | |
624 | "date": [ |
|
805 | "date": [ | |
625 | 0.0, |
|
806 | 0.0, | |
626 | 0 |
|
807 | 0 | |
627 | ], |
|
808 | ], | |
628 | "desc": "move foo", |
|
809 | "desc": "move foo", | |
629 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
810 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
630 | "parents": [ |
|
811 | "parents": [ | |
631 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
812 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
632 | ], |
|
813 | ], | |
633 | "phase": "public", |
|
814 | "phase": "public", | |
634 | "tags": [ |
|
815 | "tags": [ | |
635 | "tag1" |
|
816 | "tag1" | |
636 | ], |
|
817 | ], | |
637 | "user": "test" |
|
818 | "user": "test" | |
638 | } |
|
819 | } | |
639 |
|
820 | |||
640 | changeset/{revision} shows bookmarks |
|
821 | changeset/{revision} shows bookmarks | |
641 |
|
822 | |||
642 | $ request json-rev/8d7c456572ac |
|
823 | $ request json-rev/8d7c456572ac | |
643 | 200 Script output follows |
|
824 | 200 Script output follows | |
644 |
|
825 | |||
645 | { |
|
826 | { | |
646 | "bookmarks": [ |
|
827 | "bookmarks": [ | |
647 | "bookmark1" |
|
828 | "bookmark1" | |
648 | ], |
|
829 | ], | |
649 | "branch": "default", |
|
830 | "branch": "default", | |
650 | "date": [ |
|
831 | "date": [ | |
651 | 0.0, |
|
832 | 0.0, | |
652 | 0 |
|
833 | 0 | |
653 | ], |
|
834 | ], | |
654 | "desc": "modify da/foo", |
|
835 | "desc": "modify da/foo", | |
655 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", |
|
836 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |
656 | "parents": [ |
|
837 | "parents": [ | |
657 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
838 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
658 | ], |
|
839 | ], | |
659 | "phase": "public", |
|
840 | "phase": "public", | |
660 | "tags": [], |
|
841 | "tags": [], | |
661 | "user": "test" |
|
842 | "user": "test" | |
662 | } |
|
843 | } | |
663 |
|
844 | |||
664 | changeset/{revision} shows branches |
|
845 | changeset/{revision} shows branches | |
665 |
|
846 | |||
666 | $ request json-rev/6ab967a8ab34 |
|
847 | $ request json-rev/6ab967a8ab34 | |
667 | 200 Script output follows |
|
848 | 200 Script output follows | |
668 |
|
849 | |||
669 | { |
|
850 | { | |
670 | "bookmarks": [], |
|
851 | "bookmarks": [], | |
671 | "branch": "test-branch", |
|
852 | "branch": "test-branch", | |
672 | "date": [ |
|
853 | "date": [ | |
673 | 0.0, |
|
854 | 0.0, | |
674 | 0 |
|
855 | 0 | |
675 | ], |
|
856 | ], | |
676 | "desc": "create test branch", |
|
857 | "desc": "create test branch", | |
677 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", |
|
858 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |
678 | "parents": [ |
|
859 | "parents": [ | |
679 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
860 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
680 | ], |
|
861 | ], | |
681 | "phase": "draft", |
|
862 | "phase": "draft", | |
682 | "tags": [], |
|
863 | "tags": [], | |
683 | "user": "test" |
|
864 | "user": "test" | |
684 | } |
|
865 | } | |
685 |
|
866 | |||
686 | manifest/{revision}/{path} shows info about a directory at a revision |
|
867 | manifest/{revision}/{path} shows info about a directory at a revision | |
687 |
|
868 | |||
688 | $ request json-manifest/06e557f3edf6/ |
|
869 | $ request json-manifest/06e557f3edf6/ | |
689 | 200 Script output follows |
|
870 | 200 Script output follows | |
690 |
|
871 | |||
691 | { |
|
872 | { | |
692 | "abspath": "/", |
|
873 | "abspath": "/", | |
693 | "bookmarks": [], |
|
874 | "bookmarks": [], | |
694 | "directories": [ |
|
875 | "directories": [ | |
695 | { |
|
876 | { | |
696 | "abspath": "/da", |
|
877 | "abspath": "/da", | |
697 | "basename": "da", |
|
878 | "basename": "da", | |
698 | "emptydirs": "" |
|
879 | "emptydirs": "" | |
699 | } |
|
880 | } | |
700 | ], |
|
881 | ], | |
701 | "files": [ |
|
882 | "files": [ | |
702 | { |
|
883 | { | |
703 | "abspath": "foo", |
|
884 | "abspath": "foo", | |
704 | "basename": "foo", |
|
885 | "basename": "foo", | |
705 | "date": [ |
|
886 | "date": [ | |
706 | 0.0, |
|
887 | 0.0, | |
707 | 0 |
|
888 | 0 | |
708 | ], |
|
889 | ], | |
709 | "flags": "", |
|
890 | "flags": "", | |
710 | "size": 4 |
|
891 | "size": 4 | |
711 | } |
|
892 | } | |
712 | ], |
|
893 | ], | |
713 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
894 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
714 | "tags": [] |
|
895 | "tags": [] | |
715 | } |
|
896 | } | |
716 |
|
897 | |||
717 | tags/ shows tags info |
|
898 | tags/ shows tags info | |
718 |
|
899 | |||
719 | $ request json-tags |
|
900 | $ request json-tags | |
720 | 200 Script output follows |
|
901 | 200 Script output follows | |
721 |
|
902 | |||
722 | { |
|
903 | { | |
723 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
904 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
724 | "tags": [ |
|
905 | "tags": [ | |
725 | { |
|
906 | { | |
726 | "date": [ |
|
907 | "date": [ | |
727 | 0.0, |
|
908 | 0.0, | |
728 | 0 |
|
909 | 0 | |
729 | ], |
|
910 | ], | |
730 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
911 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
731 | "tag": "tag2" |
|
912 | "tag": "tag2" | |
732 | }, |
|
913 | }, | |
733 | { |
|
914 | { | |
734 | "date": [ |
|
915 | "date": [ | |
735 | 0.0, |
|
916 | 0.0, | |
736 | 0 |
|
917 | 0 | |
737 | ], |
|
918 | ], | |
738 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
919 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
739 | "tag": "tag1" |
|
920 | "tag": "tag1" | |
740 | } |
|
921 | } | |
741 | ] |
|
922 | ] | |
742 | } |
|
923 | } | |
743 |
|
924 | |||
744 | bookmarks/ shows bookmarks info |
|
925 | bookmarks/ shows bookmarks info | |
745 |
|
926 | |||
746 | $ request json-bookmarks |
|
927 | $ request json-bookmarks | |
747 | 200 Script output follows |
|
928 | 200 Script output follows | |
748 |
|
929 | |||
749 | { |
|
930 | { | |
750 | "bookmarks": [ |
|
931 | "bookmarks": [ | |
751 | { |
|
932 | { | |
752 | "bookmark": "bookmark2", |
|
933 | "bookmark": "bookmark2", | |
753 | "date": [ |
|
934 | "date": [ | |
754 | 0.0, |
|
935 | 0.0, | |
755 | 0 |
|
936 | 0 | |
756 | ], |
|
937 | ], | |
757 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45" |
|
938 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45" | |
758 | }, |
|
939 | }, | |
759 | { |
|
940 | { | |
760 | "bookmark": "bookmark1", |
|
941 | "bookmark": "bookmark1", | |
761 | "date": [ |
|
942 | "date": [ | |
762 | 0.0, |
|
943 | 0.0, | |
763 | 0 |
|
944 | 0 | |
764 | ], |
|
945 | ], | |
765 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
946 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
766 | } |
|
947 | } | |
767 | ], |
|
948 | ], | |
768 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" |
|
949 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" | |
769 | } |
|
950 | } | |
770 |
|
951 | |||
771 | branches/ shows branches info |
|
952 | branches/ shows branches info | |
772 |
|
953 | |||
773 | $ request json-branches |
|
954 | $ request json-branches | |
774 | 200 Script output follows |
|
955 | 200 Script output follows | |
775 |
|
956 | |||
776 | { |
|
957 | { | |
777 | "branches": [ |
|
958 | "branches": [ | |
778 | { |
|
959 | { | |
779 | "branch": "default", |
|
960 | "branch": "default", | |
780 | "date": [ |
|
961 | "date": [ | |
781 | 0.0, |
|
962 | 0.0, | |
782 | 0 |
|
963 | 0 | |
783 | ], |
|
964 | ], | |
784 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
965 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
785 | "status": "open" |
|
966 | "status": "open" | |
786 | }, |
|
967 | }, | |
787 | { |
|
968 | { | |
788 | "branch": "test-branch", |
|
969 | "branch": "test-branch", | |
789 | "date": [ |
|
970 | "date": [ | |
790 | 0.0, |
|
971 | 0.0, | |
791 | 0 |
|
972 | 0 | |
792 | ], |
|
973 | ], | |
793 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", |
|
974 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |
794 | "status": "inactive" |
|
975 | "status": "inactive" | |
795 | } |
|
976 | } | |
796 | ] |
|
977 | ] | |
797 | } |
|
978 | } | |
798 |
|
979 | |||
799 | summary/ shows a summary of repository state |
|
980 | summary/ shows a summary of repository state | |
800 |
|
981 | |||
801 | $ request json-summary |
|
982 | $ request json-summary | |
802 | 200 Script output follows |
|
983 | 200 Script output follows | |
803 |
|
984 | |||
804 | { |
|
985 | { | |
805 | "archives": [ |
|
986 | "archives": [ | |
806 | { |
|
987 | { | |
807 | "extension": ".tar.bz2", |
|
988 | "extension": ".tar.bz2", | |
808 | "node": "tip", |
|
989 | "node": "tip", | |
809 | "type": "bz2", |
|
990 | "type": "bz2", | |
810 | "url": "http://*:$HGPORT/archive/tip.tar.bz2" (glob) |
|
991 | "url": "http://*:$HGPORT/archive/tip.tar.bz2" (glob) | |
811 | } |
|
992 | } | |
812 | ], |
|
993 | ], | |
813 | "bookmarks": [ |
|
994 | "bookmarks": [ | |
814 | { |
|
995 | { | |
815 | "bookmark": "bookmark2", |
|
996 | "bookmark": "bookmark2", | |
816 | "date": [ |
|
997 | "date": [ | |
817 | 0.0, |
|
998 | 0.0, | |
818 | 0 |
|
999 | 0 | |
819 | ], |
|
1000 | ], | |
820 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45" |
|
1001 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45" | |
821 | }, |
|
1002 | }, | |
822 | { |
|
1003 | { | |
823 | "bookmark": "bookmark1", |
|
1004 | "bookmark": "bookmark1", | |
824 | "date": [ |
|
1005 | "date": [ | |
825 | 0.0, |
|
1006 | 0.0, | |
826 | 0 |
|
1007 | 0 | |
827 | ], |
|
1008 | ], | |
828 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
1009 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
829 | } |
|
1010 | } | |
830 | ], |
|
1011 | ], | |
831 | "branches": [ |
|
1012 | "branches": [ | |
832 | { |
|
1013 | { | |
833 | "branch": "default", |
|
1014 | "branch": "default", | |
834 | "date": [ |
|
1015 | "date": [ | |
835 | 0.0, |
|
1016 | 0.0, | |
836 | 0 |
|
1017 | 0 | |
837 | ], |
|
1018 | ], | |
838 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
1019 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
839 | "status": "open" |
|
1020 | "status": "open" | |
840 | }, |
|
1021 | }, | |
841 | { |
|
1022 | { | |
842 | "branch": "test-branch", |
|
1023 | "branch": "test-branch", | |
843 | "date": [ |
|
1024 | "date": [ | |
844 | 0.0, |
|
1025 | 0.0, | |
845 | 0 |
|
1026 | 0 | |
846 | ], |
|
1027 | ], | |
847 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", |
|
1028 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |
848 | "status": "inactive" |
|
1029 | "status": "inactive" | |
849 | } |
|
1030 | } | |
850 | ], |
|
1031 | ], | |
851 | "labels": [], |
|
1032 | "labels": [], | |
852 | "lastchange": [ |
|
1033 | "lastchange": [ | |
853 | 0.0, |
|
1034 | 0.0, | |
854 | 0 |
|
1035 | 0 | |
855 | ], |
|
1036 | ], | |
856 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
1037 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
857 | "shortlog": [ |
|
1038 | "shortlog": [ | |
858 | { |
|
1039 | { | |
859 | "bookmarks": [], |
|
1040 | "bookmarks": [], | |
860 | "branch": "default", |
|
1041 | "branch": "default", | |
861 | "date": [ |
|
1042 | "date": [ | |
862 | 0.0, |
|
1043 | 0.0, | |
863 | 0 |
|
1044 | 0 | |
864 | ], |
|
1045 | ], | |
865 | "desc": "merge test-branch into default", |
|
1046 | "desc": "merge test-branch into default", | |
866 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
1047 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
867 | "parents": [ |
|
1048 | "parents": [ | |
868 | "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
1049 | "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
869 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" |
|
1050 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" | |
870 | ], |
|
1051 | ], | |
871 | "phase": "draft", |
|
1052 | "phase": "draft", | |
872 | "tags": [ |
|
1053 | "tags": [ | |
873 | "tip" |
|
1054 | "tip" | |
874 | ], |
|
1055 | ], | |
875 | "user": "test" |
|
1056 | "user": "test" | |
876 | }, |
|
1057 | }, | |
877 | { |
|
1058 | { | |
878 | "bookmarks": [], |
|
1059 | "bookmarks": [], | |
879 | "branch": "test-branch", |
|
1060 | "branch": "test-branch", | |
880 | "date": [ |
|
1061 | "date": [ | |
881 | 0.0, |
|
1062 | 0.0, | |
882 | 0 |
|
1063 | 0 | |
883 | ], |
|
1064 | ], | |
884 | "desc": "another commit in test-branch", |
|
1065 | "desc": "another commit in test-branch", | |
885 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", |
|
1066 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |
886 | "parents": [ |
|
1067 | "parents": [ | |
887 | "6ab967a8ab3489227a83f80e920faa039a71819f" |
|
1068 | "6ab967a8ab3489227a83f80e920faa039a71819f" | |
888 | ], |
|
1069 | ], | |
889 | "phase": "draft", |
|
1070 | "phase": "draft", | |
890 | "tags": [], |
|
1071 | "tags": [], | |
891 | "user": "test" |
|
1072 | "user": "test" | |
892 | }, |
|
1073 | }, | |
893 | { |
|
1074 | { | |
894 | "bookmarks": [], |
|
1075 | "bookmarks": [], | |
895 | "branch": "test-branch", |
|
1076 | "branch": "test-branch", | |
896 | "date": [ |
|
1077 | "date": [ | |
897 | 0.0, |
|
1078 | 0.0, | |
898 | 0 |
|
1079 | 0 | |
899 | ], |
|
1080 | ], | |
900 | "desc": "create test branch", |
|
1081 | "desc": "create test branch", | |
901 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", |
|
1082 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |
902 | "parents": [ |
|
1083 | "parents": [ | |
903 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1084 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
904 | ], |
|
1085 | ], | |
905 | "phase": "draft", |
|
1086 | "phase": "draft", | |
906 | "tags": [], |
|
1087 | "tags": [], | |
907 | "user": "test" |
|
1088 | "user": "test" | |
908 | }, |
|
1089 | }, | |
909 | { |
|
1090 | { | |
910 | "bookmarks": [ |
|
1091 | "bookmarks": [ | |
911 | "bookmark2" |
|
1092 | "bookmark2" | |
912 | ], |
|
1093 | ], | |
913 | "branch": "default", |
|
1094 | "branch": "default", | |
914 | "date": [ |
|
1095 | "date": [ | |
915 | 0.0, |
|
1096 | 0.0, | |
916 | 0 |
|
1097 | 0 | |
917 | ], |
|
1098 | ], | |
918 | "desc": "create tag2", |
|
1099 | "desc": "create tag2", | |
919 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
1100 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
920 | "parents": [ |
|
1101 | "parents": [ | |
921 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" |
|
1102 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" | |
922 | ], |
|
1103 | ], | |
923 | "phase": "draft", |
|
1104 | "phase": "draft", | |
924 | "tags": [], |
|
1105 | "tags": [], | |
925 | "user": "test" |
|
1106 | "user": "test" | |
926 | }, |
|
1107 | }, | |
927 | { |
|
1108 | { | |
928 | "bookmarks": [], |
|
1109 | "bookmarks": [], | |
929 | "branch": "default", |
|
1110 | "branch": "default", | |
930 | "date": [ |
|
1111 | "date": [ | |
931 | 0.0, |
|
1112 | 0.0, | |
932 | 0 |
|
1113 | 0 | |
933 | ], |
|
1114 | ], | |
934 | "desc": "another commit to da/foo", |
|
1115 | "desc": "another commit to da/foo", | |
935 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
1116 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
936 | "parents": [ |
|
1117 | "parents": [ | |
937 | "93a8ce14f89156426b7fa981af8042da53f03aa0" |
|
1118 | "93a8ce14f89156426b7fa981af8042da53f03aa0" | |
938 | ], |
|
1119 | ], | |
939 | "phase": "draft", |
|
1120 | "phase": "draft", | |
940 | "tags": [ |
|
1121 | "tags": [ | |
941 | "tag2" |
|
1122 | "tag2" | |
942 | ], |
|
1123 | ], | |
943 | "user": "test" |
|
1124 | "user": "test" | |
944 | }, |
|
1125 | }, | |
945 | { |
|
1126 | { | |
946 | "bookmarks": [], |
|
1127 | "bookmarks": [], | |
947 | "branch": "default", |
|
1128 | "branch": "default", | |
948 | "date": [ |
|
1129 | "date": [ | |
949 | 0.0, |
|
1130 | 0.0, | |
950 | 0 |
|
1131 | 0 | |
951 | ], |
|
1132 | ], | |
952 | "desc": "create tag", |
|
1133 | "desc": "create tag", | |
953 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", |
|
1134 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", | |
954 | "parents": [ |
|
1135 | "parents": [ | |
955 | "78896eb0e102174ce9278438a95e12543e4367a7" |
|
1136 | "78896eb0e102174ce9278438a95e12543e4367a7" | |
956 | ], |
|
1137 | ], | |
957 | "phase": "public", |
|
1138 | "phase": "public", | |
958 | "tags": [], |
|
1139 | "tags": [], | |
959 | "user": "test" |
|
1140 | "user": "test" | |
960 | }, |
|
1141 | }, | |
961 | { |
|
1142 | { | |
962 | "bookmarks": [], |
|
1143 | "bookmarks": [], | |
963 | "branch": "default", |
|
1144 | "branch": "default", | |
964 | "date": [ |
|
1145 | "date": [ | |
965 | 0.0, |
|
1146 | 0.0, | |
966 | 0 |
|
1147 | 0 | |
967 | ], |
|
1148 | ], | |
968 | "desc": "move foo", |
|
1149 | "desc": "move foo", | |
969 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
1150 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
970 | "parents": [ |
|
1151 | "parents": [ | |
971 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
1152 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
972 | ], |
|
1153 | ], | |
973 | "phase": "public", |
|
1154 | "phase": "public", | |
974 | "tags": [ |
|
1155 | "tags": [ | |
975 | "tag1" |
|
1156 | "tag1" | |
976 | ], |
|
1157 | ], | |
977 | "user": "test" |
|
1158 | "user": "test" | |
978 | }, |
|
1159 | }, | |
979 | { |
|
1160 | { | |
980 | "bookmarks": [ |
|
1161 | "bookmarks": [ | |
981 | "bookmark1" |
|
1162 | "bookmark1" | |
982 | ], |
|
1163 | ], | |
983 | "branch": "default", |
|
1164 | "branch": "default", | |
984 | "date": [ |
|
1165 | "date": [ | |
985 | 0.0, |
|
1166 | 0.0, | |
986 | 0 |
|
1167 | 0 | |
987 | ], |
|
1168 | ], | |
988 | "desc": "modify da/foo", |
|
1169 | "desc": "modify da/foo", | |
989 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", |
|
1170 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |
990 | "parents": [ |
|
1171 | "parents": [ | |
991 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
1172 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
992 | ], |
|
1173 | ], | |
993 | "phase": "public", |
|
1174 | "phase": "public", | |
994 | "tags": [], |
|
1175 | "tags": [], | |
995 | "user": "test" |
|
1176 | "user": "test" | |
996 | }, |
|
1177 | }, | |
997 | { |
|
1178 | { | |
998 | "bookmarks": [], |
|
1179 | "bookmarks": [], | |
999 | "branch": "default", |
|
1180 | "branch": "default", | |
1000 | "date": [ |
|
1181 | "date": [ | |
1001 | 0.0, |
|
1182 | 0.0, | |
1002 | 0 |
|
1183 | 0 | |
1003 | ], |
|
1184 | ], | |
1004 | "desc": "modify foo", |
|
1185 | "desc": "modify foo", | |
1005 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1186 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1006 | "parents": [ |
|
1187 | "parents": [ | |
1007 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1188 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1008 | ], |
|
1189 | ], | |
1009 | "phase": "public", |
|
1190 | "phase": "public", | |
1010 | "tags": [], |
|
1191 | "tags": [], | |
1011 | "user": "test" |
|
1192 | "user": "test" | |
1012 | }, |
|
1193 | }, | |
1013 | { |
|
1194 | { | |
1014 | "bookmarks": [], |
|
1195 | "bookmarks": [], | |
1015 | "branch": "default", |
|
1196 | "branch": "default", | |
1016 | "date": [ |
|
1197 | "date": [ | |
1017 | 0.0, |
|
1198 | 0.0, | |
1018 | 0 |
|
1199 | 0 | |
1019 | ], |
|
1200 | ], | |
1020 | "desc": "initial", |
|
1201 | "desc": "initial", | |
1021 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
1202 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
1022 | "parents": [], |
|
1203 | "parents": [], | |
1023 | "phase": "public", |
|
1204 | "phase": "public", | |
1024 | "tags": [], |
|
1205 | "tags": [], | |
1025 | "user": "test" |
|
1206 | "user": "test" | |
1026 | } |
|
1207 | } | |
1027 | ], |
|
1208 | ], | |
1028 | "tags": [ |
|
1209 | "tags": [ | |
1029 | { |
|
1210 | { | |
1030 | "date": [ |
|
1211 | "date": [ | |
1031 | 0.0, |
|
1212 | 0.0, | |
1032 | 0 |
|
1213 | 0 | |
1033 | ], |
|
1214 | ], | |
1034 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
1215 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
1035 | "tag": "tag2" |
|
1216 | "tag": "tag2" | |
1036 | }, |
|
1217 | }, | |
1037 | { |
|
1218 | { | |
1038 | "date": [ |
|
1219 | "date": [ | |
1039 | 0.0, |
|
1220 | 0.0, | |
1040 | 0 |
|
1221 | 0 | |
1041 | ], |
|
1222 | ], | |
1042 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
1223 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
1043 | "tag": "tag1" |
|
1224 | "tag": "tag1" | |
1044 | } |
|
1225 | } | |
1045 | ] |
|
1226 | ] | |
1046 | } |
|
1227 | } | |
1047 |
|
1228 | |||
1048 | $ request json-changelog?rev=create |
|
1229 | $ request json-changelog?rev=create | |
1049 | 200 Script output follows |
|
1230 | 200 Script output follows | |
1050 |
|
1231 | |||
1051 | { |
|
1232 | { | |
1052 | "entries": [ |
|
1233 | "entries": [ | |
1053 | { |
|
1234 | { | |
1054 | "bookmarks": [], |
|
1235 | "bookmarks": [], | |
1055 | "branch": "test-branch", |
|
1236 | "branch": "test-branch", | |
1056 | "date": [ |
|
1237 | "date": [ | |
1057 | 0.0, |
|
1238 | 0.0, | |
1058 | 0 |
|
1239 | 0 | |
1059 | ], |
|
1240 | ], | |
1060 | "desc": "create test branch", |
|
1241 | "desc": "create test branch", | |
1061 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", |
|
1242 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |
1062 | "parents": [ |
|
1243 | "parents": [ | |
1063 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1244 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1064 | ], |
|
1245 | ], | |
1065 | "phase": "draft", |
|
1246 | "phase": "draft", | |
1066 | "tags": [], |
|
1247 | "tags": [], | |
1067 | "user": "test" |
|
1248 | "user": "test" | |
1068 | }, |
|
1249 | }, | |
1069 | { |
|
1250 | { | |
1070 | "bookmarks": [ |
|
1251 | "bookmarks": [ | |
1071 | "bookmark2" |
|
1252 | "bookmark2" | |
1072 | ], |
|
1253 | ], | |
1073 | "branch": "default", |
|
1254 | "branch": "default", | |
1074 | "date": [ |
|
1255 | "date": [ | |
1075 | 0.0, |
|
1256 | 0.0, | |
1076 | 0 |
|
1257 | 0 | |
1077 | ], |
|
1258 | ], | |
1078 | "desc": "create tag2", |
|
1259 | "desc": "create tag2", | |
1079 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
1260 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
1080 | "parents": [ |
|
1261 | "parents": [ | |
1081 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" |
|
1262 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" | |
1082 | ], |
|
1263 | ], | |
1083 | "phase": "draft", |
|
1264 | "phase": "draft", | |
1084 | "tags": [], |
|
1265 | "tags": [], | |
1085 | "user": "test" |
|
1266 | "user": "test" | |
1086 | }, |
|
1267 | }, | |
1087 | { |
|
1268 | { | |
1088 | "bookmarks": [], |
|
1269 | "bookmarks": [], | |
1089 | "branch": "default", |
|
1270 | "branch": "default", | |
1090 | "date": [ |
|
1271 | "date": [ | |
1091 | 0.0, |
|
1272 | 0.0, | |
1092 | 0 |
|
1273 | 0 | |
1093 | ], |
|
1274 | ], | |
1094 | "desc": "create tag", |
|
1275 | "desc": "create tag", | |
1095 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", |
|
1276 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", | |
1096 | "parents": [ |
|
1277 | "parents": [ | |
1097 | "78896eb0e102174ce9278438a95e12543e4367a7" |
|
1278 | "78896eb0e102174ce9278438a95e12543e4367a7" | |
1098 | ], |
|
1279 | ], | |
1099 | "phase": "public", |
|
1280 | "phase": "public", | |
1100 | "tags": [], |
|
1281 | "tags": [], | |
1101 | "user": "test" |
|
1282 | "user": "test" | |
1102 | } |
|
1283 | } | |
1103 | ], |
|
1284 | ], | |
1104 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
1285 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
1105 | "query": "create" |
|
1286 | "query": "create" | |
1106 | } |
|
1287 | } | |
1107 |
|
1288 | |||
1108 | filediff/{revision}/{path} shows changes to a file in a revision |
|
1289 | filediff/{revision}/{path} shows changes to a file in a revision | |
1109 |
|
1290 | |||
1110 | $ request json-diff/f8bbb9024b10/foo |
|
1291 | $ request json-diff/f8bbb9024b10/foo | |
1111 | 200 Script output follows |
|
1292 | 200 Script output follows | |
1112 |
|
1293 | |||
1113 | { |
|
1294 | { | |
1114 | "author": "test", |
|
1295 | "author": "test", | |
1115 | "children": [], |
|
1296 | "children": [], | |
1116 | "date": [ |
|
1297 | "date": [ | |
1117 | 0.0, |
|
1298 | 0.0, | |
1118 | 0 |
|
1299 | 0 | |
1119 | ], |
|
1300 | ], | |
1120 | "desc": "modify foo", |
|
1301 | "desc": "modify foo", | |
1121 | "diff": [ |
|
1302 | "diff": [ | |
1122 | { |
|
1303 | { | |
1123 | "blockno": 1, |
|
1304 | "blockno": 1, | |
1124 | "lines": [ |
|
1305 | "lines": [ | |
1125 | { |
|
1306 | { | |
1126 | "l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n", |
|
1307 | "l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n", | |
1127 | "n": 1, |
|
1308 | "n": 1, | |
1128 | "t": "-" |
|
1309 | "t": "-" | |
1129 | }, |
|
1310 | }, | |
1130 | { |
|
1311 | { | |
1131 | "l": "+++ b/foo\tThu Jan 01 00:00:00 1970 +0000\n", |
|
1312 | "l": "+++ b/foo\tThu Jan 01 00:00:00 1970 +0000\n", | |
1132 | "n": 2, |
|
1313 | "n": 2, | |
1133 | "t": "+" |
|
1314 | "t": "+" | |
1134 | }, |
|
1315 | }, | |
1135 | { |
|
1316 | { | |
1136 | "l": "@@ -1,1 +1,1 @@\n", |
|
1317 | "l": "@@ -1,1 +1,1 @@\n", | |
1137 | "n": 3, |
|
1318 | "n": 3, | |
1138 | "t": "@" |
|
1319 | "t": "@" | |
1139 | }, |
|
1320 | }, | |
1140 | { |
|
1321 | { | |
1141 | "l": "-foo\n", |
|
1322 | "l": "-foo\n", | |
1142 | "n": 4, |
|
1323 | "n": 4, | |
1143 | "t": "-" |
|
1324 | "t": "-" | |
1144 | }, |
|
1325 | }, | |
1145 | { |
|
1326 | { | |
1146 | "l": "+bar\n", |
|
1327 | "l": "+bar\n", | |
1147 | "n": 5, |
|
1328 | "n": 5, | |
1148 | "t": "+" |
|
1329 | "t": "+" | |
1149 | } |
|
1330 | } | |
1150 | ] |
|
1331 | ] | |
1151 | } |
|
1332 | } | |
1152 | ], |
|
1333 | ], | |
1153 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1334 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1154 | "parents": [ |
|
1335 | "parents": [ | |
1155 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1336 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1156 | ], |
|
1337 | ], | |
1157 | "path": "foo" |
|
1338 | "path": "foo" | |
1158 | } |
|
1339 | } | |
1159 |
|
1340 | |||
1160 | comparison/{revision}/{path} shows information about before and after for a file |
|
1341 | comparison/{revision}/{path} shows information about before and after for a file | |
1161 |
|
1342 | |||
1162 | $ request json-comparison/f8bbb9024b10/foo |
|
1343 | $ request json-comparison/f8bbb9024b10/foo | |
1163 | 200 Script output follows |
|
1344 | 200 Script output follows | |
1164 |
|
1345 | |||
1165 | { |
|
1346 | { | |
1166 | "author": "test", |
|
1347 | "author": "test", | |
1167 | "children": [], |
|
1348 | "children": [], | |
1168 | "comparison": [ |
|
1349 | "comparison": [ | |
1169 | { |
|
1350 | { | |
1170 | "lines": [ |
|
1351 | "lines": [ | |
1171 | { |
|
1352 | { | |
1172 | "ll": "foo", |
|
1353 | "ll": "foo", | |
1173 | "ln": 1, |
|
1354 | "ln": 1, | |
1174 | "rl": "bar", |
|
1355 | "rl": "bar", | |
1175 | "rn": 1, |
|
1356 | "rn": 1, | |
1176 | "t": "replace" |
|
1357 | "t": "replace" | |
1177 | } |
|
1358 | } | |
1178 | ] |
|
1359 | ] | |
1179 | } |
|
1360 | } | |
1180 | ], |
|
1361 | ], | |
1181 | "date": [ |
|
1362 | "date": [ | |
1182 | 0.0, |
|
1363 | 0.0, | |
1183 | 0 |
|
1364 | 0 | |
1184 | ], |
|
1365 | ], | |
1185 | "desc": "modify foo", |
|
1366 | "desc": "modify foo", | |
1186 | "leftnode": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
1367 | "leftnode": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
1187 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1368 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1188 | "parents": [ |
|
1369 | "parents": [ | |
1189 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1370 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1190 | ], |
|
1371 | ], | |
1191 | "path": "foo", |
|
1372 | "path": "foo", | |
1192 | "rightnode": "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
1373 | "rightnode": "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
1193 | } |
|
1374 | } | |
1194 |
|
1375 | |||
1195 | annotate/{revision}/{path} shows annotations for each line |
|
1376 | annotate/{revision}/{path} shows annotations for each line | |
1196 |
|
1377 | |||
1197 | $ request json-annotate/f8bbb9024b10/foo |
|
1378 | $ request json-annotate/f8bbb9024b10/foo | |
1198 | 200 Script output follows |
|
1379 | 200 Script output follows | |
1199 |
|
1380 | |||
1200 | { |
|
1381 | { | |
1201 | "abspath": "foo", |
|
1382 | "abspath": "foo", | |
1202 | "annotate": [ |
|
1383 | "annotate": [ | |
1203 | { |
|
1384 | { | |
1204 | "abspath": "foo", |
|
1385 | "abspath": "foo", | |
1205 | "author": "test", |
|
1386 | "author": "test", | |
1206 | "desc": "modify foo", |
|
1387 | "desc": "modify foo", | |
1207 | "line": "bar\n", |
|
1388 | "line": "bar\n", | |
1208 | "lineno": 1, |
|
1389 | "lineno": 1, | |
1209 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1390 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1210 | "revdate": [ |
|
1391 | "revdate": [ | |
1211 | 0.0, |
|
1392 | 0.0, | |
1212 | 0 |
|
1393 | 0 | |
1213 | ], |
|
1394 | ], | |
1214 | "targetline": 1 |
|
1395 | "targetline": 1 | |
1215 | } |
|
1396 | } | |
1216 | ], |
|
1397 | ], | |
1217 | "author": "test", |
|
1398 | "author": "test", | |
1218 | "children": [], |
|
1399 | "children": [], | |
1219 | "date": [ |
|
1400 | "date": [ | |
1220 | 0.0, |
|
1401 | 0.0, | |
1221 | 0 |
|
1402 | 0 | |
1222 | ], |
|
1403 | ], | |
1223 | "desc": "modify foo", |
|
1404 | "desc": "modify foo", | |
1224 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1405 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1225 | "parents": [ |
|
1406 | "parents": [ | |
1226 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1407 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1227 | ], |
|
1408 | ], | |
1228 | "permissions": "" |
|
1409 | "permissions": "" | |
1229 | } |
|
1410 | } | |
1230 |
|
1411 | |||
1231 | filelog/{revision}/{path} shows history of a single file |
|
1412 | filelog/{revision}/{path} shows history of a single file | |
1232 |
|
1413 | |||
1233 | $ request json-filelog/f8bbb9024b10/foo |
|
1414 | $ request json-filelog/f8bbb9024b10/foo | |
1234 | 200 Script output follows |
|
1415 | 200 Script output follows | |
1235 |
|
1416 | |||
1236 | { |
|
1417 | { | |
1237 | "entries": [ |
|
1418 | "entries": [ | |
1238 | { |
|
1419 | { | |
1239 | "bookmarks": [], |
|
1420 | "bookmarks": [], | |
1240 | "branch": "default", |
|
1421 | "branch": "default", | |
1241 | "date": [ |
|
1422 | "date": [ | |
1242 | 0.0, |
|
1423 | 0.0, | |
1243 | 0 |
|
1424 | 0 | |
1244 | ], |
|
1425 | ], | |
1245 | "desc": "modify foo", |
|
1426 | "desc": "modify foo", | |
1246 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1427 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1247 | "parents": [ |
|
1428 | "parents": [ | |
1248 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1429 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1249 | ], |
|
1430 | ], | |
1250 | "phase": "public", |
|
1431 | "phase": "public", | |
1251 | "tags": [], |
|
1432 | "tags": [], | |
1252 | "user": "test" |
|
1433 | "user": "test" | |
1253 | }, |
|
1434 | }, | |
1254 | { |
|
1435 | { | |
1255 | "bookmarks": [], |
|
1436 | "bookmarks": [], | |
1256 | "branch": "default", |
|
1437 | "branch": "default", | |
1257 | "date": [ |
|
1438 | "date": [ | |
1258 | 0.0, |
|
1439 | 0.0, | |
1259 | 0 |
|
1440 | 0 | |
1260 | ], |
|
1441 | ], | |
1261 | "desc": "initial", |
|
1442 | "desc": "initial", | |
1262 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
1443 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
1263 | "parents": [], |
|
1444 | "parents": [], | |
1264 | "phase": "public", |
|
1445 | "phase": "public", | |
1265 | "tags": [], |
|
1446 | "tags": [], | |
1266 | "user": "test" |
|
1447 | "user": "test" | |
1267 | } |
|
1448 | } | |
1268 | ] |
|
1449 | ] | |
1269 | } |
|
1450 | } | |
1270 |
|
1451 | |||
1271 | $ request json-filelog/cc725e08502a/da/foo |
|
1452 | $ request json-filelog/cc725e08502a/da/foo | |
1272 | 200 Script output follows |
|
1453 | 200 Script output follows | |
1273 |
|
1454 | |||
1274 | { |
|
1455 | { | |
1275 | "entries": [ |
|
1456 | "entries": [ | |
1276 | { |
|
1457 | { | |
1277 | "bookmarks": [], |
|
1458 | "bookmarks": [], | |
1278 | "branch": "default", |
|
1459 | "branch": "default", | |
1279 | "date": [ |
|
1460 | "date": [ | |
1280 | 0.0, |
|
1461 | 0.0, | |
1281 | 0 |
|
1462 | 0 | |
1282 | ], |
|
1463 | ], | |
1283 | "desc": "another commit to da/foo", |
|
1464 | "desc": "another commit to da/foo", | |
1284 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
1465 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
1285 | "parents": [ |
|
1466 | "parents": [ | |
1286 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
1467 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
1287 | ], |
|
1468 | ], | |
1288 | "phase": "draft", |
|
1469 | "phase": "draft", | |
1289 | "tags": [ |
|
1470 | "tags": [ | |
1290 | "tag2" |
|
1471 | "tag2" | |
1291 | ], |
|
1472 | ], | |
1292 | "user": "test" |
|
1473 | "user": "test" | |
1293 | }, |
|
1474 | }, | |
1294 | { |
|
1475 | { | |
1295 | "bookmarks": [ |
|
1476 | "bookmarks": [ | |
1296 | "bookmark1" |
|
1477 | "bookmark1" | |
1297 | ], |
|
1478 | ], | |
1298 | "branch": "default", |
|
1479 | "branch": "default", | |
1299 | "date": [ |
|
1480 | "date": [ | |
1300 | 0.0, |
|
1481 | 0.0, | |
1301 | 0 |
|
1482 | 0 | |
1302 | ], |
|
1483 | ], | |
1303 | "desc": "modify da/foo", |
|
1484 | "desc": "modify da/foo", | |
1304 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", |
|
1485 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |
1305 | "parents": [ |
|
1486 | "parents": [ | |
1306 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1487 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1307 | ], |
|
1488 | ], | |
1308 | "phase": "public", |
|
1489 | "phase": "public", | |
1309 | "tags": [], |
|
1490 | "tags": [], | |
1310 | "user": "test" |
|
1491 | "user": "test" | |
1311 | }, |
|
1492 | }, | |
1312 | { |
|
1493 | { | |
1313 | "bookmarks": [], |
|
1494 | "bookmarks": [], | |
1314 | "branch": "default", |
|
1495 | "branch": "default", | |
1315 | "date": [ |
|
1496 | "date": [ | |
1316 | 0.0, |
|
1497 | 0.0, | |
1317 | 0 |
|
1498 | 0 | |
1318 | ], |
|
1499 | ], | |
1319 | "desc": "initial", |
|
1500 | "desc": "initial", | |
1320 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
1501 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
1321 | "parents": [], |
|
1502 | "parents": [], | |
1322 | "phase": "public", |
|
1503 | "phase": "public", | |
1323 | "tags": [], |
|
1504 | "tags": [], | |
1324 | "user": "test" |
|
1505 | "user": "test" | |
1325 | } |
|
1506 | } | |
1326 | ] |
|
1507 | ] | |
1327 | } |
|
1508 | } | |
1328 |
|
1509 | |||
1329 | (archive/ doesn't use templating, so ignore it) |
|
1510 | (archive/ doesn't use templating, so ignore it) | |
1330 |
|
1511 | |||
1331 | (static/ doesn't use templating, so ignore it) |
|
1512 | (static/ doesn't use templating, so ignore it) | |
1332 |
|
1513 | |||
1333 | graph/ shows information that can be used to render a graph of the DAG |
|
1514 | graph/ shows information that can be used to render a graph of the DAG | |
1334 |
|
1515 | |||
1335 | $ request json-graph |
|
1516 | $ request json-graph | |
1336 | 200 Script output follows |
|
1517 | 200 Script output follows | |
1337 |
|
1518 | |||
1338 | { |
|
1519 | { | |
1339 | "changeset_count": 10, |
|
1520 | "changeset_count": 10, | |
1340 | "changesets": [ |
|
1521 | "changesets": [ | |
1341 | { |
|
1522 | { | |
1342 | "bookmarks": [], |
|
1523 | "bookmarks": [], | |
1343 | "branch": "default", |
|
1524 | "branch": "default", | |
1344 | "col": 0, |
|
1525 | "col": 0, | |
1345 | "color": 1, |
|
1526 | "color": 1, | |
1346 | "date": [ |
|
1527 | "date": [ | |
1347 | 0.0, |
|
1528 | 0.0, | |
1348 | 0 |
|
1529 | 0 | |
1349 | ], |
|
1530 | ], | |
1350 | "desc": "merge test-branch into default", |
|
1531 | "desc": "merge test-branch into default", | |
1351 | "edges": [ |
|
1532 | "edges": [ | |
1352 | { |
|
1533 | { | |
1353 | "bcolor": "", |
|
1534 | "bcolor": "", | |
1354 | "col": 0, |
|
1535 | "col": 0, | |
1355 | "color": 1, |
|
1536 | "color": 1, | |
1356 | "nextcol": 0, |
|
1537 | "nextcol": 0, | |
1357 | "width": -1 |
|
1538 | "width": -1 | |
1358 | }, |
|
1539 | }, | |
1359 | { |
|
1540 | { | |
1360 | "bcolor": "", |
|
1541 | "bcolor": "", | |
1361 | "col": 0, |
|
1542 | "col": 0, | |
1362 | "color": 1, |
|
1543 | "color": 1, | |
1363 | "nextcol": 1, |
|
1544 | "nextcol": 1, | |
1364 | "width": -1 |
|
1545 | "width": -1 | |
1365 | } |
|
1546 | } | |
1366 | ], |
|
1547 | ], | |
1367 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", |
|
1548 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7", | |
1368 | "parents": [ |
|
1549 | "parents": [ | |
1369 | "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
1550 | "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
1370 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" |
|
1551 | "ed66c30e87eb65337c05a4229efaa5f1d5285a90" | |
1371 | ], |
|
1552 | ], | |
1372 | "phase": "draft", |
|
1553 | "phase": "draft", | |
1373 | "row": 0, |
|
1554 | "row": 0, | |
1374 | "tags": [ |
|
1555 | "tags": [ | |
1375 | "tip" |
|
1556 | "tip" | |
1376 | ], |
|
1557 | ], | |
1377 | "user": "test" |
|
1558 | "user": "test" | |
1378 | }, |
|
1559 | }, | |
1379 | { |
|
1560 | { | |
1380 | "bookmarks": [], |
|
1561 | "bookmarks": [], | |
1381 | "branch": "test-branch", |
|
1562 | "branch": "test-branch", | |
1382 | "col": 1, |
|
1563 | "col": 1, | |
1383 | "color": 2, |
|
1564 | "color": 2, | |
1384 | "date": [ |
|
1565 | "date": [ | |
1385 | 0.0, |
|
1566 | 0.0, | |
1386 | 0 |
|
1567 | 0 | |
1387 | ], |
|
1568 | ], | |
1388 | "desc": "another commit in test-branch", |
|
1569 | "desc": "another commit in test-branch", | |
1389 | "edges": [ |
|
1570 | "edges": [ | |
1390 | { |
|
1571 | { | |
1391 | "bcolor": "", |
|
1572 | "bcolor": "", | |
1392 | "col": 0, |
|
1573 | "col": 0, | |
1393 | "color": 1, |
|
1574 | "color": 1, | |
1394 | "nextcol": 0, |
|
1575 | "nextcol": 0, | |
1395 | "width": -1 |
|
1576 | "width": -1 | |
1396 | }, |
|
1577 | }, | |
1397 | { |
|
1578 | { | |
1398 | "bcolor": "", |
|
1579 | "bcolor": "", | |
1399 | "col": 1, |
|
1580 | "col": 1, | |
1400 | "color": 2, |
|
1581 | "color": 2, | |
1401 | "nextcol": 1, |
|
1582 | "nextcol": 1, | |
1402 | "width": -1 |
|
1583 | "width": -1 | |
1403 | } |
|
1584 | } | |
1404 | ], |
|
1585 | ], | |
1405 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", |
|
1586 | "node": "ed66c30e87eb65337c05a4229efaa5f1d5285a90", | |
1406 | "parents": [ |
|
1587 | "parents": [ | |
1407 | "6ab967a8ab3489227a83f80e920faa039a71819f" |
|
1588 | "6ab967a8ab3489227a83f80e920faa039a71819f" | |
1408 | ], |
|
1589 | ], | |
1409 | "phase": "draft", |
|
1590 | "phase": "draft", | |
1410 | "row": 1, |
|
1591 | "row": 1, | |
1411 | "tags": [], |
|
1592 | "tags": [], | |
1412 | "user": "test" |
|
1593 | "user": "test" | |
1413 | }, |
|
1594 | }, | |
1414 | { |
|
1595 | { | |
1415 | "bookmarks": [], |
|
1596 | "bookmarks": [], | |
1416 | "branch": "test-branch", |
|
1597 | "branch": "test-branch", | |
1417 | "col": 1, |
|
1598 | "col": 1, | |
1418 | "color": 2, |
|
1599 | "color": 2, | |
1419 | "date": [ |
|
1600 | "date": [ | |
1420 | 0.0, |
|
1601 | 0.0, | |
1421 | 0 |
|
1602 | 0 | |
1422 | ], |
|
1603 | ], | |
1423 | "desc": "create test branch", |
|
1604 | "desc": "create test branch", | |
1424 | "edges": [ |
|
1605 | "edges": [ | |
1425 | { |
|
1606 | { | |
1426 | "bcolor": "", |
|
1607 | "bcolor": "", | |
1427 | "col": 0, |
|
1608 | "col": 0, | |
1428 | "color": 1, |
|
1609 | "color": 1, | |
1429 | "nextcol": 0, |
|
1610 | "nextcol": 0, | |
1430 | "width": -1 |
|
1611 | "width": -1 | |
1431 | }, |
|
1612 | }, | |
1432 | { |
|
1613 | { | |
1433 | "bcolor": "", |
|
1614 | "bcolor": "", | |
1434 | "col": 1, |
|
1615 | "col": 1, | |
1435 | "color": 2, |
|
1616 | "color": 2, | |
1436 | "nextcol": 1, |
|
1617 | "nextcol": 1, | |
1437 | "width": -1 |
|
1618 | "width": -1 | |
1438 | } |
|
1619 | } | |
1439 | ], |
|
1620 | ], | |
1440 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", |
|
1621 | "node": "6ab967a8ab3489227a83f80e920faa039a71819f", | |
1441 | "parents": [ |
|
1622 | "parents": [ | |
1442 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1623 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1443 | ], |
|
1624 | ], | |
1444 | "phase": "draft", |
|
1625 | "phase": "draft", | |
1445 | "row": 2, |
|
1626 | "row": 2, | |
1446 | "tags": [], |
|
1627 | "tags": [], | |
1447 | "user": "test" |
|
1628 | "user": "test" | |
1448 | }, |
|
1629 | }, | |
1449 | { |
|
1630 | { | |
1450 | "bookmarks": [ |
|
1631 | "bookmarks": [ | |
1451 | "bookmark2" |
|
1632 | "bookmark2" | |
1452 | ], |
|
1633 | ], | |
1453 | "branch": "default", |
|
1634 | "branch": "default", | |
1454 | "col": 0, |
|
1635 | "col": 0, | |
1455 | "color": 1, |
|
1636 | "color": 1, | |
1456 | "date": [ |
|
1637 | "date": [ | |
1457 | 0.0, |
|
1638 | 0.0, | |
1458 | 0 |
|
1639 | 0 | |
1459 | ], |
|
1640 | ], | |
1460 | "desc": "create tag2", |
|
1641 | "desc": "create tag2", | |
1461 | "edges": [ |
|
1642 | "edges": [ | |
1462 | { |
|
1643 | { | |
1463 | "bcolor": "", |
|
1644 | "bcolor": "", | |
1464 | "col": 0, |
|
1645 | "col": 0, | |
1465 | "color": 1, |
|
1646 | "color": 1, | |
1466 | "nextcol": 0, |
|
1647 | "nextcol": 0, | |
1467 | "width": -1 |
|
1648 | "width": -1 | |
1468 | }, |
|
1649 | }, | |
1469 | { |
|
1650 | { | |
1470 | "bcolor": "", |
|
1651 | "bcolor": "", | |
1471 | "col": 1, |
|
1652 | "col": 1, | |
1472 | "color": 2, |
|
1653 | "color": 2, | |
1473 | "nextcol": 1, |
|
1654 | "nextcol": 1, | |
1474 | "width": -1 |
|
1655 | "width": -1 | |
1475 | } |
|
1656 | } | |
1476 | ], |
|
1657 | ], | |
1477 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", |
|
1658 | "node": "ceed296fe500c3fac9541e31dad860cb49c89e45", | |
1478 | "parents": [ |
|
1659 | "parents": [ | |
1479 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" |
|
1660 | "f2890a05fea49bfaf9fb27ed5490894eba32da78" | |
1480 | ], |
|
1661 | ], | |
1481 | "phase": "draft", |
|
1662 | "phase": "draft", | |
1482 | "row": 3, |
|
1663 | "row": 3, | |
1483 | "tags": [], |
|
1664 | "tags": [], | |
1484 | "user": "test" |
|
1665 | "user": "test" | |
1485 | }, |
|
1666 | }, | |
1486 | { |
|
1667 | { | |
1487 | "bookmarks": [], |
|
1668 | "bookmarks": [], | |
1488 | "branch": "default", |
|
1669 | "branch": "default", | |
1489 | "col": 0, |
|
1670 | "col": 0, | |
1490 | "color": 1, |
|
1671 | "color": 1, | |
1491 | "date": [ |
|
1672 | "date": [ | |
1492 | 0.0, |
|
1673 | 0.0, | |
1493 | 0 |
|
1674 | 0 | |
1494 | ], |
|
1675 | ], | |
1495 | "desc": "another commit to da/foo", |
|
1676 | "desc": "another commit to da/foo", | |
1496 | "edges": [ |
|
1677 | "edges": [ | |
1497 | { |
|
1678 | { | |
1498 | "bcolor": "", |
|
1679 | "bcolor": "", | |
1499 | "col": 0, |
|
1680 | "col": 0, | |
1500 | "color": 1, |
|
1681 | "color": 1, | |
1501 | "nextcol": 0, |
|
1682 | "nextcol": 0, | |
1502 | "width": -1 |
|
1683 | "width": -1 | |
1503 | }, |
|
1684 | }, | |
1504 | { |
|
1685 | { | |
1505 | "bcolor": "", |
|
1686 | "bcolor": "", | |
1506 | "col": 1, |
|
1687 | "col": 1, | |
1507 | "color": 2, |
|
1688 | "color": 2, | |
1508 | "nextcol": 1, |
|
1689 | "nextcol": 1, | |
1509 | "width": -1 |
|
1690 | "width": -1 | |
1510 | } |
|
1691 | } | |
1511 | ], |
|
1692 | ], | |
1512 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", |
|
1693 | "node": "f2890a05fea49bfaf9fb27ed5490894eba32da78", | |
1513 | "parents": [ |
|
1694 | "parents": [ | |
1514 | "93a8ce14f89156426b7fa981af8042da53f03aa0" |
|
1695 | "93a8ce14f89156426b7fa981af8042da53f03aa0" | |
1515 | ], |
|
1696 | ], | |
1516 | "phase": "draft", |
|
1697 | "phase": "draft", | |
1517 | "row": 4, |
|
1698 | "row": 4, | |
1518 | "tags": [ |
|
1699 | "tags": [ | |
1519 | "tag2" |
|
1700 | "tag2" | |
1520 | ], |
|
1701 | ], | |
1521 | "user": "test" |
|
1702 | "user": "test" | |
1522 | }, |
|
1703 | }, | |
1523 | { |
|
1704 | { | |
1524 | "bookmarks": [], |
|
1705 | "bookmarks": [], | |
1525 | "branch": "default", |
|
1706 | "branch": "default", | |
1526 | "col": 0, |
|
1707 | "col": 0, | |
1527 | "color": 1, |
|
1708 | "color": 1, | |
1528 | "date": [ |
|
1709 | "date": [ | |
1529 | 0.0, |
|
1710 | 0.0, | |
1530 | 0 |
|
1711 | 0 | |
1531 | ], |
|
1712 | ], | |
1532 | "desc": "create tag", |
|
1713 | "desc": "create tag", | |
1533 | "edges": [ |
|
1714 | "edges": [ | |
1534 | { |
|
1715 | { | |
1535 | "bcolor": "", |
|
1716 | "bcolor": "", | |
1536 | "col": 0, |
|
1717 | "col": 0, | |
1537 | "color": 1, |
|
1718 | "color": 1, | |
1538 | "nextcol": 0, |
|
1719 | "nextcol": 0, | |
1539 | "width": -1 |
|
1720 | "width": -1 | |
1540 | }, |
|
1721 | }, | |
1541 | { |
|
1722 | { | |
1542 | "bcolor": "", |
|
1723 | "bcolor": "", | |
1543 | "col": 1, |
|
1724 | "col": 1, | |
1544 | "color": 2, |
|
1725 | "color": 2, | |
1545 | "nextcol": 1, |
|
1726 | "nextcol": 1, | |
1546 | "width": -1 |
|
1727 | "width": -1 | |
1547 | } |
|
1728 | } | |
1548 | ], |
|
1729 | ], | |
1549 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", |
|
1730 | "node": "93a8ce14f89156426b7fa981af8042da53f03aa0", | |
1550 | "parents": [ |
|
1731 | "parents": [ | |
1551 | "78896eb0e102174ce9278438a95e12543e4367a7" |
|
1732 | "78896eb0e102174ce9278438a95e12543e4367a7" | |
1552 | ], |
|
1733 | ], | |
1553 | "phase": "public", |
|
1734 | "phase": "public", | |
1554 | "row": 5, |
|
1735 | "row": 5, | |
1555 | "tags": [], |
|
1736 | "tags": [], | |
1556 | "user": "test" |
|
1737 | "user": "test" | |
1557 | }, |
|
1738 | }, | |
1558 | { |
|
1739 | { | |
1559 | "bookmarks": [], |
|
1740 | "bookmarks": [], | |
1560 | "branch": "default", |
|
1741 | "branch": "default", | |
1561 | "col": 0, |
|
1742 | "col": 0, | |
1562 | "color": 1, |
|
1743 | "color": 1, | |
1563 | "date": [ |
|
1744 | "date": [ | |
1564 | 0.0, |
|
1745 | 0.0, | |
1565 | 0 |
|
1746 | 0 | |
1566 | ], |
|
1747 | ], | |
1567 | "desc": "move foo", |
|
1748 | "desc": "move foo", | |
1568 | "edges": [ |
|
1749 | "edges": [ | |
1569 | { |
|
1750 | { | |
1570 | "bcolor": "", |
|
1751 | "bcolor": "", | |
1571 | "col": 0, |
|
1752 | "col": 0, | |
1572 | "color": 1, |
|
1753 | "color": 1, | |
1573 | "nextcol": 0, |
|
1754 | "nextcol": 0, | |
1574 | "width": -1 |
|
1755 | "width": -1 | |
1575 | }, |
|
1756 | }, | |
1576 | { |
|
1757 | { | |
1577 | "bcolor": "", |
|
1758 | "bcolor": "", | |
1578 | "col": 1, |
|
1759 | "col": 1, | |
1579 | "color": 2, |
|
1760 | "color": 2, | |
1580 | "nextcol": 1, |
|
1761 | "nextcol": 1, | |
1581 | "width": -1 |
|
1762 | "width": -1 | |
1582 | } |
|
1763 | } | |
1583 | ], |
|
1764 | ], | |
1584 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", |
|
1765 | "node": "78896eb0e102174ce9278438a95e12543e4367a7", | |
1585 | "parents": [ |
|
1766 | "parents": [ | |
1586 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" |
|
1767 | "8d7c456572acf3557e8ed8a07286b10c408bcec5" | |
1587 | ], |
|
1768 | ], | |
1588 | "phase": "public", |
|
1769 | "phase": "public", | |
1589 | "row": 6, |
|
1770 | "row": 6, | |
1590 | "tags": [ |
|
1771 | "tags": [ | |
1591 | "tag1" |
|
1772 | "tag1" | |
1592 | ], |
|
1773 | ], | |
1593 | "user": "test" |
|
1774 | "user": "test" | |
1594 | }, |
|
1775 | }, | |
1595 | { |
|
1776 | { | |
1596 | "bookmarks": [ |
|
1777 | "bookmarks": [ | |
1597 | "bookmark1" |
|
1778 | "bookmark1" | |
1598 | ], |
|
1779 | ], | |
1599 | "branch": "default", |
|
1780 | "branch": "default", | |
1600 | "col": 0, |
|
1781 | "col": 0, | |
1601 | "color": 1, |
|
1782 | "color": 1, | |
1602 | "date": [ |
|
1783 | "date": [ | |
1603 | 0.0, |
|
1784 | 0.0, | |
1604 | 0 |
|
1785 | 0 | |
1605 | ], |
|
1786 | ], | |
1606 | "desc": "modify da/foo", |
|
1787 | "desc": "modify da/foo", | |
1607 | "edges": [ |
|
1788 | "edges": [ | |
1608 | { |
|
1789 | { | |
1609 | "bcolor": "", |
|
1790 | "bcolor": "", | |
1610 | "col": 0, |
|
1791 | "col": 0, | |
1611 | "color": 1, |
|
1792 | "color": 1, | |
1612 | "nextcol": 0, |
|
1793 | "nextcol": 0, | |
1613 | "width": -1 |
|
1794 | "width": -1 | |
1614 | }, |
|
1795 | }, | |
1615 | { |
|
1796 | { | |
1616 | "bcolor": "", |
|
1797 | "bcolor": "", | |
1617 | "col": 1, |
|
1798 | "col": 1, | |
1618 | "color": 2, |
|
1799 | "color": 2, | |
1619 | "nextcol": 1, |
|
1800 | "nextcol": 1, | |
1620 | "width": -1 |
|
1801 | "width": -1 | |
1621 | } |
|
1802 | } | |
1622 | ], |
|
1803 | ], | |
1623 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", |
|
1804 | "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5", | |
1624 | "parents": [ |
|
1805 | "parents": [ | |
1625 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" |
|
1806 | "f8bbb9024b10f93cdbb8d940337398291d40dea8" | |
1626 | ], |
|
1807 | ], | |
1627 | "phase": "public", |
|
1808 | "phase": "public", | |
1628 | "row": 7, |
|
1809 | "row": 7, | |
1629 | "tags": [], |
|
1810 | "tags": [], | |
1630 | "user": "test" |
|
1811 | "user": "test" | |
1631 | }, |
|
1812 | }, | |
1632 | { |
|
1813 | { | |
1633 | "bookmarks": [], |
|
1814 | "bookmarks": [], | |
1634 | "branch": "default", |
|
1815 | "branch": "default", | |
1635 | "col": 0, |
|
1816 | "col": 0, | |
1636 | "color": 1, |
|
1817 | "color": 1, | |
1637 | "date": [ |
|
1818 | "date": [ | |
1638 | 0.0, |
|
1819 | 0.0, | |
1639 | 0 |
|
1820 | 0 | |
1640 | ], |
|
1821 | ], | |
1641 | "desc": "modify foo", |
|
1822 | "desc": "modify foo", | |
1642 | "edges": [ |
|
1823 | "edges": [ | |
1643 | { |
|
1824 | { | |
1644 | "bcolor": "", |
|
1825 | "bcolor": "", | |
1645 | "col": 0, |
|
1826 | "col": 0, | |
1646 | "color": 1, |
|
1827 | "color": 1, | |
1647 | "nextcol": 0, |
|
1828 | "nextcol": 0, | |
1648 | "width": -1 |
|
1829 | "width": -1 | |
1649 | }, |
|
1830 | }, | |
1650 | { |
|
1831 | { | |
1651 | "bcolor": "", |
|
1832 | "bcolor": "", | |
1652 | "col": 1, |
|
1833 | "col": 1, | |
1653 | "color": 2, |
|
1834 | "color": 2, | |
1654 | "nextcol": 0, |
|
1835 | "nextcol": 0, | |
1655 | "width": -1 |
|
1836 | "width": -1 | |
1656 | } |
|
1837 | } | |
1657 | ], |
|
1838 | ], | |
1658 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", |
|
1839 | "node": "f8bbb9024b10f93cdbb8d940337398291d40dea8", | |
1659 | "parents": [ |
|
1840 | "parents": [ | |
1660 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" |
|
1841 | "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e" | |
1661 | ], |
|
1842 | ], | |
1662 | "phase": "public", |
|
1843 | "phase": "public", | |
1663 | "row": 8, |
|
1844 | "row": 8, | |
1664 | "tags": [], |
|
1845 | "tags": [], | |
1665 | "user": "test" |
|
1846 | "user": "test" | |
1666 | }, |
|
1847 | }, | |
1667 | { |
|
1848 | { | |
1668 | "bookmarks": [], |
|
1849 | "bookmarks": [], | |
1669 | "branch": "default", |
|
1850 | "branch": "default", | |
1670 | "col": 0, |
|
1851 | "col": 0, | |
1671 | "color": 2, |
|
1852 | "color": 2, | |
1672 | "date": [ |
|
1853 | "date": [ | |
1673 | 0.0, |
|
1854 | 0.0, | |
1674 | 0 |
|
1855 | 0 | |
1675 | ], |
|
1856 | ], | |
1676 | "desc": "initial", |
|
1857 | "desc": "initial", | |
1677 | "edges": [], |
|
1858 | "edges": [], | |
1678 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", |
|
1859 | "node": "06e557f3edf66faa1ccaba5dd8c203c21cc79f1e", | |
1679 | "parents": [], |
|
1860 | "parents": [], | |
1680 | "phase": "public", |
|
1861 | "phase": "public", | |
1681 | "row": 9, |
|
1862 | "row": 9, | |
1682 | "tags": [], |
|
1863 | "tags": [], | |
1683 | "user": "test" |
|
1864 | "user": "test" | |
1684 | } |
|
1865 | } | |
1685 | ], |
|
1866 | ], | |
1686 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" |
|
1867 | "node": "cc725e08502a79dd1eda913760fbe06ed7a9abc7" | |
1687 | } |
|
1868 | } | |
1688 |
|
1869 | |||
1689 | help/ shows help topics |
|
1870 | help/ shows help topics | |
1690 |
|
1871 | |||
1691 | $ request json-help |
|
1872 | $ request json-help | |
1692 | 200 Script output follows |
|
1873 | 200 Script output follows | |
1693 |
|
1874 | |||
1694 | { |
|
1875 | { | |
1695 | "earlycommands": [ |
|
1876 | "earlycommands": [ | |
1696 | { |
|
1877 | { | |
1697 | "summary": "add the specified files on the next commit", |
|
1878 | "summary": "add the specified files on the next commit", | |
1698 | "topic": "add" |
|
1879 | "topic": "add" | |
1699 | }, |
|
1880 | }, | |
1700 | { |
|
1881 | { | |
1701 | "summary": "show changeset information by line for each file", |
|
1882 | "summary": "show changeset information by line for each file", | |
1702 | "topic": "annotate" |
|
1883 | "topic": "annotate" | |
1703 | }, |
|
1884 | }, | |
1704 | { |
|
1885 | { | |
1705 | "summary": "make a copy of an existing repository", |
|
1886 | "summary": "make a copy of an existing repository", | |
1706 | "topic": "clone" |
|
1887 | "topic": "clone" | |
1707 | }, |
|
1888 | }, | |
1708 | { |
|
1889 | { | |
1709 | "summary": "commit the specified files or all outstanding changes", |
|
1890 | "summary": "commit the specified files or all outstanding changes", | |
1710 | "topic": "commit" |
|
1891 | "topic": "commit" | |
1711 | }, |
|
1892 | }, | |
1712 | { |
|
1893 | { | |
1713 | "summary": "diff repository (or selected files)", |
|
1894 | "summary": "diff repository (or selected files)", | |
1714 | "topic": "diff" |
|
1895 | "topic": "diff" | |
1715 | }, |
|
1896 | }, | |
1716 | { |
|
1897 | { | |
1717 | "summary": "dump the header and diffs for one or more changesets", |
|
1898 | "summary": "dump the header and diffs for one or more changesets", | |
1718 | "topic": "export" |
|
1899 | "topic": "export" | |
1719 | }, |
|
1900 | }, | |
1720 | { |
|
1901 | { | |
1721 | "summary": "forget the specified files on the next commit", |
|
1902 | "summary": "forget the specified files on the next commit", | |
1722 | "topic": "forget" |
|
1903 | "topic": "forget" | |
1723 | }, |
|
1904 | }, | |
1724 | { |
|
1905 | { | |
1725 | "summary": "create a new repository in the given directory", |
|
1906 | "summary": "create a new repository in the given directory", | |
1726 | "topic": "init" |
|
1907 | "topic": "init" | |
1727 | }, |
|
1908 | }, | |
1728 | { |
|
1909 | { | |
1729 | "summary": "show revision history of entire repository or files", |
|
1910 | "summary": "show revision history of entire repository or files", | |
1730 | "topic": "log" |
|
1911 | "topic": "log" | |
1731 | }, |
|
1912 | }, | |
1732 | { |
|
1913 | { | |
1733 | "summary": "merge another revision into working directory", |
|
1914 | "summary": "merge another revision into working directory", | |
1734 | "topic": "merge" |
|
1915 | "topic": "merge" | |
1735 | }, |
|
1916 | }, | |
1736 | { |
|
1917 | { | |
1737 | "summary": "pull changes from the specified source", |
|
1918 | "summary": "pull changes from the specified source", | |
1738 | "topic": "pull" |
|
1919 | "topic": "pull" | |
1739 | }, |
|
1920 | }, | |
1740 | { |
|
1921 | { | |
1741 | "summary": "push changes to the specified destination", |
|
1922 | "summary": "push changes to the specified destination", | |
1742 | "topic": "push" |
|
1923 | "topic": "push" | |
1743 | }, |
|
1924 | }, | |
1744 | { |
|
1925 | { | |
1745 | "summary": "remove the specified files on the next commit", |
|
1926 | "summary": "remove the specified files on the next commit", | |
1746 | "topic": "remove" |
|
1927 | "topic": "remove" | |
1747 | }, |
|
1928 | }, | |
1748 | { |
|
1929 | { | |
1749 | "summary": "start stand-alone webserver", |
|
1930 | "summary": "start stand-alone webserver", | |
1750 | "topic": "serve" |
|
1931 | "topic": "serve" | |
1751 | }, |
|
1932 | }, | |
1752 | { |
|
1933 | { | |
1753 | "summary": "show changed files in the working directory", |
|
1934 | "summary": "show changed files in the working directory", | |
1754 | "topic": "status" |
|
1935 | "topic": "status" | |
1755 | }, |
|
1936 | }, | |
1756 | { |
|
1937 | { | |
1757 | "summary": "summarize working directory state", |
|
1938 | "summary": "summarize working directory state", | |
1758 | "topic": "summary" |
|
1939 | "topic": "summary" | |
1759 | }, |
|
1940 | }, | |
1760 | { |
|
1941 | { | |
1761 | "summary": "update working directory (or switch revisions)", |
|
1942 | "summary": "update working directory (or switch revisions)", | |
1762 | "topic": "update" |
|
1943 | "topic": "update" | |
1763 | } |
|
1944 | } | |
1764 | ], |
|
1945 | ], | |
1765 | "othercommands": [ |
|
1946 | "othercommands": [ | |
1766 | { |
|
1947 | { | |
1767 | "summary": "add all new files, delete all missing files", |
|
1948 | "summary": "add all new files, delete all missing files", | |
1768 | "topic": "addremove" |
|
1949 | "topic": "addremove" | |
1769 | }, |
|
1950 | }, | |
1770 | { |
|
1951 | { | |
1771 | "summary": "create an unversioned archive of a repository revision", |
|
1952 | "summary": "create an unversioned archive of a repository revision", | |
1772 | "topic": "archive" |
|
1953 | "topic": "archive" | |
1773 | }, |
|
1954 | }, | |
1774 | { |
|
1955 | { | |
1775 | "summary": "reverse effect of earlier changeset", |
|
1956 | "summary": "reverse effect of earlier changeset", | |
1776 | "topic": "backout" |
|
1957 | "topic": "backout" | |
1777 | }, |
|
1958 | }, | |
1778 | { |
|
1959 | { | |
1779 | "summary": "subdivision search of changesets", |
|
1960 | "summary": "subdivision search of changesets", | |
1780 | "topic": "bisect" |
|
1961 | "topic": "bisect" | |
1781 | }, |
|
1962 | }, | |
1782 | { |
|
1963 | { | |
1783 | "summary": "create a new bookmark or list existing bookmarks", |
|
1964 | "summary": "create a new bookmark or list existing bookmarks", | |
1784 | "topic": "bookmarks" |
|
1965 | "topic": "bookmarks" | |
1785 | }, |
|
1966 | }, | |
1786 | { |
|
1967 | { | |
1787 | "summary": "set or show the current branch name", |
|
1968 | "summary": "set or show the current branch name", | |
1788 | "topic": "branch" |
|
1969 | "topic": "branch" | |
1789 | }, |
|
1970 | }, | |
1790 | { |
|
1971 | { | |
1791 | "summary": "list repository named branches", |
|
1972 | "summary": "list repository named branches", | |
1792 | "topic": "branches" |
|
1973 | "topic": "branches" | |
1793 | }, |
|
1974 | }, | |
1794 | { |
|
1975 | { | |
1795 | "summary": "create a bundle file", |
|
1976 | "summary": "create a bundle file", | |
1796 | "topic": "bundle" |
|
1977 | "topic": "bundle" | |
1797 | }, |
|
1978 | }, | |
1798 | { |
|
1979 | { | |
1799 | "summary": "output the current or given revision of files", |
|
1980 | "summary": "output the current or given revision of files", | |
1800 | "topic": "cat" |
|
1981 | "topic": "cat" | |
1801 | }, |
|
1982 | }, | |
1802 | { |
|
1983 | { | |
1803 | "summary": "show combined config settings from all hgrc files", |
|
1984 | "summary": "show combined config settings from all hgrc files", | |
1804 | "topic": "config" |
|
1985 | "topic": "config" | |
1805 | }, |
|
1986 | }, | |
1806 | { |
|
1987 | { | |
1807 | "summary": "mark files as copied for the next commit", |
|
1988 | "summary": "mark files as copied for the next commit", | |
1808 | "topic": "copy" |
|
1989 | "topic": "copy" | |
1809 | }, |
|
1990 | }, | |
1810 | { |
|
1991 | { | |
1811 | "summary": "list tracked files", |
|
1992 | "summary": "list tracked files", | |
1812 | "topic": "files" |
|
1993 | "topic": "files" | |
1813 | }, |
|
1994 | }, | |
1814 | { |
|
1995 | { | |
1815 | "summary": "copy changes from other branches onto the current branch", |
|
1996 | "summary": "copy changes from other branches onto the current branch", | |
1816 | "topic": "graft" |
|
1997 | "topic": "graft" | |
1817 | }, |
|
1998 | }, | |
1818 | { |
|
1999 | { | |
1819 | "summary": "search revision history for a pattern in specified files", |
|
2000 | "summary": "search revision history for a pattern in specified files", | |
1820 | "topic": "grep" |
|
2001 | "topic": "grep" | |
1821 | }, |
|
2002 | }, | |
1822 | { |
|
2003 | { | |
1823 | "summary": "show branch heads", |
|
2004 | "summary": "show branch heads", | |
1824 | "topic": "heads" |
|
2005 | "topic": "heads" | |
1825 | }, |
|
2006 | }, | |
1826 | { |
|
2007 | { | |
1827 | "summary": "show help for a given topic or a help overview", |
|
2008 | "summary": "show help for a given topic or a help overview", | |
1828 | "topic": "help" |
|
2009 | "topic": "help" | |
1829 | }, |
|
2010 | }, | |
1830 | { |
|
2011 | { | |
1831 | "summary": "identify the working directory or specified revision", |
|
2012 | "summary": "identify the working directory or specified revision", | |
1832 | "topic": "identify" |
|
2013 | "topic": "identify" | |
1833 | }, |
|
2014 | }, | |
1834 | { |
|
2015 | { | |
1835 | "summary": "import an ordered set of patches", |
|
2016 | "summary": "import an ordered set of patches", | |
1836 | "topic": "import" |
|
2017 | "topic": "import" | |
1837 | }, |
|
2018 | }, | |
1838 | { |
|
2019 | { | |
1839 | "summary": "show new changesets found in source", |
|
2020 | "summary": "show new changesets found in source", | |
1840 | "topic": "incoming" |
|
2021 | "topic": "incoming" | |
1841 | }, |
|
2022 | }, | |
1842 | { |
|
2023 | { | |
1843 | "summary": "output the current or given revision of the project manifest", |
|
2024 | "summary": "output the current or given revision of the project manifest", | |
1844 | "topic": "manifest" |
|
2025 | "topic": "manifest" | |
1845 | }, |
|
2026 | }, | |
1846 | { |
|
2027 | { | |
1847 | "summary": "show changesets not found in the destination", |
|
2028 | "summary": "show changesets not found in the destination", | |
1848 | "topic": "outgoing" |
|
2029 | "topic": "outgoing" | |
1849 | }, |
|
2030 | }, | |
1850 | { |
|
2031 | { | |
1851 | "summary": "show aliases for remote repositories", |
|
2032 | "summary": "show aliases for remote repositories", | |
1852 | "topic": "paths" |
|
2033 | "topic": "paths" | |
1853 | }, |
|
2034 | }, | |
1854 | { |
|
2035 | { | |
1855 | "summary": "set or show the current phase name", |
|
2036 | "summary": "set or show the current phase name", | |
1856 | "topic": "phase" |
|
2037 | "topic": "phase" | |
1857 | }, |
|
2038 | }, | |
1858 | { |
|
2039 | { | |
1859 | "summary": "roll back an interrupted transaction", |
|
2040 | "summary": "roll back an interrupted transaction", | |
1860 | "topic": "recover" |
|
2041 | "topic": "recover" | |
1861 | }, |
|
2042 | }, | |
1862 | { |
|
2043 | { | |
1863 | "summary": "rename files; equivalent of copy + remove", |
|
2044 | "summary": "rename files; equivalent of copy + remove", | |
1864 | "topic": "rename" |
|
2045 | "topic": "rename" | |
1865 | }, |
|
2046 | }, | |
1866 | { |
|
2047 | { | |
1867 | "summary": "redo merges or set/view the merge status of files", |
|
2048 | "summary": "redo merges or set/view the merge status of files", | |
1868 | "topic": "resolve" |
|
2049 | "topic": "resolve" | |
1869 | }, |
|
2050 | }, | |
1870 | { |
|
2051 | { | |
1871 | "summary": "restore files to their checkout state", |
|
2052 | "summary": "restore files to their checkout state", | |
1872 | "topic": "revert" |
|
2053 | "topic": "revert" | |
1873 | }, |
|
2054 | }, | |
1874 | { |
|
2055 | { | |
1875 | "summary": "print the root (top) of the current working directory", |
|
2056 | "summary": "print the root (top) of the current working directory", | |
1876 | "topic": "root" |
|
2057 | "topic": "root" | |
1877 | }, |
|
2058 | }, | |
1878 | { |
|
2059 | { | |
1879 | "summary": "add one or more tags for the current or given revision", |
|
2060 | "summary": "add one or more tags for the current or given revision", | |
1880 | "topic": "tag" |
|
2061 | "topic": "tag" | |
1881 | }, |
|
2062 | }, | |
1882 | { |
|
2063 | { | |
1883 | "summary": "list repository tags", |
|
2064 | "summary": "list repository tags", | |
1884 | "topic": "tags" |
|
2065 | "topic": "tags" | |
1885 | }, |
|
2066 | }, | |
1886 | { |
|
2067 | { | |
1887 | "summary": "apply one or more bundle files", |
|
2068 | "summary": "apply one or more bundle files", | |
1888 | "topic": "unbundle" |
|
2069 | "topic": "unbundle" | |
1889 | }, |
|
2070 | }, | |
1890 | { |
|
2071 | { | |
1891 | "summary": "verify the integrity of the repository", |
|
2072 | "summary": "verify the integrity of the repository", | |
1892 | "topic": "verify" |
|
2073 | "topic": "verify" | |
1893 | }, |
|
2074 | }, | |
1894 | { |
|
2075 | { | |
1895 | "summary": "output version and copyright information", |
|
2076 | "summary": "output version and copyright information", | |
1896 | "topic": "version" |
|
2077 | "topic": "version" | |
1897 | } |
|
2078 | } | |
1898 | ], |
|
2079 | ], | |
1899 | "topics": [ |
|
2080 | "topics": [ | |
1900 | { |
|
2081 | { | |
1901 | "summary": "Bundle File Formats", |
|
2082 | "summary": "Bundle File Formats", | |
1902 | "topic": "bundlespec" |
|
2083 | "topic": "bundlespec" | |
1903 | }, |
|
2084 | }, | |
1904 | { |
|
2085 | { | |
1905 | "summary": "Colorizing Outputs", |
|
2086 | "summary": "Colorizing Outputs", | |
1906 | "topic": "color" |
|
2087 | "topic": "color" | |
1907 | }, |
|
2088 | }, | |
1908 | { |
|
2089 | { | |
1909 | "summary": "Configuration Files", |
|
2090 | "summary": "Configuration Files", | |
1910 | "topic": "config" |
|
2091 | "topic": "config" | |
1911 | }, |
|
2092 | }, | |
1912 | { |
|
2093 | { | |
1913 | "summary": "Date Formats", |
|
2094 | "summary": "Date Formats", | |
1914 | "topic": "dates" |
|
2095 | "topic": "dates" | |
1915 | }, |
|
2096 | }, | |
1916 | { |
|
2097 | { | |
1917 | "summary": "Deprecated Features", |
|
2098 | "summary": "Deprecated Features", | |
1918 | "topic": "deprecated" |
|
2099 | "topic": "deprecated" | |
1919 | }, |
|
2100 | }, | |
1920 | { |
|
2101 | { | |
1921 | "summary": "Diff Formats", |
|
2102 | "summary": "Diff Formats", | |
1922 | "topic": "diffs" |
|
2103 | "topic": "diffs" | |
1923 | }, |
|
2104 | }, | |
1924 | { |
|
2105 | { | |
1925 | "summary": "Environment Variables", |
|
2106 | "summary": "Environment Variables", | |
1926 | "topic": "environment" |
|
2107 | "topic": "environment" | |
1927 | }, |
|
2108 | }, | |
1928 | { |
|
2109 | { | |
1929 | "summary": "Using Additional Features", |
|
2110 | "summary": "Using Additional Features", | |
1930 | "topic": "extensions" |
|
2111 | "topic": "extensions" | |
1931 | }, |
|
2112 | }, | |
1932 | { |
|
2113 | { | |
1933 | "summary": "Specifying File Sets", |
|
2114 | "summary": "Specifying File Sets", | |
1934 | "topic": "filesets" |
|
2115 | "topic": "filesets" | |
1935 | }, |
|
2116 | }, | |
1936 | { |
|
2117 | { | |
1937 | "summary": "Command-line flags", |
|
2118 | "summary": "Command-line flags", | |
1938 | "topic": "flags" |
|
2119 | "topic": "flags" | |
1939 | }, |
|
2120 | }, | |
1940 | { |
|
2121 | { | |
1941 | "summary": "Glossary", |
|
2122 | "summary": "Glossary", | |
1942 | "topic": "glossary" |
|
2123 | "topic": "glossary" | |
1943 | }, |
|
2124 | }, | |
1944 | { |
|
2125 | { | |
1945 | "summary": "Syntax for Mercurial Ignore Files", |
|
2126 | "summary": "Syntax for Mercurial Ignore Files", | |
1946 | "topic": "hgignore" |
|
2127 | "topic": "hgignore" | |
1947 | }, |
|
2128 | }, | |
1948 | { |
|
2129 | { | |
1949 | "summary": "Configuring hgweb", |
|
2130 | "summary": "Configuring hgweb", | |
1950 | "topic": "hgweb" |
|
2131 | "topic": "hgweb" | |
1951 | }, |
|
2132 | }, | |
1952 | { |
|
2133 | { | |
1953 | "summary": "Technical implementation topics", |
|
2134 | "summary": "Technical implementation topics", | |
1954 | "topic": "internals" |
|
2135 | "topic": "internals" | |
1955 | }, |
|
2136 | }, | |
1956 | { |
|
2137 | { | |
1957 | "summary": "Merge Tools", |
|
2138 | "summary": "Merge Tools", | |
1958 | "topic": "merge-tools" |
|
2139 | "topic": "merge-tools" | |
1959 | }, |
|
2140 | }, | |
1960 | { |
|
2141 | { | |
1961 | "summary": "Pager Support", |
|
2142 | "summary": "Pager Support", | |
1962 | "topic": "pager" |
|
2143 | "topic": "pager" | |
1963 | }, |
|
2144 | }, | |
1964 | { |
|
2145 | { | |
1965 | "summary": "File Name Patterns", |
|
2146 | "summary": "File Name Patterns", | |
1966 | "topic": "patterns" |
|
2147 | "topic": "patterns" | |
1967 | }, |
|
2148 | }, | |
1968 | { |
|
2149 | { | |
1969 | "summary": "Working with Phases", |
|
2150 | "summary": "Working with Phases", | |
1970 | "topic": "phases" |
|
2151 | "topic": "phases" | |
1971 | }, |
|
2152 | }, | |
1972 | { |
|
2153 | { | |
1973 | "summary": "Specifying Revisions", |
|
2154 | "summary": "Specifying Revisions", | |
1974 | "topic": "revisions" |
|
2155 | "topic": "revisions" | |
1975 | }, |
|
2156 | }, | |
1976 | { |
|
2157 | { | |
1977 | "summary": "Using Mercurial from scripts and automation", |
|
2158 | "summary": "Using Mercurial from scripts and automation", | |
1978 | "topic": "scripting" |
|
2159 | "topic": "scripting" | |
1979 | }, |
|
2160 | }, | |
1980 | { |
|
2161 | { | |
1981 | "summary": "Subrepositories", |
|
2162 | "summary": "Subrepositories", | |
1982 | "topic": "subrepos" |
|
2163 | "topic": "subrepos" | |
1983 | }, |
|
2164 | }, | |
1984 | { |
|
2165 | { | |
1985 | "summary": "Template Usage", |
|
2166 | "summary": "Template Usage", | |
1986 | "topic": "templating" |
|
2167 | "topic": "templating" | |
1987 | }, |
|
2168 | }, | |
1988 | { |
|
2169 | { | |
1989 | "summary": "URL Paths", |
|
2170 | "summary": "URL Paths", | |
1990 | "topic": "urls" |
|
2171 | "topic": "urls" | |
1991 | } |
|
2172 | } | |
1992 | ] |
|
2173 | ] | |
1993 | } |
|
2174 | } | |
1994 |
|
2175 | |||
1995 | help/{topic} shows an individual help topic |
|
2176 | help/{topic} shows an individual help topic | |
1996 |
|
2177 | |||
1997 | $ request json-help/phases |
|
2178 | $ request json-help/phases | |
1998 | 200 Script output follows |
|
2179 | 200 Script output follows | |
1999 |
|
2180 | |||
2000 | { |
|
2181 | { | |
2001 | "rawdoc": "Working with Phases\n*", (glob) |
|
2182 | "rawdoc": "Working with Phases\n*", (glob) | |
2002 | "topic": "phases" |
|
2183 | "topic": "phases" | |
2003 | } |
|
2184 | } | |
2004 |
|
2185 | |||
2005 | Commit message with Japanese Kanji 'Noh', which ends with '\x5c' |
|
2186 | Commit message with Japanese Kanji 'Noh', which ends with '\x5c' | |
2006 |
|
2187 | |||
2007 | $ echo foo >> da/foo |
|
2188 | $ echo foo >> da/foo | |
2008 | $ HGENCODING=cp932 hg ci -m `$PYTHON -c 'print("\x94\x5c")'` |
|
2189 | $ HGENCODING=cp932 hg ci -m `$PYTHON -c 'print("\x94\x5c")'` | |
2009 |
|
2190 | |||
2010 | Commit message with null character |
|
2191 | Commit message with null character | |
2011 |
|
2192 | |||
2012 | $ echo foo >> da/foo |
|
2193 | $ echo foo >> da/foo | |
2013 | >>> open('msg', 'wb').write('commit with null character: \0\n') |
|
2194 | >>> open('msg', 'wb').write('commit with null character: \0\n') | |
2014 | $ hg ci -l msg |
|
2195 | $ hg ci -l msg | |
2015 | $ rm msg |
|
2196 | $ rm msg | |
2016 |
|
2197 | |||
2017 | Stop and restart with HGENCODING=cp932 |
|
2198 | Stop and restart with HGENCODING=cp932 | |
2018 |
|
2199 | |||
2019 | $ killdaemons.py |
|
2200 | $ killdaemons.py | |
2020 | $ HGENCODING=cp932 hg serve -p $HGPORT -d --pid-file=hg.pid \ |
|
2201 | $ HGENCODING=cp932 hg serve -p $HGPORT -d --pid-file=hg.pid \ | |
2021 | > -A access.log -E error.log |
|
2202 | > -A access.log -E error.log | |
2022 | $ cat hg.pid >> $DAEMON_PIDS |
|
2203 | $ cat hg.pid >> $DAEMON_PIDS | |
2023 |
|
2204 | |||
2024 | Test json escape of multibyte characters |
|
2205 | Test json escape of multibyte characters | |
2025 |
|
2206 | |||
2026 | $ request json-filelog/tip/da/foo?revcount=2 | grep '"desc":' |
|
2207 | $ request json-filelog/tip/da/foo?revcount=2 | grep '"desc":' | |
2027 | "desc": "commit with null character: \u0000", |
|
2208 | "desc": "commit with null character: \u0000", | |
2028 | "desc": "\u80fd", |
|
2209 | "desc": "\u80fd", |
General Comments 0
You need to be logged in to leave comments.
Login now