Diff
Not logged in

Differences From Artifact [2dc24a2b7e]:

To Artifact [1977b95a81]:


305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321




322
323
324
325
326
327
328
int parse_mark(char *line, struct mark_t *mark){
  char *cur_tok;
  char type_;
  cur_tok = strtok(line, " \t");
  if( !cur_tok || strlen(cur_tok)<2 ){
    return -1;
  }
  mark->rid = fast_uuid_to_rid(mark->uuid)
    /* forum post bfb325108171eb8b: we want export to work
    ** even if the RIDs get re-mapped, e.g. a different clone
    ** is used. */;
  type_ = cur_tok[0];
  if( type_!='c' && type_!='b' ){
    /* This is probably a blob mark */
    mark->name = NULL;
    return 0;
  }




  if( !mark->rid ){
    fossil_free(mark->name);
    fossil_trace("Non-existent SHA-1/SHA-3 in marks file: %s\n", mark->uuid);
    return -1;
  }

  cur_tok = strtok(NULL, " \t");







<
<
<
<






>
>
>
>







305
306
307
308
309
310
311




312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
int parse_mark(char *line, struct mark_t *mark){
  char *cur_tok;
  char type_;
  cur_tok = strtok(line, " \t");
  if( !cur_tok || strlen(cur_tok)<2 ){
    return -1;
  }




  type_ = cur_tok[0];
  if( type_!='c' && type_!='b' ){
    /* This is probably a blob mark */
    mark->name = NULL;
    return 0;
  }
  mark->rid = fast_uuid_to_rid(mark->uuid)
    /* forum post bfb325108171eb8b: we want export to work
    ** even if the RIDs get re-mapped, e.g. a different clone
    ** is used. */;
  if( !mark->rid ){
    fossil_free(mark->name);
    fossil_trace("Non-existent SHA-1/SHA-3 in marks file: %s\n", mark->uuid);
    return -1;
  }

  cur_tok = strtok(NULL, " \t");