Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Added /json/branch/create. Finally found g.zErrMsg, and started using it in conjunction with json error reporting. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | json-multitag-test | json |
| Files: | files | file ages | folders |
| SHA1: |
8eaf58ee5179750005b6e4f09186555d |
| User & Date: | stephan 2011-10-02 22:58:19.013 |
Context
|
2011-10-02
| ||
| 23:21 | Fixed an incorrect setting of the content type in one error-handling case. ... (check-in: 35e4e9188b user: stephan tags: json-multitag-test, json) | |
| 22:58 | Added /json/branch/create. Finally found g.zErrMsg, and started using it in conjunction with json error reporting. ... (check-in: 8eaf58ee51 user: stephan tags: json-multitag-test, json) | |
| 21:01 | moved /json/branch code into its own file. ... (check-in: 1a4c874e43 user: stephan tags: json-multitag-test, json) | |
Changes
Changes to src/json.c.
| ︙ | ︙ | |||
997 998 999 1000 1001 1002 1003 |
*/
char const * cmd = json_getenv_cstr("command");
if(cmd){
json_string_split(cmd, '/', 0, g.json.cmd.a);
g.json.cmd.commandStr = cmd;
}
}
| < < | 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 |
*/
char const * cmd = json_getenv_cstr("command");
if(cmd){
json_string_split(cmd, '/', 0, g.json.cmd.a);
g.json.cmd.commandStr = cmd;
}
}
if(!g.json.jsonp && g.json.post.o){
g.json.jsonp =
json_getenv_cstr("jsonp")
/*cson_string_cstr(cson_value_get_string(cson_object_get(g.json.post.o,"jsonp")))*/
;
}
|
| ︙ | ︙ | |||
1240 1241 1242 1243 1244 1245 1246 |
{
tmp = json_new_timestamp(-1);
SET(FossilJsonKeys.timestamp);
}
if( 0 != resultCode ){
| > > > | > > | | | 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 |
{
tmp = json_new_timestamp(-1);
SET(FossilJsonKeys.timestamp);
}
if( 0 != resultCode ){
if( ! pMsg ){
pMsg = g.zErrMsg;
if(!pMsg){
pMsg = json_err_str(resultCode);
}
}
tmp = cson_value_new_integer(resultCode);
SET(FossilJsonKeys.resultCode);
}
if( pMsg && *pMsg ){
tmp = cson_value_new_string(pMsg, strlen(pMsg));
SET(FossilJsonKeys.resultText);
}
if(g.json.cmd.commandStr){
tmp = json_new_string(g.json.cmd.commandStr);
SET("command");
}
|
| ︙ | ︙ | |||
1338 1339 1340 1341 1342 1343 1344 |
void json_err( int code, char const * msg, char alsoOutput ){
int rc = code ? code : (g.json.resultCode
? g.json.resultCode
: FSL_JSON_E_UNKNOWN);
cson_value * resp = NULL;
rc = json_dumbdown_rc(rc);
if( rc && !msg ){
| > > | > | 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 |
void json_err( int code, char const * msg, char alsoOutput ){
int rc = code ? code : (g.json.resultCode
? g.json.resultCode
: FSL_JSON_E_UNKNOWN);
cson_value * resp = NULL;
rc = json_dumbdown_rc(rc);
if( rc && !msg ){
msg = g.zErrMsg;
if(!msg){
msg = json_err_str(rc);
}
}
resp = json_create_response(rc, msg, NULL);
if(!resp){
/* about the only error case here is out-of-memory. DO NOT
call fossil_panic() here because that calls this function.
*/
fprintf(stderr, "%s: Fatal error: could not allocate "
|
| ︙ | ︙ | |||
1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 |
}
}else{
json_send_response(resp);
}
cson_value_free(resp);
}
/*
** Iterates through a prepared SELECT statement and converts each row
** to a JSON object. If pTgt is not NULL then it must be-a Array
** object and this function will return pTgt. If pTgt is NULL then a
** new Array object is created and returned (owned by the
** caller). Each row of pStmt is converted to an Object and appended
| > > > > > > > > > > > > > > > > > > > > > | 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 |
}
}else{
json_send_response(resp);
}
cson_value_free(resp);
}
/*
** Sets g.json.resultCode and g.zErrMsg, but does not report the error
** via json_err(). Returns the code passed to it.
**
** code must be in the inclusive range 1000..9999.
*/
int json_set_err( int code, char const * fmt, ... ){
assert( (code>=1000) && (code<=9999) );
free(g.zErrMsg);
g.json.resultCode = code;
if(!fmt || !*fmt){
g.zErrMsg = mprintf("%s", json_err_str(code));
}else{
va_list vargs;
va_start(vargs,fmt);
char * msg = vmprintf(fmt, vargs);
va_end(vargs);
g.zErrMsg = msg;
}
return code;
}
/*
** Iterates through a prepared SELECT statement and converts each row
** to a JSON object. If pTgt is not NULL then it must be-a Array
** object and this function will return pTgt. If pTgt is NULL then a
** new Array object is created and returned (owned by the
** caller). Each row of pStmt is converted to an Object and appended
|
| ︙ | ︙ | |||
1785 1786 1787 1788 1789 1790 1791 |
{"rebuild",json_page_rebuild,0},
{"stat",json_page_stat,0},
{"tag", json_page_nyi,0},
{"ticket", json_page_nyi,0},
{"timeline", json_page_timeline,0},
{"user",json_page_user,0},
{"version",json_page_version,0},
| | | 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 |
{"rebuild",json_page_rebuild,0},
{"stat",json_page_stat,0},
{"tag", json_page_nyi,0},
{"ticket", json_page_nyi,0},
{"timeline", json_page_timeline,0},
{"user",json_page_user,0},
{"version",json_page_version,0},
{"whoami",json_page_whoami,0/*FIXME: work in CLI mode*/},
{"wiki",json_page_wiki,0},
/* Last entry MUST have a NULL name. */
{NULL,NULL,0}
};
/*
|
| ︙ | ︙ |
Changes to src/json_branch.c.
| ︙ | ︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 |
#if INTERFACE
#include "json_detail.h"
#endif
static cson_value * json_branch_list();
/*
** Mapping of /json/branch/XXX commands/paths to callbacks.
*/
static const JsonPageDef JsonPageDefs_Branch[] = {
{"list", json_branch_list, 0},
| > > | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 |
#if INTERFACE
#include "json_detail.h"
#endif
static cson_value * json_branch_list();
static cson_value * json_branch_create();
/*
** Mapping of /json/branch/XXX commands/paths to callbacks.
*/
static const JsonPageDef JsonPageDefs_Branch[] = {
{"create", json_branch_create, 0},
{"list", json_branch_list, 0},
{"new", json_branch_create, -1/* for compat with non-JSON branch command.*/},
/* Last entry MUST have a NULL name. */
{NULL,NULL,0}
};
/*
** Implements the /json/branch family of pages/commands. Far from
** complete.
|
| ︙ | ︙ | |||
135 136 137 138 139 140 141 |
sawConversionError = mprintf("Column-to-json failed @ %s:%d",
__FILE__,__LINE__);
}
}
if( sawConversionError ){
json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,sawConversionError);
free(sawConversionError);
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 |
sawConversionError = mprintf("Column-to-json failed @ %s:%d",
__FILE__,__LINE__);
}
}
if( sawConversionError ){
json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,sawConversionError);
free(sawConversionError);
}
return payV;
}
/*
** Parameters for the create-branch operation.
*/
typedef struct BranchCreateOptions{
char const * zName;
char const * zBasis;
char const * zColor;
char isPrivate;
/**
Might be set to an error string by
json_branch_new().
*/
char const * rcErrMsg;
} BranchCreateOptions;
/*
** Tries to create a new branch based on the options set in zOpt. If
** an error is encountered, zOpt->rcErrMsg _might_ be set to a
** descriptive string and one of the FossilJsonCodes values will be
** returned. Or fossil_fatal() (or similar) might be called, exiting
** the app.
**
** On success 0 is returned and if zNewRid is not NULL then the rid of
** the new branch is assigned to it.
**
** If zOpt->isPrivate is 0 but the parent branch is private,
** zOpt->isPrivate will be set to a non-zero value and the new branch
** will be private.
*/
static int json_branch_new(BranchCreateOptions * zOpt,
int *zNewRid){
/* Mostly copied from branch.c:branch_new(), but refactored a small
bit to not produce output or interact with the user. The
down-side to that is that we dropped the gpg-signing. It was
either that or abort the creation if we couldn't sign. We can't
sign over HTTP mode, anyway.
*/
char const * zBranch = zOpt->zName;
char const * zBasis = zOpt->zBasis;
char const * zColor = zOpt->zColor;
int rootid; /* RID of the root check-in - what we branch off of */
int brid; /* RID of the branch check-in */
int i; /* Loop counter */
char *zUuid; /* Artifact ID of origin */
Stmt q; /* Generic query */
char *zDate; /* Date that branch was created */
char *zComment; /* Check-in comment for the new branch */
Blob branch; /* manifest for the new branch */
Manifest *pParent; /* Parsed parent manifest */
Blob mcksum; /* Self-checksum on the manifest */
/* fossil branch new name */
if( zBranch==0 || zBranch[0]==0 ){
zOpt->rcErrMsg = "Branch name may not be null/empty.";
return FSL_JSON_E_INVALID_ARGS;
}
if( db_exists(
"SELECT 1 FROM tagxref"
" WHERE tagtype>0"
" AND tagid=(SELECT tagid FROM tag WHERE tagname='sym-%s')",
zBranch)!=0 ){
zOpt->rcErrMsg = "Branch already exists.";
return FSL_JSON_E_RESOURCE_ALREADY_EXISTS;
}
db_begin_transaction();
rootid = name_to_typed_rid(zBasis, "ci");
if( rootid==0 ){
zOpt->rcErrMsg = "Basis branch not found.";
return FSL_JSON_E_RESOURCE_NOT_FOUND;
}
pParent = manifest_get(rootid, CFTYPE_MANIFEST);
if( pParent==0 ){
zOpt->rcErrMsg = "Could not read parent manifest.";
return FSL_JSON_E_UNKNOWN;
}
/* Create a manifest for the new branch */
blob_zero(&branch);
if( pParent->zBaseline ){
blob_appendf(&branch, "B %s\n", pParent->zBaseline);
}
zComment = mprintf("Create new branch named \"%s\" "
"from \"%s\".", zBranch, zBasis);
blob_appendf(&branch, "C %F\n", zComment);
free(zComment);
zDate = date_in_standard_format("now");
blob_appendf(&branch, "D %s\n", zDate);
free(zDate);
/* Copy all of the content from the parent into the branch */
for(i=0; i<pParent->nFile; ++i){
blob_appendf(&branch, "F %F", pParent->aFile[i].zName);
if( pParent->aFile[i].zUuid ){
blob_appendf(&branch, " %s", pParent->aFile[i].zUuid);
if( pParent->aFile[i].zPerm && pParent->aFile[i].zPerm[0] ){
blob_appendf(&branch, " %s", pParent->aFile[i].zPerm);
}
}
blob_append(&branch, "\n", 1);
}
zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rootid);
blob_appendf(&branch, "P %s\n", zUuid);
free(zUuid);
if( pParent->zRepoCksum ){
blob_appendf(&branch, "R %s\n", pParent->zRepoCksum);
}
manifest_destroy(pParent);
/* Add the symbolic branch name and the "branch" tag to identify
** this as a new branch */
if( content_is_private(rootid) ) zOpt->isPrivate = 1;
if( zOpt->isPrivate && zColor==0 ) zColor = "#fec084";
if( zColor!=0 ){
blob_appendf(&branch, "T *bgcolor * %F\n", zColor);
}
blob_appendf(&branch, "T *branch * %F\n", zBranch);
blob_appendf(&branch, "T *sym-%F *\n", zBranch);
if( zOpt->isPrivate ){
blob_appendf(&branch, "T +private *\n");
}
/* Cancel all other symbolic tags */
db_prepare(&q,
"SELECT tagname FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagxref.tagid=tag.tagid"
" AND tagtype>0 AND tagname GLOB 'sym-*'"
" ORDER BY tagname",
rootid);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(&branch, "T -%F *\n", zTag);
}
db_finalize(&q);
blob_appendf(&branch, "U %F\n", g.zLogin);
md5sum_blob(&branch, &mcksum);
blob_appendf(&branch, "Z %b\n", &mcksum);
brid = content_put(&branch);
if( brid==0 ){
fossil_panic("Problem committing manifest: %s", g.zErrMsg);
}
db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", brid);
if( manifest_crosslink(brid, &branch)==0 ){
fossil_panic("unable to install new manifest");
}
assert( blob_is_reset(&branch) );
content_deltify(rootid, brid, 0);
if( zNewRid ){
*zNewRid = brid;
}
/* Commit */
db_end_transaction(0);
#if 0 /* Do an autosync push, if requested */
/* arugable for JSON mode? */
if( !g.isHTTP && !isPrivate ) autosync(AUTOSYNC_PUSH);
#endif
return 0;
}
static cson_value * json_branch_create(){
cson_value * payV = NULL;
cson_object * pay = NULL;
int rc = 0;
BranchCreateOptions opt;
char * zUuid = NULL;
int rid = 0;
if( !g.perm.Write ){
g.json.resultCode = FSL_JSON_E_DENIED;
return NULL;
}
if(0){
char const * x = json_command_arg(g.json.dispatchDepth+1);
fprintf(stderr,"command arg=%s\n",x);
assert(0);
}
memset(&opt,0,sizeof(BranchCreateOptions));
opt.zName = g.json.post.v
? json_getenv_cstr("name")
: json_command_arg(g.json.dispatchDepth+1);
if(!opt.zName){
json_set_err(FSL_JSON_E_MISSING_ARGS, "'name' parameter was not specified." );
return NULL;
}
opt.zBasis = g.json.post.v
? json_getenv_cstr("basis")
: json_command_arg(g.json.dispatchDepth+2);
if(!opt.zBasis || ('-'==*opt.zBasis/*assume CLI flag*/)){
opt.zBasis = "trunk";
}
opt.zColor = g.json.post.v
? json_getenv_cstr("bgColor")
: find_option("bgcolor","",1);
opt.isPrivate = g.json.post.v
? json_getenv_bool("private",0)
: (NULL != find_option("private","",0))
;
rc = json_branch_new( &opt, &rid );
if(rc){
json_set_err(rc, opt.rcErrMsg );
goto error;
}
payV = cson_value_new_object();
pay = cson_value_get_object(payV);
cson_object_set(pay,"name",json_new_string(opt.zName));
cson_object_set(pay,"basis",json_new_string(opt.zBasis));
cson_object_set(pay,"rid",json_new_int(rid));
zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
cson_object_set(pay,"uuid", json_new_string(zUuid));
cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate));
free(zUuid);
if(opt.zColor){
cson_object_set(pay,"bgColor",json_new_string(opt.zColor));
}
goto ok;
error:
assert( 0 != g.json.resultCode );
cson_value_free(payV);
payV = NULL;
ok:
return payV;
}
|
Changes to src/main.c.
| ︙ | ︙ | |||
290 291 292 293 294 295 296 297 298 299 300 301 302 303 |
/*
** atexit() handler which frees up "some" of the resources
** used by fossil.
*/
void fossil_atexit() {
cson_value_free(g.json.gc.v);
memset(&g.json, 0, sizeof(g.json));
if(g.db){
db_close(0);
}
}
/*
| > | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 |
/*
** atexit() handler which frees up "some" of the resources
** used by fossil.
*/
void fossil_atexit() {
cson_value_free(g.json.gc.v);
free(g.zErrMsg);
memset(&g.json, 0, sizeof(g.json));
if(g.db){
db_close(0);
}
}
/*
|
| ︙ | ︙ |