Fossil

Check-in [a9070a49]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merged in trunk [ae64088627df]. Added /json/timeline/checkin as alias for /json/timeline/commit (checkin is historically more correct/consistent).
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | json-multitag-test | json
Files: files | file ages | folders
SHA1: a9070a49445b788960928532d2f7016f955995d5
User & Date: stephan 2011-10-02 18:28:52.315
Context
2011-10-02
19:56
Added empty_Stmt, analog to empty_Blob, to work around an assertion triggered during some error handling code. ... (check-in: 4db6d7c5 user: stephan tags: json-multitag-test, json)
18:28
Merged in trunk [ae64088627df]. Added /json/timeline/checkin as alias for /json/timeline/commit (checkin is historically more correct/consistent). ... (check-in: a9070a49 user: stephan tags: json-multitag-test, json)
18:18
s/userName/name/, for consistency. ... (check-in: 94689bbf user: stephan tags: json-multitag-test, json)
13:30
minor hack to name_search() to make it stop searching after it determines there is an ambiguity. ... (check-in: ae640886 user: stephan tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/http_socket.c.
︙︙
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215

  return total;
}

/*
** Receive content back from the open socket connection.
*/
size_t socket_receive(void *NotUsed, void *pContent, size_t N){
  size_t got;
  size_t total = 0;
  while( N>0 ){
    got = recv(iSocket, pContent, N, 0);
    if( got<=0 ) break;
    total += got;
    N -= got;
    pContent = (void*)&((char*)pContent)[got];
  }
  return total;
}








|




|
|





198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215

  return total;
}

/*
** Receive content back from the open socket connection.
*/
size_t socket_receive(void *NotUsed, void *pContent, size_t N){
  ssize_t got;
  size_t total = 0;
  while( N>0 ){
    got = recv(iSocket, pContent, N, 0);
    if( got<=0 ) break;
    total += (size_t)got;
    N -= (size_t)got;
    pContent = (void*)&((char*)pContent)[got];
  }
  return total;
}
Changes to src/json_timeline.c.
︙︙
26
27
28
29
30
31
32

33
34
35
36
37
38
39

static cson_value * json_timeline_ci();
static cson_value * json_timeline_ticket();
/*
** Mapping of /json/timeline/XXX commands/paths to callbacks.
*/
static const JsonPageDef JsonPageDefs_Timeline[] = {
{"c", json_timeline_ci, 0},

{"ci", json_timeline_ci, 0},
{"com", json_timeline_ci, 0},
{"commit", json_timeline_ci, 0},
{"t", json_timeline_ticket, 0},
{"ticket", json_timeline_ticket, 0},
{"w", json_timeline_wiki, 0},
{"wi", json_timeline_wiki, 0},








>








26
27
28
29
30
31
32
33
34
35
36
37
38
39
40

static cson_value * json_timeline_ci();
static cson_value * json_timeline_ticket();
/*
** Mapping of /json/timeline/XXX commands/paths to callbacks.
*/
static const JsonPageDef JsonPageDefs_Timeline[] = {
{"c", json_timeline_ci, 0},
{"checkin", json_timeline_ci, 0},
{"ci", json_timeline_ci, 0},
{"com", json_timeline_ci, 0},
{"commit", json_timeline_ci, 0},
{"t", json_timeline_ticket, 0},
{"ticket", json_timeline_ticket, 0},
{"w", json_timeline_wiki, 0},
{"wi", json_timeline_wiki, 0},
︙︙
Changes to src/main.c.
︙︙
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282

      return 0;
    }else if( c<0 ){
      upr = mid - 1;
    }else{
      lwr = mid + 1;
    }
  }
  for(m=cnt=0, i=upr-2; i<=upr+3 && i<nMap; i++){
    if( i<0 ) continue;
    if( strncmp(zName, aMap[i].zName, n)==0 ){
      m = i;
      cnt++;
    }
  }
  if( cnt==1 ){








|








268
269
270
271
272
273
274
275
276
277
278
279
280
281
282

      return 0;
    }else if( c<0 ){
      upr = mid - 1;
    }else{
      lwr = mid + 1;
    }
  }
  for(m=cnt=0, i=upr-2; cnt<2 && i<=upr+3 && i<nMap; i++){
    if( i<0 ) continue;
    if( strncmp(zName, aMap[i].zName, n)==0 ){
      m = i;
      cnt++;
    }
  }
  if( cnt==1 ){
︙︙
465
466
467
468
469
470
471

472
473
474
475
476
477
478

    g.cgiOutput = 0;
    cgi_printf("<p class=\"generalError\">%h</p>", z);
    cgi_reply();
  }else{
    char *zOut = mprintf("\r%s: %s\n", fossil_nameofexe(), z);
    fossil_puts(zOut, 1);
  }

  db_force_rollback();
  fossil_exit(rc);
}

/* This routine works like fossil_fatal() except that if called
** recursively, the recursive call is a no-op.
**








>








465
466
467
468
469
470
471
472
473
474
475
476
477
478
479

    g.cgiOutput = 0;
    cgi_printf("<p class=\"generalError\">%h</p>", z);
    cgi_reply();
  }else{
    char *zOut = mprintf("\r%s: %s\n", fossil_nameofexe(), z);
    fossil_puts(zOut, 1);
  }
  free(z);
  db_force_rollback();
  fossil_exit(rc);
}

/* This routine works like fossil_fatal() except that if called
** recursively, the recursive call is a no-op.
**
︙︙