Fossil SCM

merge trunk

baruch 2014-11-06 07:50 svn-import merge
Commit a4b654ec6c39b45ebf975f801c45cca23e0a6f2a
Parent c9fb495e3d22433…
7 files changed +1 -1 +1 -1 +1 -1 +1 -4 +1 -1 +1 -4 -3
~ src/db.c ~ src/db.c ~ src/main.c ~ src/makemake.tcl ~ src/timeline.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/db.c
+1 -1
--- src/db.c
+++ src/db.c
@@ -1328,11 +1328,11 @@
13281328
 "INSERT INTO config(name,value,mtime)"
13291329
 " VALUES('server-code', lower(hex(randomblob(20))),now());"
13301330
 "INSERT INTO config(name,value,mtime)"
13311331
 " VALUES('project-code', lower(hex(randomblob(20))),now());"
13321332
 );
1333
- }else{
1333
+ }else if( db_is_writeable("repository") ){
13341334
 if( db_get("server-code", 0)==0 ) {
13351335
 db_multi_exec(
13361336
 "INSERT INTO config(name,value,mtime)"
13371337
 " VALUES('server-code', lower(hex(randomblob(20))),now());"
13381338
 );
13391339
--- src/db.c
+++ src/db.c
@@ -1328,11 +1328,11 @@
1328 "INSERT INTO config(name,value,mtime)"
1329 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1330 "INSERT INTO config(name,value,mtime)"
1331 " VALUES('project-code', lower(hex(randomblob(20))),now());"
1332 );
1333 }else{
1334 if( db_get("server-code", 0)==0 ) {
1335 db_multi_exec(
1336 "INSERT INTO config(name,value,mtime)"
1337 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1338 );
1339
--- src/db.c
+++ src/db.c
@@ -1328,11 +1328,11 @@
1328 "INSERT INTO config(name,value,mtime)"
1329 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1330 "INSERT INTO config(name,value,mtime)"
1331 " VALUES('project-code', lower(hex(randomblob(20))),now());"
1332 );
1333 }else if( db_is_writeable("repository") ){
1334 if( db_get("server-code", 0)==0 ) {
1335 db_multi_exec(
1336 "INSERT INTO config(name,value,mtime)"
1337 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1338 );
1339
M src/db.c
+1 -1
--- src/db.c
+++ src/db.c
@@ -1328,11 +1328,11 @@
13281328
 "INSERT INTO config(name,value,mtime)"
13291329
 " VALUES('server-code', lower(hex(randomblob(20))),now());"
13301330
 "INSERT INTO config(name,value,mtime)"
13311331
 " VALUES('project-code', lower(hex(randomblob(20))),now());"
13321332
 );
1333
- }else{
1333
+ }else if( db_is_writeable("repository") ){
13341334
 if( db_get("server-code", 0)==0 ) {
13351335
 db_multi_exec(
13361336
 "INSERT INTO config(name,value,mtime)"
13371337
 " VALUES('server-code', lower(hex(randomblob(20))),now());"
13381338
 );
13391339
--- src/db.c
+++ src/db.c
@@ -1328,11 +1328,11 @@
1328 "INSERT INTO config(name,value,mtime)"
1329 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1330 "INSERT INTO config(name,value,mtime)"
1331 " VALUES('project-code', lower(hex(randomblob(20))),now());"
1332 );
1333 }else{
1334 if( db_get("server-code", 0)==0 ) {
1335 db_multi_exec(
1336 "INSERT INTO config(name,value,mtime)"
1337 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1338 );
1339
--- src/db.c
+++ src/db.c
@@ -1328,11 +1328,11 @@
1328 "INSERT INTO config(name,value,mtime)"
1329 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1330 "INSERT INTO config(name,value,mtime)"
1331 " VALUES('project-code', lower(hex(randomblob(20))),now());"
1332 );
1333 }else if( db_is_writeable("repository") ){
1334 if( db_get("server-code", 0)==0 ) {
1335 db_multi_exec(
1336 "INSERT INTO config(name,value,mtime)"
1337 " VALUES('server-code', lower(hex(randomblob(20))),now());"
1338 );
1339
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -2200,11 +2200,11 @@
22002200
 }else{
22012201
 zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
22022202
 }
22032203
 if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY;
22042204
 if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT;
2205
- }else if( g.db ){
2205
+ }else{
22062206
 db_setup_server_and_project_codes(1);
22072207
 }
