Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge the minor fixes on the dmitry-fixes branch into trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ce354d0a9f62cde0122af374cd18c220 |
| User & Date: | drh 2011-09-12 18:19:36.441 |
Context
|
2011-09-13
| ||
| 00:40 | Add support for the -R option on several command-line subcommands. ... (check-in: 4fe2214116 user: drh tags: trunk) | |
|
2011-09-12
| ||
| 18:19 | Merge the minor fixes on the dmitry-fixes branch into trunk. ... (check-in: ce354d0a9f user: drh tags: trunk) | |
| 18:13 | Reset the reply content at the beginning of the /xfer method in case any sqlite3_log() warning messages had previously been inserted. ... (check-in: 2d1620830e user: drh tags: trunk) | |
|
2011-09-11
| ||
| 13:57 | Fix three remaining instances of printing rebuild progress in CGI mode. Ticket [19be0265ff]. ... (Closed-Leaf check-in: 2cd21f8dc2 user: dmitry tags: dmitry-fixes) | |
Changes
Changes to src/checkin.c.
| ︙ | ︙ | |||
413 414 415 416 417 418 419 | ** ** parent_rid is the recordid of the parent check-in. */ static void prepare_commit_comment( Blob *pComment, char *zInit, const char *zBranch, | | > | | 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 |
**
** parent_rid is the recordid of the parent check-in.
*/
static void prepare_commit_comment(
Blob *pComment,
char *zInit,
const char *zBranch,
int parent_rid,
const char *zUserOvrd
){
const char *zEditor;
char *zCmd;
char *zFile;
Blob text, line;
char *zComment;
int i;
blob_init(&text, zInit, -1);
blob_append(&text,
"\n"
"# Enter comments on this check-in. Lines beginning with # are ignored.\n"
"# The check-in comment follows wiki formatting rules.\n"
"#\n", -1
);
blob_appendf(&text, "# user: %s\n", zUserOvrd ? zUserOvrd : g.zLogin);
if( zBranch && zBranch[0] ){
blob_appendf(&text, "# tags: %s\n#\n", zBranch);
}else{
char *zTags = info_tags_of_checkin(parent_rid, 1);
if( zTags ) blob_appendf(&text, "# tags: %z\n#\n", zTags);
}
if( g.markPrivate ){
|
| ︙ | ︙ | |||
1032 1033 1034 1035 1036 1037 1038 |
blob_zero(&comment);
blob_append(&comment, zComment, -1);
}else if( zComFile ){
blob_zero(&comment);
blob_read_from_file(&comment, zComFile);
}else{
char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
| | | 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 |
blob_zero(&comment);
blob_append(&comment, zComment, -1);
}else if( zComFile ){
blob_zero(&comment);
blob_read_from_file(&comment, zComFile);
}else{
char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'");
prepare_commit_comment(&comment, zInit, zBranch, vid, zUserOvrd);
free(zInit);
}
if( blob_size(&comment)==0 ){
Blob ans;
blob_zero(&ans);
prompt_user("empty check-in comment. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
|
| ︙ | ︙ |
Changes to src/rebuild.c.
| ︙ | ︙ | |||
336 337 338 339 340 341 342 | int errCnt = 0; char *zTable; int incrSize; bag_init(&bagDone); ttyOutput = doOut; processCnt = 0; | | | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 |
int errCnt = 0;
char *zTable;
int incrSize;
bag_init(&bagDone);
ttyOutput = doOut;
processCnt = 0;
if (ttyOutput && !g.fQuiet) {
percent_complete(0);
}
rebuild_update_schema();
for(;;){
zTable = db_text(0,
"SELECT name FROM sqlite_master /*scan*/"
" WHERE type='table'"
|
| ︙ | ︙ | |||
408 409 410 411 412 413 414 |
db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
rebuild_step_done(rid);
}
}
db_finalize(&s);
manifest_crosslink_end();
rebuild_tag_trunk();
| | | | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 |
db_multi_exec("INSERT OR IGNORE INTO phantom VALUES(%d)", rid);
rebuild_step_done(rid);
}
}
db_finalize(&s);
manifest_crosslink_end();
rebuild_tag_trunk();
if( ttyOutput && !g.fQuiet && totalSize>0 ){
processCnt += incrSize;
percent_complete((processCnt*1000)/totalSize);
}
if( doClustering ) create_cluster();
if( ttyOutput && !g.fQuiet && totalSize>0 ){
processCnt += incrSize;
percent_complete((processCnt*1000)/totalSize);
}
if(!g.fQuiet && ttyOutput ){
fossil_print("\n");
}
return errCnt;
|
| ︙ | ︙ |
Changes to src/rss.c.
| ︙ | ︙ | |||
92 93 94 95 96 97 98 |
if( zProjectDescr==0 ){
zProjectDescr = zProjectName;
}
zPubDate = cgi_rfc822_datestamp(time(NULL));
@ <?xml version="1.0"?>
| | | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
if( zProjectDescr==0 ){
zProjectDescr = zProjectName;
}
zPubDate = cgi_rfc822_datestamp(time(NULL));
@ <?xml version="1.0"?>
@ <rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
@ <channel>
@ <title>%h(zProjectName)</title>
@ <link>%s(g.zBaseURL)</link>
@ <description>%h(zProjectDescr)</description>
@ <pubDate>%s(zPubDate)</pubDate>
@ <generator>Fossil version %s(MANIFEST_VERSION) %s(MANIFEST_DATE)</generator>
free(zPubDate);
|
| ︙ | ︙ | |||
128 129 130 131 132 133 134 |
}
@ <item>
@ <title>%s(zPrefix)%h(zCom)</title>
@ <link>%s(g.zBaseURL)/info/%s(zId)</link>
@ <description>%s(zPrefix)%h(zCom)</description>
@ <pubDate>%s(zDate)</pubDate>
| | | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
}
@ <item>
@ <title>%s(zPrefix)%h(zCom)</title>
@ <link>%s(g.zBaseURL)/info/%s(zId)</link>
@ <description>%s(zPrefix)%h(zCom)</description>
@ <pubDate>%s(zDate)</pubDate>
@ <dc:creator>%h(zAuthor)</dc:creator>
@ <guid>%s(g.zBaseURL)/info/%s(zId)</guid>
@ </item>
free(zDate);
nLine++;
}
db_finalize(&q);
|
| ︙ | ︙ |
Changes to src/setup.c.
| ︙ | ︙ | |||
333 334 335 336 337 338 339 340 341 342 343 344 345 346 |
if( aw ){ zCap[i++] = 'w'; }
if( ax ){ zCap[i++] = 'x'; }
if( az ){ zCap[i++] = 'z'; }
zCap[i] = 0;
zPw = P("pw");
zLogin = P("login");
if( isValidPwString(zPw) ){
zPw = sha1_shared_secret(zPw, zLogin, 0);
}else{
zPw = db_text(0, "SELECT pw FROM user WHERE uid=%d", uid);
}
zOldLogin = db_text(0, "SELECT login FROM user WHERE uid=%d", uid);
if( uid>0 &&
| > > > > > > > > | 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 |
if( aw ){ zCap[i++] = 'w'; }
if( ax ){ zCap[i++] = 'x'; }
if( az ){ zCap[i++] = 'z'; }
zCap[i] = 0;
zPw = P("pw");
zLogin = P("login");
if( strlen(zLogin)==0 ){
style_header("User Creation Error");
@ <span class="loginError">Empty login not allowed.</span>
@
@ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
style_footer();
return;
}
if( isValidPwString(zPw) ){
zPw = sha1_shared_secret(zPw, zLogin, 0);
}else{
zPw = db_text(0, "SELECT pw FROM user WHERE uid=%d", uid);
}
zOldLogin = db_text(0, "SELECT login FROM user WHERE uid=%d", uid);
if( uid>0 &&
|
| ︙ | ︙ |
Changes to www/reference.wiki.
| ︙ | ︙ | |||
92 93 94 95 96 97 98 |
<td><a href="#undo">undo</a></td>
</tr>
<tr>
<td><a href="#checkout">checkout</a>*</td>
<td><a href="#descendants">descendants</a></td>
<td><a href="#mv">mv</a>*</td>
<td><a href="#rm">rm</a>*</td>
| | | | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 |
<td><a href="#undo">undo</a></td>
</tr>
<tr>
<td><a href="#checkout">checkout</a>*</td>
<td><a href="#descendants">descendants</a></td>
<td><a href="#mv">mv</a>*</td>
<td><a href="#rm">rm</a>*</td>
<td><a href="#settings">unset</a></td>
</tr>
<tr>
<td><a href="#commit">ci</a></td>
<td><a href="#diff">diff</a></td>
<td><a href="#new">new</a>*</td>
<td><a href="#rstats">rstats</a></td>
<td><a href="#update">update</a>*</td>
</tr>
<tr>
<td><a href="#clean">clean</a></td>
<td><a href="#extra">extra</a>*</td>
<td><a href="#open">open</a></td>
<td><a href="#server">server</a></td>
<td><a href="#user">user</a></td>
</tr>
<tr>
<td><a href="#clone">clone</a></td>
<td><a href="#diff">gdiff</a></td>
<td><a href="#pull">pull</a></td>
<td><a href="#settings">settings</a></td>
<td><a href="#version">version</a>*</td>
</tr>
<tr>
<td><a href="#close">close</a></td>
<td><a href="#help">help</a></td>
<td><a href="#push">push</a></td>
<td><a href="#status">status</a>*</td>
|
| ︙ | ︙ |
Changes to www/wikitheory.wiki.
| ︙ | ︙ | |||
57 58 59 60 61 62 63 | <h2>Embedded Documentation</h2> Files in the source tree that use the ".wiki" suffix can be accessed and displayed using special URLs to the fossil server. This allows project documentation to be stored in the source tree and accessed online. (Details are described [./embeddeddoc.wiki | separately].) | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | <h2>Embedded Documentation</h2> Files in the source tree that use the ".wiki" suffix can be accessed and displayed using special URLs to the fossil server. This allows project documentation to be stored in the source tree and accessed online. (Details are described [./embeddeddoc.wiki | separately].) Some projects prefer to store their documentation in wiki. There is nothing wrong with that. But other projects prefer to keep documentation as part of the source tree, so that it is versioned along with the source tree and so that only developers with check-in privileges can change it. Embedded documentation serves this latter purpose. Both forms of documentation use the exact same wiki markup language. Some projects may choose to use both forms of documentation at the same time. Because the same format is used, it is trivial to move a file from wiki to embedded documentation |
| ︙ | ︙ |