Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | remove hook command to be compatible with other hook designs |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | StvPrivateHook2 |
| Files: | files | file ages | folders |
| SHA1: |
a06121740a37e703b1e2645bc71c3b51 |
| User & Date: | wolfgang 2010-11-08 23:01:40.000 |
Context
|
2010-11-09
| ||
| 01:17 | Cleanup of help_page() in preparation for merging with trunk. Closed-Leaf check-in: a298a0e2f9 user: drh tags: StvPrivateHook2 | |
|
2010-11-08
| ||
| 23:01 | remove hook command to be compatible with other hook designs check-in: a06121740a user: wolfgang tags: StvPrivateHook2 | |
| 20:04 | merge from trunk check-in: 1e801695d3 user: wolfgang tags: StvPrivateHook2 | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
1524 1525 1526 1527 1528 1529 1530 |
{ "ignore-glob", 0, 40, "" },
{ "http-port", 0, 16, "8080" },
{ "localauth", 0, 0, "off" },
{ "manifest", 0, 0, "off" },
{ "mtime-changes", 0, 0, "on" },
{ "pgp-command", 0, 32, "gpg --clearsign -o " },
{ "proxy", 0, 32, "off" },
| < < < < < < < < < | 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 |
{ "ignore-glob", 0, 40, "" },
{ "http-port", 0, 16, "8080" },
{ "localauth", 0, 0, "off" },
{ "manifest", 0, 0, "off" },
{ "mtime-changes", 0, 0, "on" },
{ "pgp-command", 0, 32, "gpg --clearsign -o " },
{ "proxy", 0, 32, "off" },
{ "repo-cksum", 0, 0, "on" },
{ "ssh-command", 0, 32, "" },
{ "web-browser", 0, 32, "" },
{ 0,0,0,0 }
};
/*
|
| ︙ | ︙ | |||
1610 1611 1612 1613 1614 1615 1616 | ** The default is "gpg --clearsign -o ". ** ** proxy URL of the HTTP proxy. If undefined or "off" then ** the "http_proxy" environment variable is consulted. ** If the http_proxy environment variable is undefined ** then a direct HTTP connection is used. ** | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 | ** The default is "gpg --clearsign -o ". ** ** proxy URL of the HTTP proxy. If undefined or "off" then ** the "http_proxy" environment variable is consulted. ** If the http_proxy environment variable is undefined ** then a direct HTTP connection is used. ** ** repo-cksum Compute checksums over all files in each checkout ** as a double-check of correctness. Defaults to "on". ** Disable on large repositories for a performance ** improvement. ** ** ssh-command Command used to talk to a remote machine with ** the "ssh://" protocol. |
| ︙ | ︙ |
Changes to src/sync.c.
| ︙ | ︙ | |||
163 164 165 166 167 168 169 | ** is used. ** ** The URL specified normally becomes the new "remote-url" used for ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, ** the "--once" command-line option makes the URL a one-time-use URL ** that is not saved. ** | < < < | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 |
** is used.
**
** The URL specified normally becomes the new "remote-url" used for
** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
** the "--once" command-line option makes the URL a one-time-use URL
** that is not saved.
**
** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
*/
void push_cmd(void){
process_sync_args();
client_sync(1,0,0,0,0);
}
|
| ︙ | ︙ | |||
197 198 199 200 201 202 203 | ** command is used. ** ** The URL specified normally becomes the new "remote-url" used for ** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, ** the "--once" command-line option makes the URL a one-time-use URL ** that is not saved. ** | < < < | | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 |
** command is used.
**
** The URL specified normally becomes the new "remote-url" used for
** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However,
** the "--once" command-line option makes the URL a one-time-use URL
** that is not saved.
**
** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
*/
void sync_cmd(void){
int syncFlags = process_sync_args();
client_sync(1,1,0,syncFlags,0);
}
/*
|
| ︙ | ︙ |
Changes to src/xfer.c.
| ︙ | ︙ | |||
38 39 40 41 42 43 44 | int nDeltaSent; /* Number of deltas sent */ int nFileRcvd; /* Number of files received */ int nDeltaRcvd; /* Number of deltas received */ int nDanglingFile; /* Number of dangling deltas received */ int mxSend; /* Stop sending "file" with pOut reaches this size */ }; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | int nDeltaSent; /* Number of deltas sent */ int nFileRcvd; /* Number of files received */ int nDeltaRcvd; /* Number of deltas received */ int nDanglingFile; /* Number of dangling deltas received */ int mxSend; /* Stop sending "file" with pOut reaches this size */ }; /* ** The input blob contains a UUID. Convert it into a record ID. ** Create a phantom record if no prior record exists and ** phantomize is true. ** ** Compare to uuid_to_rid(). This routine takes a blob argument |
| ︙ | ︙ | |||
745 746 747 748 749 750 751 | Xfer xfer; int deltaFlag = 0; int isClone = 0; int nGimme = 0; int size; int recvConfig = 0; char *zNow; | < < < | < < < < < < < < < < | 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 |
Xfer xfer;
int deltaFlag = 0;
int isClone = 0;
int nGimme = 0;
int size;
int recvConfig = 0;
char *zNow;
if( strcmp(PD("REQUEST_METHOD","POST"),"POST") ){
fossil_redirect_home();
}
memset(&xfer, 0, sizeof(xfer));
blobarray_zero(xfer.aToken, count(xfer.aToken));
cgi_set_content_type(g.zContentType);
blob_zero(&xfer.err);
xfer.pIn = &g.cgiIn;
xfer.pOut = cgi_output_blob();
xfer.mxSend = db_get_int("max-download", 20000000);
g.xferPanic = 1;
db_begin_transaction();
db_multi_exec(
"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
);
manifest_crosslink_begin();
while( blob_line(xfer.pIn, &xfer.line) ){
if( blob_buffer(&xfer.line)[0]=='#' ) continue;
xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
/* file UUID SIZE \n CONTENT
** file UUID DELTASRC SIZE \n CONTENT
**
** Accept a file from the client.
*/
|
| ︙ | ︙ | |||
1136 1137 1138 1139 1140 1141 1142 |
Blob recv; /* Reply we got back from the server */
Xfer xfer; /* Transfer data */
int pctDone; /* Percentage done with a message */
int lastPctDone = -1; /* Last displayed pctDone */
double rArrivalTime; /* Time at which a message arrived */
const char *zSCode = db_get("server-code", "x");
const char *zPCode = db_get("project-code", 0);
| < < < | 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 |
Blob recv; /* Reply we got back from the server */
Xfer xfer; /* Transfer data */
int pctDone; /* Percentage done with a message */
int lastPctDone = -1; /* Last displayed pctDone */
double rArrivalTime; /* Time at which a message arrived */
const char *zSCode = db_get("server-code", "x");
const char *zPCode = db_get("project-code", 0);
if( db_get_boolean("dont-push", 0) ) pushFlag = 0;
if( pushFlag + pullFlag + cloneFlag == 0
&& configRcvMask==0 && configSendMask==0 ) return;
transport_stats(0, 0, 1);
socket_global_init();
|
| ︙ | ︙ | |||
1551 1552 1553 1554 1555 1556 1557 |
/* If this is a clone, the go at least two rounds */
if( cloneFlag && nCycle==1 ) go = 1;
/* Stop the cycle if the server sends a "clone_seqno 0" card */
if( cloneSeqno<=0 ) go = 0;
};
| < < < < < < < < < < < | 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 |
/* If this is a clone, the go at least two rounds */
if( cloneFlag && nCycle==1 ) go = 1;
/* Stop the cycle if the server sends a "clone_seqno 0" card */
if( cloneSeqno<=0 ) go = 0;
};
transport_stats(&nSent, &nRcvd, 1);
fossil_print("Total network traffic: %d bytes sent, %d bytes received\n",
nSent, nRcvd);
transport_close();
transport_global_shutdown();
db_multi_exec("DROP TABLE onremote");
manifest_crosslink_end();
content_enable_dephantomize(1);
db_end_transaction(0);
}
|