22082208
 db_close(1);
22092209
 if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
22102210
 fossil_fatal("unable to listen on TCP socket %d", iPort);
22112211
--- src/main.c
+++ src/main.c
@@ -2200,11 +2200,11 @@
2200 }else{
2201 zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
2202 }
2203 if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY;
2204 if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT;
2205 }else if( g.db ){
2206 db_setup_server_and_project_codes(1);
2207 }
2208 db_close(1);
2209 if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2210 fossil_fatal("unable to listen on TCP socket %d", iPort);
2211
--- src/main.c
+++ src/main.c
@@ -2200,11 +2200,11 @@
2200 }else{
2201 zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
2202 }
2203 if( g.repositoryOpen ) flags |= HTTP_SERVER_HAD_REPOSITORY;
2204 if( g.localOpen ) flags |= HTTP_SERVER_HAD_CHECKOUT;
2205 }else{
2206 db_setup_server_and_project_codes(1);
2207 }
2208 db_close(1);
2209 if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2210 fossil_fatal("unable to listen on TCP socket %d", iPort);
2211
M src/makemake.tcl
+1 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -931,11 +931,11 @@
931931
932932
 ifdef FOSSIL_BUILD_SSL
933933
 APPTARGETS += openssl
934934
 endif
935935
936
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
936
+$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
937937
 $(CODECHECK1) $(TRANS_SRC)
938938
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
939939
940940
 # This rule prevents make from using its default rules to try build
941941
 # an executable named "manifest" out of the file named "manifest.c"
@@ -980,13 +980,10 @@
980980
 writeln "\$(OBJDIR)/headers: Makefile\n"
981981
 writeln "Makefile:\n"
982982
 set extra_h(main) " \$(OBJDIR)/page_index.h "
983983
 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
