Overview
| SHA1 Hash: | 651c75c5b77a8fbeeb2c483dc9ec2741922592a4 |
|---|---|
| Date: | 2009-10-05 10:08:05 |
| User: | robert |
| Comment: | merge trunk into creole |
| Timelines: | ancestors | descendants | both | creole |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- bgcolor=#c0ffc0 inherited from [ecd1f09632]
- branch=creole inherited from [7a2c37063a]
- sym-creole inherited from [7a2c37063a]
Changes
[hide diffs]Modified Makefile from [21ab1c0c9c] to [c357142045].
@@ -24,11 +24,11 @@ # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # #TCC = gcc -O6 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage -TCC = gcc -Os +TCC = gcc -g -Os -Wall #### Extra arguments for linking the finished binary. Fossil needs # to link against the Z-Lib compression library. There are no # other dependencies. We sometimes add the -static option here # so that we can build a static executable that will run in a
Modified src/clone.c from [70ab216ac2] to [42fdc2e08e].
@@ -78,11 +78,11 @@
db_record_repository_filename(g.argv[3]);
db_initial_setup(0, 0);
user_select();
db_set("content-schema", CONTENT_SCHEMA, 0);
db_set("aux-schema", AUX_SCHEMA, 0);
- db_set("last-sync-url", g.urlCanonical, 0);
+ db_set("last-sync-url", g.argv[2], 0);
db_multi_exec(
"REPLACE INTO config(name,value)"
" VALUES('server-code', lower(hex(randomblob(20))));"
);
url_enable_proxy(0);
Modified src/diffcmd.c from [4832395b8a] to [a53a1db3ef].
@@ -171,12 +171,11 @@
}
if( zExternalCommand==0 ){
internalDiff=1;
}else{
blob_zero(&cmd);
- shell_escape(&cmd, zExternalCommand);
- blob_append(&cmd, " ", 1);
+ blob_appendf(&cmd,"%s ",zExternalCommand);
}
}
zFile = g.argv[g.argc-1];
file_tree_name(zFile, &fname, 1);
@@ -207,12 +206,11 @@
blob_reset(¤t);
blob_reset(&out);
}else{
blob_write_to_file(&record, blob_str(&vname));
blob_reset(&record);
- shell_escape(&cmd, blob_str(&vname));
- blob_appendf(&cmd, " ");
+ blob_appendf(&cmd, "%s ", blob_str(&vname));
shell_escape(&cmd, zFile);
portable_system(blob_str(&cmd));
unlink(blob_str(&vname));
blob_reset(&vname);
blob_reset(&cmd);
Modified src/sha1.c from [7f2336da5a] to [30e74752c3].
@@ -536,11 +536,12 @@
return 0;
}
/*
-** COMMAND: test-sha1sum
+** COMMAND: sha1sum
+** %fossil sha1sum FILE...
**
** Compute an SHA1 checksum of all files named on the command-line.
** If an file is named "-" then take its content from standard input.
*/
void sha1sum_test(void){
Modified src/style.c from [4b7d601cb9] to [b4778ab325].
@@ -191,11 +191,11 @@
@ media="screen">
@ </head>
@ <body>
@ <div class="header">
@ <div class="logo">
-@ <img src="/logo" alt="logo">
+@ <img src="$baseurl/logo" alt="logo">
@ <br><nobr>$<project_name></nobr>
@ </div>
@ <div class="title">$<title></div>
@ <div class="status"><nobr><th1>
@ if {[info exists login]} {
Modified src/xfer.c from [2973354cfc] to [b02eb5519c].
@@ -658,13 +658,21 @@
if( xfer.nToken==3
&& (blob_eq(&xfer.aToken[0], "pull") || blob_eq(&xfer.aToken[0], "push"))
&& blob_is_uuid(&xfer.aToken[1])
&& blob_is_uuid(&xfer.aToken[2])
){
- const char *zSCode;
const char *zPCode;
+#if 0
+ /* This block checks to see if a server is trying to sync with itself.
+ ** This used to be disallowed, but I cannot think of any significant
+ ** harm, so I have disabled the check.
+ **
+ ** With this check disabled, it is sufficient to copy the repository
+ ** database. No need to run clone.
+ */
+ const char *zSCode;
zSCode = db_get("server-code", 0);
if( zSCode==0 ){
fossil_panic("missing server code");
}
if( blob_eq_str(&xfer.aToken[1], zSCode, -1) ){
@@ -671,10 +679,12 @@
cgi_reset_content();
@ error server\sloop
nErr++;
break;
}
+#endif
+
zPCode = db_get("project-code", 0);
if( zPCode==0 ){
fossil_panic("missing project code");
}
if( !blob_eq_str(&xfer.aToken[2], zPCode, -1) ){