Fossil SCM

Fixed 2 swapped error messages. Added /json/wiki/diff button to demo page.

stephan 2012-03-04 19:03 trunk
Commit 1578ba34410b13ef595766e8d8b43561875eaa9e
Parent c6c38a522faf1cc…
2 files changed +4 +4 -4
~ ajax/index.html ~ src/json_wiki.c
M ajax/index.html
+4
--- ajax/index.html
+++ ajax/index.html
@@ -233,14 +233,18 @@
233233
 <input type='button' value='branch/list' onclick='TheApp.cgi.sendCommand("/json/branch/list")' />
234234
 <input type='button' value='timeline/ci' onclick='TheApp.cgi.sendCommand("/json/timeline/ci?files=true")' />
235235
 <input type='button' value='timeline/wiki' onclick='TheApp.cgi.sendCommand("/json/timeline/wiki")' />
236236
 <input type='button' value='timeline/ticket' onclick='TheApp.cgi.sendCommand("/json/timeline/ticket")' />
237237
 <input type='button' value='timeline/branch' onclick='TheApp.cgi.sendCommand("/json/timeline/branch")' />
238
+
239
+<br/>
240
+
238241
 <input type='button' value='wiki/list' onclick='TheApp.cgi.sendCommand("/json/wiki/list")' />
239242
 <input type='button' value='wiki/list verbose' onclick='TheApp.cgi.sendCommand("/json/wiki/list",{verbose:1})' />
240243
 <input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{name:"Fossil"})' />
241244
 <input type='button' value='wiki/get/Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get/Fossil")' />
245
+<input type='button' value='wiki/diff' onclick='TheApp.cgi.sendCommand("/json/wiki/diff/e32ccdcda59e930c77c/e15992f475760cdf3a9")' />
242246
243247
 <br/>
244248
245249
 <input type='button' value='user/list' onclick='TheApp.cgi.sendCommand("/json/user/list")' />
246250
 <input type='button' value='user/get' onclick='TheApp.cgi.sendCommand("/json/user/get?name=anonymous")' />
247251
--- ajax/index.html
+++ ajax/index.html
@@ -233,14 +233,18 @@
233 <input type='button' value='branch/list' onclick='TheApp.cgi.sendCommand("/json/branch/list")' />
234 <input type='button' value='timeline/ci' onclick='TheApp.cgi.sendCommand("/json/timeline/ci?files=true")' />
235 <input type='button' value='timeline/wiki' onclick='TheApp.cgi.sendCommand("/json/timeline/wiki")' />
236 <input type='button' value='timeline/ticket' onclick='TheApp.cgi.sendCommand("/json/timeline/ticket")' />
237 <input type='button' value='timeline/branch' onclick='TheApp.cgi.sendCommand("/json/timeline/branch")' />
 
 
 
238 <input type='button' value='wiki/list' onclick='TheApp.cgi.sendCommand("/json/wiki/list")' />
239 <input type='button' value='wiki/list verbose' onclick='TheApp.cgi.sendCommand("/json/wiki/list",{verbose:1})' />
240 <input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{name:"Fossil"})' />
241 <input type='button' value='wiki/get/Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get/Fossil")' />
 
242
243 <br/>
244
245 <input type='button' value='user/list' onclick='TheApp.cgi.sendCommand("/json/user/list")' />
246 <input type='button' value='user/get' onclick='TheApp.cgi.sendCommand("/json/user/get?name=anonymous")' />
247
--- ajax/index.html
+++ ajax/index.html
@@ -233,14 +233,18 @@
233 <input type='button' value='branch/list' onclick='TheApp.cgi.sendCommand("/json/branch/list")' />
234 <input type='button' value='timeline/ci' onclick='TheApp.cgi.sendCommand("/json/timeline/ci?files=true")' />
235 <input type='button' value='timeline/wiki' onclick='TheApp.cgi.sendCommand("/json/timeline/wiki")' />
236 <input type='button' value='timeline/ticket' onclick='TheApp.cgi.sendCommand("/json/timeline/ticket")' />
237 <input type='button' value='timeline/branch' onclick='TheApp.cgi.sendCommand("/json/timeline/branch")' />
238
239 <br/>
240
241 <input type='button' value='wiki/list' onclick='TheApp.cgi.sendCommand("/json/wiki/list")' />
242 <input type='button' value='wiki/list verbose' onclick='TheApp.cgi.sendCommand("/json/wiki/list",{verbose:1})' />
243 <input type='button' value='wiki/get Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get",{name:"Fossil"})' />
244 <input type='button' value='wiki/get/Fossil' onclick='TheApp.cgi.sendCommand("/json/wiki/get/Fossil")' />
245 <input type='button' value='wiki/diff' onclick='TheApp.cgi.sendCommand("/json/wiki/diff/e32ccdcda59e930c77c/e15992f475760cdf3a9")' />
246
247 <br/>
248
249 <input type='button' value='user/list' onclick='TheApp.cgi.sendCommand("/json/user/list")' />
250 <input type='button' value='user/get' onclick='TheApp.cgi.sendCommand("/json/user/get?name=anonymous")' />
251
M src/json_wiki.c
+4 -4
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -458,21 +458,21 @@
458458
 }
459459
460460
 r1 = symbolic_name_to_rid( zV1, "w" );
461461
 zErrTag = zV1;
462462
 if(r1<0){
463
- goto invalid;
463
+ goto ambiguous;
464464
 }else if(0==r1){
465
- goto ambiguous;
465
+ goto invalid;
466466
 }
467467
468468
 r2 = symbolic_name_to_rid( zV2, "w" );
469469
 zErrTag = zV2;
470470
 if(r2<0){
471
- goto invalid;
471
+ goto ambiguous;
472472
 }else if(0==r2){
473
- goto ambiguous;
473
+ goto invalid;
474474
 }
475475
476476
 zErrTag = zV1;
477477
 pW1 = manifest_get(r1, CFTYPE_WIKI);
478478
 if( pW1==0 ) {
479479
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -458,21 +458,21 @@
458 }
459
460 r1 = symbolic_name_to_rid( zV1, "w" );
461 zErrTag = zV1;
462 if(r1<0){
463 goto invalid;
464 }else if(0==r1){
465 goto ambiguous;
466 }
467
468 r2 = symbolic_name_to_rid( zV2, "w" );
469 zErrTag = zV2;
470 if(r2<0){
471 goto invalid;
472 }else if(0==r2){
473 goto ambiguous;
474 }
475
476 zErrTag = zV1;
477 pW1 = manifest_get(r1, CFTYPE_WIKI);
478 if( pW1==0 ) {
479
--- src/json_wiki.c
+++ src/json_wiki.c
@@ -458,21 +458,21 @@
458 }
459
460 r1 = symbolic_name_to_rid( zV1, "w" );
461 zErrTag = zV1;
462 if(r1<0){
463 goto ambiguous;
464 }else if(0==r1){
465 goto invalid;
466 }
467
468 r2 = symbolic_name_to_rid( zV2, "w" );
469 zErrTag = zV2;
470 if(r2<0){
471 goto ambiguous;
472 }else if(0==r2){
473 goto invalid;
474 }
475
476 zErrTag = zV1;
477 pW1 = manifest_get(r1, CFTYPE_WIKI);
478 if( pW1==0 ) {
479

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button