984984
985
-writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
986
-writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$(OBJDIR)/builtin_data.h\n"
987
-
988985
 foreach s [lsort $src] {
989986
 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
990987
 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
991988
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
992989
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
993990
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -931,11 +931,11 @@
931
932 ifdef FOSSIL_BUILD_SSL
933 APPTARGETS += openssl
934 endif
935
936 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
937 $(CODECHECK1) $(TRANS_SRC)
938 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
939
940 # This rule prevents make from using its default rules to try build
941 # an executable named "manifest" out of the file named "manifest.c"
@@ -980,13 +980,10 @@
980 writeln "\$(OBJDIR)/headers: Makefile\n"
981 writeln "Makefile:\n"
982 set extra_h(main) " \$(OBJDIR)/page_index.h "
983 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
984
985 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
986 writeln "\t\$(MKBUILTIN) \$(EXTRA_FILES) >\$(OBJDIR)/builtin_data.h\n"
987
988 foreach s [lsort $src] {
989 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
990 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
991 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
992 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
993
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -931,11 +931,11 @@
931
932 ifdef FOSSIL_BUILD_SSL
933 APPTARGETS += openssl
934 endif
935
936 $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
937 $(CODECHECK1) $(TRANS_SRC)
938 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
939
940 # This rule prevents make from using its default rules to try build
941 # an executable named "manifest" out of the file named "manifest.c"
@@ -980,13 +980,10 @@
980 writeln "\$(OBJDIR)/headers: Makefile\n"
981 writeln "Makefile:\n"
982 set extra_h(main) " \$(OBJDIR)/page_index.h "
983 set extra_h(builtin) " \$(OBJDIR)/builtin_data.h "
984
 
 
 
985 foreach s [lsort $src] {
986 writeln "\$(OBJDIR)/${s}_.c:\t\$(SRCDIR)/$s.c \$(TRANSLATE)"
987 writeln "\t\$(TRANSLATE) \$(SRCDIR)/$s.c >\$(OBJDIR)/${s}_.c\n"
988 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h$extra_h($s)\$(SRCDIR)/config.h"
989 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
990
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -2544,11 +2544,11 @@
25442544
 Blob header = empty_blob;
25452545
 blob_appendf(&header, "Timeline events (%s) for the calendar weeks "
25462546
 "of %h", stats_report_label_for_type(),
25472547
 zYear);
25482548
 blob_append_sql(&sql,
2549
- "SELECT DISTINCT strftime('%%%%W',mtime) AS wk, "
2549
+ "SELECT DISTINCT strftime('%%W',mtime) AS wk, "
25502550
 "count(*) AS n "
25512551
 "FROM v_reports "
25522552
 "WHERE %Q=substr(date(mtime),1,4) "
25532553
 "AND mtime < current_timestamp ",
25542554
 zYear);
25552555
--- src/timeline.c
+++ src/timeline.c
@@ -2544,11 +2544,11 @@
2544 Blob header = empty_blob;
2545 blob_appendf(&header, "Timeline events (%s) for the calendar weeks "
2546 "of %h", stats_report_label_for_type(),
2547 zYear);
2548 blob_append_sql(&sql,
2549 "SELECT DISTINCT strftime('%%%%W',mtime) AS wk, "
2550 "count(*) AS n "
2551 "FROM v_reports "
2552 "WHERE %Q=substr(date(mtime),1,4) "
2553 "AND mtime < current_timestamp ",
2554 zYear);
2555
--- src/timeline.c
+++ src/timeline.c
@@ -2544,11 +2544,11 @@
2544 Blob header = empty_blob;
2545 blob_appendf(&header, "Timeline events (%s) for the calendar weeks "
2546 "of %h", stats_report_label_for_type(),
2547 zYear);
2548 blob_append_sql(&sql,
2549 "SELECT DISTINCT strftime('%%W',mtime) AS wk, "
2550 "count(*) AS n "
2551 "FROM v_reports "
2552 "WHERE %Q=substr(date(mtime),1,4) "
2553 "AND mtime < current_timestamp ",
2554 zYear);
2555
M win/Makefile.mingw
+1 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -831,11 +831,11 @@
831831
832832
 ifdef FOSSIL_BUILD_SSL
833833
 APPTARGETS += openssl
834834
 endif
835835
836
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
836
+$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
837837
 $(CODECHECK1) $(TRANS_SRC)
838838
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
839839
840840
 # This rule prevents make from using its default rules to try build
841841
 # an executable named "manifest" out of the file named "manifest.c"
@@ -984,13 +984,10 @@
984984
985985
 $(OBJDIR)/headers: Makefile
986986
987987
 Makefile:
988988
989
-$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990
- $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
-
992989
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
993990
 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
994991
995992
 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
996993
 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
997994
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -831,11 +831,11 @@
831
832 ifdef FOSSIL_BUILD_SSL
833 APPTARGETS += openssl
834 endif
835
836 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(CODECHECK1) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
837 $(CODECHECK1) $(TRANS_SRC)
838 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
839
840 # This rule prevents make from using its default rules to try build
841 # an executable named "manifest" out of the file named "manifest.c"
@@ -984,13 +984,10 @@
984
985 $(OBJDIR)/headers: Makefile
986
987 Makefile:
988
989 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990 $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
992 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
993 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
994
995 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
996 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
997
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -831,11 +831,11 @@
831
832 ifdef FOSSIL_BUILD_SSL
833 APPTARGETS += openssl
834 endif
835
836 $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
837 $(CODECHECK1) $(TRANS_SRC)
838 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
839
840 # This rule prevents make from using its default rules to try build
841 # an executable named "manifest" out of the file named "manifest.c"
@@ -984,13 +984,10 @@
984
985 $(OBJDIR)/headers: Makefile
986
987 Makefile:
988
 
 
 
989 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
990 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
991
992 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
993 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
994
M win/Makefile.mingw.mistachkin
-3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -984,13 +984,10 @@
984984
985985
 $(OBJDIR)/headers: Makefile
986986
987987
 Makefile:
988988
989
-$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990
- $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
-
992989
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
993990
 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
994991
995992
 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
996993
 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
997994
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -984,13 +984,10 @@
984
985 $(OBJDIR)/headers: Makefile
986
987 Makefile:
988
989 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990 $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
992 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
993 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
994
995 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
996 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
997
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -984,13 +984,10 @@
984
985 $(OBJDIR)/headers: Makefile
986
987 Makefile:
988
 
 
 
989 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
990 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
991
992 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
993 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
994

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button