Fossil

Differences From Artifact [e4a54de48b]:

• File src/json_branch.c — part of check-in [d2c1ae23a9] at 2011-10-19 21:13:23 on branch json — s/fossil_is_json/fossil_has_json/g. Moved fossil_has_json() (nee fossil_is_json()) decl/docs to json_detail.h. (user: stephan size: 11085)

To Artifact [fc4510abb1]:

• File src/json_branch.c — part of check-in [81d71d7b9e] at 2011-10-27 16:12:38 on branch json — merged in trunk [06e0cb70054d3c3], resolved conflict in login.c. (user: stephan size: 11085) [more...]

202
203
204
205
206
207
208
209
210
211
212
213
214
215
216

  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");

|

202
203
204
205
206
207
208
209
210
211
212
213
214
215
216

  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-%q')",
        zBranch)!=0 ){
    zOpt->rcErrMsg = "Branch already exists.";
    return FSL_JSON_E_RESOURCE_ALREADY_EXISTS;
  }

  db_begin_transaction();
  rootid = name_to_typed_rid(zBasis, "ci");