Fossil SCM

Merging from trunk.

michael 2010-09-24 17:07 ttmrichter-skins merge
Commit e3292ef8c34b24d90b3328b3103c0f420e7b7372
Parent 1516a26dc85d475…
12 files changed +3 -3 +10 +46 -27 +1 -1 -2 +18 -2 +1 -1 +55 +4 -3 +4 -2 +3 -1 +1 -4
~ src/allrepo.c ~ src/config.h ~ src/db.c ~ src/diff.c ~ src/diffcmd.c ~ src/file.c ~ src/report.c ~ src/setup.c ~ src/stat.c ~ src/style.c ~ src/timeline.c ~ src/wikiformat.c
M src/allrepo.c
+3 -3
--- src/allrepo.c
+++ src/allrepo.c
@@ -53,14 +53,14 @@
5353
 **
5454
 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync)
5555
 **
5656
 ** The ~/.fossil file records the location of all repositories for a
5757
 ** user. This command performs certain operations on all repositories
58
-** that can be useful before or after a period of disconnection operation.
58
+** that can be useful before or after a period of disconnected operation.
5959
 **
60
-** On Win32 systems, this file is located in %LOCALAPPDATA%, %APDDATA%
61
-** or %HOMEPATH% and is named _fossil.
60
+** On Win32 systems, the file is named "_fossil" and is located in
61
+** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
6262
 **
6363
 ** Available operations are:
6464
 **
6565
 ** list | ls Display the location of all repositories
6666
 **
6767
--- src/allrepo.c
+++ src/allrepo.c
@@ -53,14 +53,14 @@
53 **
54 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync)
55 **
56 ** The ~/.fossil file records the location of all repositories for a
57 ** user. This command performs certain operations on all repositories
58 ** that can be useful before or after a period of disconnection operation.
59 **
60 ** On Win32 systems, this file is located in %LOCALAPPDATA%, %APDDATA%
61 ** or %HOMEPATH% and is named _fossil.
62 **
63 ** Available operations are:
64 **
65 ** list | ls Display the location of all repositories
66 **
67
--- src/allrepo.c
+++ src/allrepo.c
@@ -53,14 +53,14 @@
53 **
54 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync)
55 **
56 ** The ~/.fossil file records the location of all repositories for a
57 ** user. This command performs certain operations on all repositories
58 ** that can be useful before or after a period of disconnected operation.
59 **
60 ** On Win32 systems, the file is named "_fossil" and is located in
61 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
62 **
63 ** Available operations are:
64 **
65 ** list | ls Display the location of all repositories
66 **
67
M src/config.h
+10
--- src/config.h
+++ src/config.h
@@ -15,10 +15,20 @@
1515
 **
1616
 *******************************************************************************
1717
 **
1818
 ** A common header file used by all modules.
1919
 */
20
+
21
+/* The following macros are necessary for large-file support under
22
+** some linux distributions, and possibly other unixes as well.
23
+*/
24
+#define _LARGE_FILE 1
25
+#ifndef _FILE_OFFSET_BITS
26
+# define _FILE_OFFSET_BITS 64
27
+#endif
28
+#define _LARGEFILE_SOURCE 1
29
+
2030
2131
 /*
2232
 ** System header files used by all modules
2333
 */
2434
 #include <unistd.h>
2535
--- src/config.h
+++ src/config.h
@@ -15,10 +15,20 @@
15 **
16 *******************************************************************************
17 **
18 ** A common header file used by all modules.
19 */
 
 
 
 
 
 
 
 
 
 
20
21 /*
22 ** System header files used by all modules
23 */
24 #include <unistd.h>
25
--- src/config.h
+++ src/config.h
@@ -15,10 +15,20 @@
15 **
16 *******************************************************************************
17 **
18 ** A common header file used by all modules.
19 */
20
21 /* The following macros are necessary for large-file support under
22 ** some linux distributions, and possibly other unixes as well.
23 */
24 #define _LARGE_FILE 1
25 #ifndef _FILE_OFFSET_BITS
26 # define _FILE_OFFSET_BITS 64
27 #endif
28 #define _LARGEFILE_SOURCE 1
29
30
31 /*
32 ** System header files used by all modules
33 */
34 #include <unistd.h>
35
M src/db.c
+46 -27
--- src/db.c
+++ src/db.c
@@ -1492,10 +1492,48 @@
14921492
 }
14931493
 db_finalize(&q);
14941494
 }
14951495
14961496
1497
+/*
1498
+** define all settings, which can be controlled via the set/unset
1499
+** command. var is the name of the internal configuration name for db_(un)set.
1500
+** If var is 0, the settings name is used.
1501
+** width is the length for the edit field on the behavior page, 0
1502
+** is used for on/off checkboxes.
1503
+** The behaviour page doesn't use a special layout. It lists all
1504
+** set-commands and displays the 'set'-help as info.
1505
+*/
1506
+#if INTERFACE
1507
+struct stControlSettings {
1508
+ char const *name; /* Name of the setting */
1509
+ char const *var; /* Internal variable name used by db_set() */
1510
+ int width; /* Width of display. 0 for boolean values */
1511
+ char const *def; /* Default value */
1512
+};
1513
+#endif /* INTERFACE */
1514
+struct stControlSettings const ctrlSettings[] = {
1515
+ { "auto-captcha", "autocaptcha", 0, "0" },
1516
+ { "auto-shun", 0, 0, "1" },
1517
+ { "autosync", 0, 0, "0" },
1518
+ { "binary-glob", 0, 0, "1" },
1519
+ { "clearsign", 0, 0, "0" },
1520
+ { "diff-command", 0, 16, "diff" },
1521
+ { "dont-push", 0, 0, "0" },
1522
+ { "editor", 0, 16, "" },
1523
+ { "gdiff-command", 0, 16, "gdiff" },
1524
+ { "ignore-glob", 0, 40, "" },
1525
+ { "http-port", 0, 16, "8080" },
1526
+ { "localauth", 0, 0, "0" },
1527
+ { "mtime-changes", 0, 0, "0" },
1528
+ { "pgp-command", 0, 32, "gpg --clearsign -o " },
1529
+ { "proxy", 0, 32, "off" },
1530
+ { "ssh-command", 0, 32, "" },
1531
+ { "web-browser", 0, 32, "" },
1532
+ { 0,0,0,0 }
1533
+};
1534
+
14971535
 /*
14981536
 ** COMMAND: settings
14991537
 ** COMMAND: unset
15001538
 ** %fossil settings ?PROPERTY? ?VALUE? ?-global?
15011539
 ** %fossil unset PROPERTY ?-global?
@@ -1567,29 +1605,10 @@
15671605
 ** web browser when given a URL as an argument.
15681606
 ** Defaults to "start" on windows, "open" on Mac,
15691607
 ** and "firefox" on Unix.
15701608
 */
15711609
 void setting_cmd(void){
1572
- static const char *azName[] = {
1573
- "auto-captcha",
1574
- "auto-shun",
1575
- "autosync",
1576
- "binary-glob",
1577
- "clearsign",
1578
- "diff-command",
1579
- "dont-push",
1580
- "editor",
1581
- "gdiff-command",
1582
- "ignore-glob",
1583
- "http-port",
1584
- "localauth",
1585
- "mtime-changes",
1586
- "pgp-command",
1587
- "proxy",
1588
- "ssh-command",
1589
- "web-browser",
1590
- };
15911610
 int i;
15921611
 int globalFlag = find_option("global","g",0)!=0;
15931612
 int unsetFlag = g.argv[1][0]=='u';
15941613
 db_open_config(1);
15951614
 db_find_and_open_repository(0);
@@ -1598,28 +1617,28 @@
15981617
 }
15991618
 if( unsetFlag && g.argc!=3 ){
16001619
 usage("PROPERTY ?-global?");
16011620
 }
16021621
 if( g.argc==2 ){
1603
- for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){
1604
- print_setting(azName[i]);
1622
+ for(i=0; ctrlSettings[i].name; i++){
1623
+ print_setting(ctrlSettings[i].name);
16051624
 }
16061625
 }else if( g.argc==3 || g.argc==4 ){
16071626
 const char *zName = g.argv[2];
16081627
 int n = strlen(zName);
1609
- for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){
1610
- if( strncmp(azName[i], zName, n)==0 ) break;
1628
+ for(i=0; ctrlSettings[i].name; i++){
1629
+ if( strncmp(ctrlSettings[i].name, zName, n)==0 ) break;
16111630
 }
1612
- if( i>=sizeof(azName)/sizeof(azName[0]) ){
1631
+ if( !ctrlSettings[i].name ){
16131632
 fossil_fatal("no such setting: %s", zName);
16141633
 }
16151634
 if( unsetFlag ){
1616
- db_unset(azName[i], globalFlag);
1635
+ db_unset(ctrlSettings[i].name, globalFlag);
16171636
 }else if( g.argc==4 ){
1618
- db_set(azName[i], g.argv[3], globalFlag);
1637
+ db_set(ctrlSettings[i].name, g.argv[3], globalFlag);
16191638
 }else{
1620
- print_setting(azName[i]);
1639
+ print_setting(ctrlSettings[i].name);
16211640
 }
16221641
 }else{
16231642
 usage("?PROPERTY? ?VALUE?");
16241643
 }
16251644
 }
16261645
--- src/db.c
+++ src/db.c
@@ -1492,10 +1492,48 @@
1492 }
1493 db_finalize(&q);
1494 }
1495
1496
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1497 /*
1498 ** COMMAND: settings
1499 ** COMMAND: unset
1500 ** %fossil settings ?PROPERTY? ?VALUE? ?-global?
1501 ** %fossil unset PROPERTY ?-global?
@@ -1567,29 +1605,10 @@
1567 ** web browser when given a URL as an argument.
1568 ** Defaults to "start" on windows, "open" on Mac,
1569 ** and "firefox" on Unix.
1570 */
1571 void setting_cmd(void){
1572 static const char *azName[] = {
1573 "auto-captcha",
1574 "auto-shun",
1575 "autosync",
1576 "binary-glob",
1577 "clearsign",
1578 "diff-command",
1579 "dont-push",
1580 "editor",
1581 "gdiff-command",
1582 "ignore-glob",
1583 "http-port",
1584 "localauth",
1585 "mtime-changes",
1586 "pgp-command",
1587 "proxy",
1588 "ssh-command",
1589 "web-browser",
1590 };
1591 int i;
1592 int globalFlag = find_option("global","g",0)!=0;
1593 int unsetFlag = g.argv[1][0]=='u';
1594 db_open_config(1);
1595 db_find_and_open_repository(0);
@@ -1598,28 +1617,28 @@
1598 }
1599 if( unsetFlag && g.argc!=3 ){
1600 usage("PROPERTY ?-global?");
1601 }
1602 if( g.argc==2 ){
1603 for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){
1604 print_setting(azName[i]);
1605 }
1606 }else if( g.argc==3 || g.argc==4 ){
1607 const char *zName = g.argv[2];
1608 int n = strlen(zName);
1609 for(i=0; i<sizeof(azName)/sizeof(azName[0]); i++){
1610 if( strncmp(azName[i], zName, n)==0 ) break;
1611 }
1612 if( i>=sizeof(azName)/sizeof(azName[0]) ){
1613 fossil_fatal("no such setting: %s", zName);
1614 }
1615 if( unsetFlag ){
1616 db_unset(azName[i], globalFlag);
1617 }else if( g.argc==4 ){
1618 db_set(azName[i], g.argv[3], globalFlag);
1619 }else{
1620 print_setting(azName[i]);
1621 }
1622 }else{
1623 usage("?PROPERTY? ?VALUE?");
1624 }
1625 }
1626
--- src/db.c
+++ src/db.c
@@ -1492,10 +1492,48 @@
1492 }
1493 db_finalize(&q);
1494 }
1495
1496
1497 /*
1498 ** define all settings, which can be controlled via the set/unset
1499 ** command. var is the name of the internal configuration name for db_(un)set.
1500 ** If var is 0, the settings name is used.
1501 ** width is the length for the edit field on the behavior page, 0
1502 ** is used for on/off checkboxes.
1503 ** The behaviour page doesn't use a special layout. It lists all
1504 ** set-commands and displays the 'set'-help as info.
1505 */
1506 #if INTERFACE
1507 struct stControlSettings {
1508 char const *name; /* Name of the setting */
1509 char const *var; /* Internal variable name used by db_set() */
1510 int width; /* Width of display. 0 for boolean values */
1511 char const *def; /* Default value */
1512 };
1513 #endif /* INTERFACE */
1514 struct stControlSettings const ctrlSettings[] = {
1515 { "auto-captcha", "autocaptcha", 0, "0" },
1516 { "auto-shun", 0, 0, "1" },
1517 { "autosync", 0, 0, "0" },
1518 { "binary-glob", 0, 0, "1" },
1519 { "clearsign", 0, 0, "0" },
1520 { "diff-command", 0, 16, "diff" },
1521 { "dont-push", 0, 0, "0" },
1522 { "editor", 0, 16, "" },
1523 { "gdiff-command", 0, 16, "gdiff" },
1524 { "ignore-glob", 0, 40, "" },
1525 { "http-port", 0, 16, "8080" },
1526 { "localauth", 0, 0, "0" },
1527 { "mtime-changes", 0, 0, "0" },
1528 { "pgp-command", 0, 32, "gpg --clearsign -o " },
1529 { "proxy", 0, 32, "off" },
1530 { "ssh-command", 0, 32, "" },
1531 { "web-browser", 0, 32, "" },
1532 { 0,0,0,0 }
1533 };
1534
1535 /*
1536 ** COMMAND: settings
1537 ** COMMAND: unset
1538 ** %fossil settings ?PROPERTY? ?VALUE? ?-global?
1539 ** %fossil unset PROPERTY ?-global?
@@ -1567,29 +1605,10 @@
1605 ** web browser when given a URL as an argument.
1606 ** Defaults to "start" on windows, "open" on Mac,
1607 ** and "firefox" on Unix.
1608 */
1609 void setting_cmd(void){
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1610 int i;
1611 int globalFlag = find_option("global","g",0)!=0;
1612 int unsetFlag = g.argv[1][0]=='u';
1613 db_open_config(1);
1614 db_find_and_open_repository(0);
@@ -1598,28 +1617,28 @@
1617 }
1618 if( unsetFlag && g.argc!=3 ){
1619 usage("PROPERTY ?-global?");
1620 }
1621 if( g.argc==2 ){
1622 for(i=0; ctrlSettings[i].name; i++){
1623 print_setting(ctrlSettings[i].name);
1624 }
1625 }else if( g.argc==3 || g.argc==4 ){
1626 const char *zName = g.argv[2];
1627 int n = strlen(zName);
1628 for(i=0; ctrlSettings[i].name; i++){
1629 if( strncmp(ctrlSettings[i].name, zName, n)==0 ) break;
1630 }
1631 if( !ctrlSettings[i].name ){
1632 fossil_fatal("no such setting: %s", zName);
1633 }
1634 if( unsetFlag ){
1635 db_unset(ctrlSettings[i].name, globalFlag);
1636 }else if( g.argc==4 ){
1637 db_set(ctrlSettings[i].name, g.argv[3], globalFlag);
1638 }else{
1639 print_setting(ctrlSettings[i].name);
1640 }
1641 }else{
1642 usage("?PROPERTY? ?VALUE?");
1643 }
1644 }
1645
M src/diff.c
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -824,11 +824,11 @@
824824
 ** COMMAND: annotate
825825
 **
826826
 ** %fossil annotate FILENAME
827827
 **
828828
 ** Output the text of a file with markings to show when each line of
829
-** the file was introduced.
829
+** the file was last modified.
830830
 */
831831
 void annotate_cmd(void){
832832
 int fnid; /* Filename ID */
833833
 int fid; /* File instance ID */
834834
 int mid; /* Manifest where file was checked in */
835835
--- src/diff.c
+++ src/diff.c
@@ -824,11 +824,11 @@
824 ** COMMAND: annotate
825 **
826 ** %fossil annotate FILENAME
827 **
828 ** Output the text of a file with markings to show when each line of
829 ** the file was introduced.
830 */
831 void annotate_cmd(void){
832 int fnid; /* Filename ID */
833 int fid; /* File instance ID */
834 int mid; /* Manifest where file was checked in */
835
--- src/diff.c
+++ src/diff.c
@@ -824,11 +824,11 @@
824 ** COMMAND: annotate
825 **
826 ** %fossil annotate FILENAME
827 **
828 ** Output the text of a file with markings to show when each line of
829 ** the file was last modified.
830 */
831 void annotate_cmd(void){
832 int fnid; /* Filename ID */
833 int fid; /* File instance ID */
834 int mid; /* Manifest where file was checked in */
835
M src/diffcmd.c
-2
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -242,12 +242,10 @@
242242
 printf("DELETED %s\n", zPathname);
243243
 }else if( access(zFullName, 0) ){
244244
 printf("MISSING %s\n", zPathname);
245245
 }else if( isNew ){
246246
 printf("ADDED %s\n", zPathname);
247
- }else if( isDeleted ){
248
- printf("DELETED %s\n", zPathname);
249247
 }else if( isChnged==3 ){
250248
 printf("ADDED_BY_MERGE %s\n", zPathname);
251249
 }else{
252250
 int srcid = db_column_int(&q, 4);
253251
 Blob content;
254252
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -242,12 +242,10 @@
242 printf("DELETED %s\n", zPathname);
243 }else if( access(zFullName, 0) ){
244 printf("MISSING %s\n", zPathname);
245 }else if( isNew ){
246 printf("ADDED %s\n", zPathname);
247 }else if( isDeleted ){
248 printf("DELETED %s\n", zPathname);
249 }else if( isChnged==3 ){
250 printf("ADDED_BY_MERGE %s\n", zPathname);
251 }else{
252 int srcid = db_column_int(&q, 4);
253 Blob content;
254
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -242,12 +242,10 @@
242 printf("DELETED %s\n", zPathname);
243 }else if( access(zFullName, 0) ){
244 printf("MISSING %s\n", zPathname);
245 }else if( isNew ){
246 printf("ADDED %s\n", zPathname);
 
 
247 }else if( isChnged==3 ){
248 printf("ADDED_BY_MERGE %s\n", zPathname);
249 }else{
250 int srcid = db_column_int(&q, 4);
251 Blob content;
252
M src/file.c
+18 -2
--- src/file.c
+++ src/file.c
@@ -23,12 +23,20 @@
2323
 #include <unistd.h>
2424
 #include "file.h"
2525
2626
 /*
2727
 ** The file status information from the most recent stat() call.
28
+**
29
+** Use _stati64 rather than stat on windows, in order to handle files
30
+** larger than 2GB.
2831
 */
29
-static struct stat fileStat;
32
+#if defined(_WIN32) && defined(__MSVCRT__)
33
+ static struct _stati64 fileStat;
34
+# define stat _stati64
35
+#else
36
+ static struct stat fileStat;
37
+#endif
3038
 static int fileStatValid = 0;
3139
3240
 /*
3341
 ** Fill in the fileStat variable for the file named zFilename.
3442
 ** If zFilename==0, then use the previous value of fileStat if
@@ -291,21 +299,29 @@
291299
 blob_resize(pOut, file_simplify_name(blob_buffer(pOut), blob_size(pOut)));
292300
 }
293301
294302
 /*
295303
 ** COMMAND: test-canonical-name
304
+** Usage: %fossil test-canonical-name FILENAME...
296305
 **
297306
 ** Test the operation of the canonical name generator.
307
+** Also test Fossil's ability to measure attributes of a file.
298308
 */
299309
 void cmd_test_canonical_name(void){
300310
 int i;
301311
 Blob x;
302312
 blob_zero(&x);
303313
 for(i=2; i<g.argc; i++){
304
- file_canonical_name(g.argv[i], &x);
314
+ const char *zName = g.argv[i];
315
+ file_canonical_name(zName, &x);
305316
 printf("%s\n", blob_buffer(&x));
306317
 blob_reset(&x);
318
+ printf(" file_size = %lld\n", file_size(zName));
319
+ printf(" file_mtime = %lld\n", file_mtime(zName));
320
+ printf(" file_isfile = %d\n", file_isfile(zName));
321
+ printf(" file_isexe = %d\n", file_isexe(zName));
322
+ printf(" file_isdir = %d\n", file_isdir(zName));
307323
 }
308324
 }
309325
310326
 /*
311327
 ** Return TRUE if the given filename is canonical.
312328
--- src/file.c
+++ src/file.c
@@ -23,12 +23,20 @@
23 #include <unistd.h>
24 #include "file.h"
25
26 /*
27 ** The file status information from the most recent stat() call.
 
 
 
28 */
29 static struct stat fileStat;
 
 
 
 
 
30 static int fileStatValid = 0;
31
32 /*
33 ** Fill in the fileStat variable for the file named zFilename.
34 ** If zFilename==0, then use the previous value of fileStat if
@@ -291,21 +299,29 @@
291 blob_resize(pOut, file_simplify_name(blob_buffer(pOut), blob_size(pOut)));
292 }
293
294 /*
295 ** COMMAND: test-canonical-name
 
296 **
297 ** Test the operation of the canonical name generator.
 
298 */
299 void cmd_test_canonical_name(void){
300 int i;
301 Blob x;
302 blob_zero(&x);
303 for(i=2; i<g.argc; i++){
304 file_canonical_name(g.argv[i], &x);
 
305 printf("%s\n", blob_buffer(&x));
306 blob_reset(&x);
 
 
 
 
 
307 }
308 }
309
310 /*
311 ** Return TRUE if the given filename is canonical.
312
--- src/file.c
+++ src/file.c
@@ -23,12 +23,20 @@
23 #include <unistd.h>
24 #include "file.h"
25
26 /*
27 ** The file status information from the most recent stat() call.
28 **
29 ** Use _stati64 rather than stat on windows, in order to handle files
30 ** larger than 2GB.
31 */
32 #if defined(_WIN32) && defined(__MSVCRT__)
33 static struct _stati64 fileStat;
34 # define stat _stati64
35 #else
36 static struct stat fileStat;
37 #endif
38 static int fileStatValid = 0;
39
40 /*
41 ** Fill in the fileStat variable for the file named zFilename.
42 ** If zFilename==0, then use the previous value of fileStat if
@@ -291,21 +299,29 @@
299 blob_resize(pOut, file_simplify_name(blob_buffer(pOut), blob_size(pOut)));
300 }
301
302 /*
303 ** COMMAND: test-canonical-name
304 ** Usage: %fossil test-canonical-name FILENAME...
305 **
306 ** Test the operation of the canonical name generator.
307 ** Also test Fossil's ability to measure attributes of a file.
308 */
309 void cmd_test_canonical_name(void){
310 int i;
311 Blob x;
312 blob_zero(&x);
313 for(i=2; i<g.argc; i++){
314 const char *zName = g.argv[i];
315 file_canonical_name(zName, &x);
316 printf("%s\n", blob_buffer(&x));
317 blob_reset(&x);
318 printf(" file_size = %lld\n", file_size(zName));
319 printf(" file_mtime = %lld\n", file_mtime(zName));
320 printf(" file_isfile = %d\n", file_isfile(zName));
321 printf(" file_isexe = %d\n", file_isexe(zName));
322 printf(" file_isdir = %d\n", file_isdir(zName));
323 }
324 }
325
326 /*
327 ** Return TRUE if the given filename is canonical.
328
M src/report.c
+1 -1
--- src/report.c
+++ src/report.c
@@ -907,11 +907,11 @@
907907
 if( !tabs ){
908908
 struct GenerateHTML sState;
909909
910910
 db_multi_exec("PRAGMA empty_result_callbacks=ON");
911911
 style_submenu_element("Raw", "Raw",
912
- "rptview?tablist=1&amp;%s", PD("QUERY_STRING",""));
912
+ "rptview?tablist=1&amp;%h", PD("QUERY_STRING",""));
913913
 if( g.okAdmin
914914
 || (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915915
 style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916916
 }
917917
 if( g.okTktFmt ){
918918
--- src/report.c
+++ src/report.c
@@ -907,11 +907,11 @@
907 if( !tabs ){
908 struct GenerateHTML sState;
909
910 db_multi_exec("PRAGMA empty_result_callbacks=ON");
911 style_submenu_element("Raw", "Raw",
912 "rptview?tablist=1&amp;%s", PD("QUERY_STRING",""));
913 if( g.okAdmin
914 || (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915 style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916 }
917 if( g.okTktFmt ){
918
--- src/report.c
+++ src/report.c
@@ -907,11 +907,11 @@
907 if( !tabs ){
908 struct GenerateHTML sState;
909
910 db_multi_exec("PRAGMA empty_result_callbacks=ON");
911 style_submenu_element("Raw", "Raw",
912 "rptview?tablist=1&amp;%h", PD("QUERY_STRING",""));
913 if( g.okAdmin
914 || (g.okTktFmt && g.zLogin && zOwner && strcmp(g.zLogin,zOwner)==0) ){
915 style_submenu_element("Edit", "Edit", "rptedit?rn=%d", rn);
916 }
917 if( g.okTktFmt ){
918
M src/setup.c
+55
--- src/setup.c
+++ src/setup.c
@@ -19,10 +19,17 @@
1919
 */
2020
 #include <assert.h>
2121
 #include "config.h"
2222
 #include "setup.h"
2323
24
+/*
25
+** The table of web pages supported by this application is generated
26
+** automatically by the "mkindex" program and written into a file
27
+** named "page_index.h". We include that file here to get access
28
+** to the table.
29
+*/
30
+#include "page_index.h"
2431
2532
 /*
2633
 ** Output a single entry for a menu generated using an HTML table.
2734
 ** If zLink is not NULL or an empty string, then it is the page that
2835
 ** the menu entry will hyperlink to. If zLink is NULL or "", then
@@ -57,10 +64,12 @@
5764
 "Grant privileges to individual users.");
5865
 setup_menu_entry("Access", "setup_access",
5966
 "Control access settings.");
6067
 setup_menu_entry("Configuration", "setup_config",
6168
 "Configure the WWW components of the repository");
69
+ setup_menu_entry("Settings", "setup_settings",
70
+ "Web interface to the \"fossil settings\" command");
6271
 setup_menu_entry("Timeline", "setup_timeline",
6372
 "Timeline display preferences");
6473
 setup_menu_entry("Tickets", "tktsetup",
6574
 "Configure the trouble-ticketing system for this repository");
6675
 setup_menu_entry("Skins", "setup_skin",
@@ -844,10 +853,56 @@
844853
 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
845854
 @ </div></form>
846855
 db_end_transaction(0);
847856
 style_footer();
848857
 }
858
+
859
+/*
860
+** WEBPAGE: setup_settings
861
+*/
862
+void setup_settings(void){
863
+ struct stControlSettings const *pSet;
864
+
865
+ login_check_credentials();
866
+ if( !g.okSetup ){
867
+ login_needed();
868
+ }
869
+
870
+ style_header("Settings");
871
+ db_begin_transaction();
872
+ @ <p>This page provides a simple interface to the "fossil setting" command.
873
+ @ See the "fossil help setting" output below for further information on
874
+ @ the meaning of each setting.</p><hr />
875
+ @ <form action="%s(g.zBaseURL)/setup_settings" method="post"><div>
876
+ @ <table border="0"><tr><td valign="top">
877
+ login_insert_csrf_secret();
878
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
879
+ if( pSet->width==0 ){
880
+ onoff_attribute(pSet->name, pSet->name,
881
+ pSet->var!=0 ? pSet->var : pSet->name,
882
+ pSet->def[0]=='1');
883
+ @ <br />
884
+ }
885
+ }
886
+ @ </td><td width="30"></td><td valign="top">
887
+ for(pSet=ctrlSettings; pSet->name!=0; pSet++){
888
+ if( pSet->width!=0 ){
889
+ entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
890
+ pSet->var!=0 ? pSet->var : pSet->name,
891
+ (char*)pSet->def);
892
+ @ <br />
893
+ }
894
+ }
895
+ @ </tr></table>
896
+ @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
897
+ @ </div></form>
898
+ @ <hr /><p>
899
+ @ These settings work in the same way, as the <kbd>set</kbd> commandline:<br>
900
+ @ <pre>%s(zHelp_setting_cmd)</pre></p>
901
+ db_end_transaction(0);
902
+ style_footer();
903
+}
849904
850905
 /*
851906
 ** WEBPAGE: setup_config
852907
 */
853908
 void setup_config(void){
854909
--- src/setup.c
+++ src/setup.c
@@ -19,10 +19,17 @@
19 */
20 #include <assert.h>
21 #include "config.h"
22 #include "setup.h"
23
 
 
 
 
 
 
 
24
25 /*
26 ** Output a single entry for a menu generated using an HTML table.
27 ** If zLink is not NULL or an empty string, then it is the page that
28 ** the menu entry will hyperlink to. If zLink is NULL or "", then
@@ -57,10 +64,12 @@
57 "Grant privileges to individual users.");
58 setup_menu_entry("Access", "setup_access",
59 "Control access settings.");
60 setup_menu_entry("Configuration", "setup_config",
61 "Configure the WWW components of the repository");
 
 
62 setup_menu_entry("Timeline", "setup_timeline",
63 "Timeline display preferences");
64 setup_menu_entry("Tickets", "tktsetup",
65 "Configure the trouble-ticketing system for this repository");
66 setup_menu_entry("Skins", "setup_skin",
@@ -844,10 +853,56 @@
844 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
845 @ </div></form>
846 db_end_transaction(0);
847 style_footer();
848 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
849
850 /*
851 ** WEBPAGE: setup_config
852 */
853 void setup_config(void){
854
--- src/setup.c
+++ src/setup.c
@@ -19,10 +19,17 @@
19 */
20 #include <assert.h>
21 #include "config.h"
22 #include "setup.h"
23
24 /*
25 ** The table of web pages supported by this application is generated
26 ** automatically by the "mkindex" program and written into a file
27 ** named "page_index.h". We include that file here to get access
28 ** to the table.
29 */
30 #include "page_index.h"
31
32 /*
33 ** Output a single entry for a menu generated using an HTML table.
34 ** If zLink is not NULL or an empty string, then it is the page that
35 ** the menu entry will hyperlink to. If zLink is NULL or "", then
@@ -57,10 +64,12 @@
64 "Grant privileges to individual users.");
65 setup_menu_entry("Access", "setup_access",
66 "Control access settings.");
67 setup_menu_entry("Configuration", "setup_config",
68 "Configure the WWW components of the repository");
69 setup_menu_entry("Settings", "setup_settings",
70 "Web interface to the \"fossil settings\" command");
71 setup_menu_entry("Timeline", "setup_timeline",
72 "Timeline display preferences");
73 setup_menu_entry("Tickets", "tktsetup",
74 "Configure the trouble-ticketing system for this repository");
75 setup_menu_entry("Skins", "setup_skin",
@@ -844,10 +853,56 @@
853 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
854 @ </div></form>
855 db_end_transaction(0);
856 style_footer();
857 }
858
859 /*
860 ** WEBPAGE: setup_settings
861 */
862 void setup_settings(void){
863 struct stControlSettings const *pSet;
864
865 login_check_credentials();
866 if( !g.okSetup ){
867 login_needed();
868 }
869
870 style_header("Settings");
871 db_begin_transaction();
872 @ <p>This page provides a simple interface to the "fossil setting" command.
873 @ See the "fossil help setting" output below for further information on
874 @ the meaning of each setting.</p><hr />
875 @ <form action="%s(g.zBaseURL)/setup_settings" method="post"><div>
876 @ <table border="0"><tr><td valign="top">
877 login_insert_csrf_secret();
878 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
879 if( pSet->width==0 ){
880 onoff_attribute(pSet->name, pSet->name,
881 pSet->var!=0 ? pSet->var : pSet->name,
882 pSet->def[0]=='1');
883 @ <br />
884 }
885 }
886 @ </td><td width="30"></td><td valign="top">
887 for(pSet=ctrlSettings; pSet->name!=0; pSet++){
888 if( pSet->width!=0 ){
889 entry_attribute(pSet->name, /*pSet->width*/ 40, pSet->name,
890 pSet->var!=0 ? pSet->var : pSet->name,
891 (char*)pSet->def);
892 @ <br />
893 }
894 }
895 @ </tr></table>
896 @ <p><input type="submit" name="submit" value="Apply Changes" /></p>
897 @ </div></form>
898 @ <hr /><p>
899 @ These settings work in the same way, as the <kbd>set</kbd> commandline:<br>
900 @ <pre>%s(zHelp_setting_cmd)</pre></p>
901 db_end_transaction(0);
902 style_footer();
903 }
904
905 /*
906 ** WEBPAGE: setup_config
907 */
908 void setup_config(void){
909
M src/stat.c
+4 -3
--- src/stat.c
+++ src/stat.c
@@ -26,22 +26,23 @@
2626
 ** WEBPAGE: stat
2727
 **
2828
 ** Show statistics and global information about the repository.
2929
 */
3030
 void stat_page(void){
31
- i64 t;
32
- int n, m, fsize;
31
+ i64 t, fsize;
32
+ int n, m;
3333
 int szMax, szAvg;
3434
 char zBuf[100];
3535
3636
 login_check_credentials();
3737
 if( !g.okRead ){ login_needed(); return; }
3838
 style_header("Repository Statistics");
3939
 @ <table class="label-value">
4040
 @ <tr><th>Repository&nbsp;Size:</th><td>
4141
 fsize = file_size(g.zRepositoryName);
42
- @ %d(fsize) bytes
42
+ sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", fsize);
43
+ @ %s(zBuf) bytes
4344
 @ </td></tr>
4445
 @ <tr><th>Number&nbsp;Of&nbsp;Artifacts:</th><td>
4546
 n = db_int(0, "SELECT count(*) FROM blob");
4647
 m = db_int(0, "SELECT count(*) FROM delta");
4748
 @ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs)
4849
--- src/stat.c
+++ src/stat.c
@@ -26,22 +26,23 @@
26 ** WEBPAGE: stat
27 **
28 ** Show statistics and global information about the repository.
29 */
30 void stat_page(void){
31 i64 t;
32 int n, m, fsize;
33 int szMax, szAvg;
34 char zBuf[100];
35
36 login_check_credentials();
37 if( !g.okRead ){ login_needed(); return; }
38 style_header("Repository Statistics");
39 @ <table class="label-value">
40 @ <tr><th>Repository&nbsp;Size:</th><td>
41 fsize = file_size(g.zRepositoryName);
42 @ %d(fsize) bytes
 
43 @ </td></tr>
44 @ <tr><th>Number&nbsp;Of&nbsp;Artifacts:</th><td>
45 n = db_int(0, "SELECT count(*) FROM blob");
46 m = db_int(0, "SELECT count(*) FROM delta");
47 @ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs)
48
--- src/stat.c
+++ src/stat.c
@@ -26,22 +26,23 @@
26 ** WEBPAGE: stat
27 **
28 ** Show statistics and global information about the repository.
29 */
30 void stat_page(void){
31 i64 t, fsize;
32 int n, m;
33 int szMax, szAvg;
34 char zBuf[100];
35
36 login_check_credentials();
37 if( !g.okRead ){ login_needed(); return; }
38 style_header("Repository Statistics");
39 @ <table class="label-value">
40 @ <tr><th>Repository&nbsp;Size:</th><td>
41 fsize = file_size(g.zRepositoryName);
42 sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", fsize);
43 @ %s(zBuf) bytes
44 @ </td></tr>
45 @ <tr><th>Number&nbsp;Of&nbsp;Artifacts:</th><td>
46 n = db_int(0, "SELECT count(*) FROM blob");
47 m = db_int(0, "SELECT count(*) FROM delta");
48 @ %d(n) (stored as %d(n-m) full text and %d(m) delta blobs)
49
M src/style.c
+4 -2
--- src/style.c
+++ src/style.c
@@ -355,10 +355,11 @@
355355
 @ font-size: 1em; font-weight: normal;
356356
 @ padding: .25em;
357357
 @ margin: .2em 0 .2em 0;
358358
 @ float: left;
359359
 @ clear: left;
360
+@ white-space: nowrap;
360361
 @ }
361362
 @
362363
 @ /* The footer at the very bottom of the page */
363364
 @ div.footer {
364365
 @ font-size: 0.8em;
@@ -520,12 +521,13 @@
520521
 },
521522
 { "table.captcha",
522523
 "format for the layout table, used for the captcha display",
523524
 @ margin: auto;
524525
 @ padding: 10px;
525
- @ outline-width: 1;
526
- @ outline-style: double;
526
+ @ border-width: 1;
527
+ @ border-style: double;
528
+ @ bordor-color: black;
527529
 },
528530
 { "td.login_out_label",
529531
 "format for the label cells in the login/out table",
530532
 @ text-align: center;
531533
 },
532534
--- src/style.c
+++ src/style.c
@@ -355,10 +355,11 @@
355 @ font-size: 1em; font-weight: normal;
356 @ padding: .25em;
357 @ margin: .2em 0 .2em 0;
358 @ float: left;
359 @ clear: left;
 
360 @ }
361 @
362 @ /* The footer at the very bottom of the page */
363 @ div.footer {
364 @ font-size: 0.8em;
@@ -520,12 +521,13 @@
520 },
521 { "table.captcha",
522 "format for the layout table, used for the captcha display",
523 @ margin: auto;
524 @ padding: 10px;
525 @ outline-width: 1;
526 @ outline-style: double;
 
527 },
528 { "td.login_out_label",
529 "format for the label cells in the login/out table",
530 @ text-align: center;
531 },
532
--- src/style.c
+++ src/style.c
@@ -355,10 +355,11 @@
355 @ font-size: 1em; font-weight: normal;
356 @ padding: .25em;
357 @ margin: .2em 0 .2em 0;
358 @ float: left;
359 @ clear: left;
360 @ white-space: nowrap;
361 @ }
362 @
363 @ /* The footer at the very bottom of the page */
364 @ div.footer {
365 @ font-size: 0.8em;
@@ -520,12 +521,13 @@
521 },
522 { "table.captcha",
523 "format for the layout table, used for the captcha display",
524 @ margin: auto;
525 @ padding: 10px;
526 @ border-width: 1;
527 @ border-style: double;
528 @ bordor-color: black;
529 },
530 { "td.login_out_label",
531 "format for the label cells in the login/out table",
532 @ text-align: center;
533 },
534
M src/timeline.c
+3 -1
--- src/timeline.c
+++ src/timeline.c
@@ -347,10 +347,11 @@
347347
 if( pGraph && pGraph->nErr==0 ){
348348
 GraphRow *pRow;
349349
 int i;
350350
 char cSep;
351351
 @ <script type="text/JavaScript">
352
+ @ /* <![CDATA[ */
352353
 cgi_printf("var rowinfo = [\n");
353354
 for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
354355
 cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:",
355356
 pRow->idx,
356357
 pRow->zBgClr,
@@ -496,11 +497,11 @@
496497
 @ }
497498
 @ var btm = absoluteY("grbtm") + 10 - canvasY;
498499
 @ if( btm<32768 ){
499500
 @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
500501
 @ 'style="position:absolute;left:'+(left-5)+'px;"' +
501
- @ ' width="'+width+'" height="'+btm+'"></canvas>';
502
+ @ ' width="'+width+'" height="'+btm+'"><'+'/canvas>';
502503
 @ realCanvas = document.getElementById('timeline-canvas');
503504
 @ }else{
504505
 @ realCanvas = 0;
505506
 @ }
506507
 @ var context;
@@ -528,10 +529,11 @@
528529
 @ lastY = h;
529530
 @ }
530531
 @ setTimeout("checkHeight();", 1000);
531532
 @ }
532533
 @ checkHeight();
534
+ @ /* ]]> */
533535
 @ </script>
534536
 }
535537
 }
536538
537539
 /*
538540
--- src/timeline.c
+++ src/timeline.c
@@ -347,10 +347,11 @@
347 if( pGraph && pGraph->nErr==0 ){
348 GraphRow *pRow;
349 int i;
350 char cSep;
351 @ <script type="text/JavaScript">
 
352 cgi_printf("var rowinfo = [\n");
353 for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
354 cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:",
355 pRow->idx,
356 pRow->zBgClr,
@@ -496,11 +497,11 @@
496 @ }
497 @ var btm = absoluteY("grbtm") + 10 - canvasY;
498 @ if( btm<32768 ){
499 @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
500 @ 'style="position:absolute;left:'+(left-5)+'px;"' +
501 @ ' width="'+width+'" height="'+btm+'"></canvas>';
502 @ realCanvas = document.getElementById('timeline-canvas');
503 @ }else{
504 @ realCanvas = 0;
505 @ }
506 @ var context;
@@ -528,10 +529,11 @@
528 @ lastY = h;
529 @ }
530 @ setTimeout("checkHeight();", 1000);
531 @ }
532 @ checkHeight();
 
533 @ </script>
534 }
535 }
536
537 /*
538
--- src/timeline.c
+++ src/timeline.c
@@ -347,10 +347,11 @@
347 if( pGraph && pGraph->nErr==0 ){
348 GraphRow *pRow;
349 int i;
350 char cSep;
351 @ <script type="text/JavaScript">
352 @ /* <![CDATA[ */
353 cgi_printf("var rowinfo = [\n");
354 for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
355 cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:",
356 pRow->idx,
357 pRow->zBgClr,
@@ -496,11 +497,11 @@
497 @ }
498 @ var btm = absoluteY("grbtm") + 10 - canvasY;
499 @ if( btm<32768 ){
500 @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+
501 @ 'style="position:absolute;left:'+(left-5)+'px;"' +
502 @ ' width="'+width+'" height="'+btm+'"><'+'/canvas>';
503 @ realCanvas = document.getElementById('timeline-canvas');
504 @ }else{
505 @ realCanvas = 0;
506 @ }
507 @ var context;
@@ -528,10 +529,11 @@
529 @ lastY = h;
530 @ }
531 @ setTimeout("checkHeight();", 1000);
532 @ }
533 @ checkHeight();
534 @ /* ]]> */
535 @ </script>
536 }
537 }
538
539 /*
540
M src/wikiformat.c
+1 -4
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -745,13 +745,10 @@
745745
 static void renderMarkup(Blob *pOut, ParsedMarkup *p){
746746
 int i;
747747
 if( p->endTag ){
748748
 blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName);
749749
 }else{
750
- /* Close active paragraph for several elements, which are not allowed
751
- ** in paragraphs in XHTML.
752
- */
753750
 blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName);
754751
 for(i=0; i<p->nAttr; i++){
755752
 blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName);
756753
 if( p->aAttr[i].zValue ){
757754
 const char *zVal = p->aAttr[i].zValue;
@@ -893,11 +890,11 @@
893890
 ** Begin a new paragraph if that something that is needed.
894891
 */
895892
 static void startAutoParagraph(Renderer *p){
896893
 if( p->wantAutoParagraph==0 ) return;
897894
 if( p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return;
898
- blob_appendf(p->pOut, "<p type=\"auto\">", -1);
895
+ blob_appendf(p->pOut, "<p>", -1);
899896
 pushStack(p, MARKUP_P);
900897
 p->wantAutoParagraph = 0;
901898
 p->inAutoParagraph = 1;
902899
 }
903900
904901
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -745,13 +745,10 @@
745 static void renderMarkup(Blob *pOut, ParsedMarkup *p){
746 int i;
747 if( p->endTag ){
748 blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName);
749 }else{
750 /* Close active paragraph for several elements, which are not allowed
751 ** in paragraphs in XHTML.
752 */
753 blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName);
754 for(i=0; i<p->nAttr; i++){
755 blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName);
756 if( p->aAttr[i].zValue ){
757 const char *zVal = p->aAttr[i].zValue;
@@ -893,11 +890,11 @@
893 ** Begin a new paragraph if that something that is needed.
894 */
895 static void startAutoParagraph(Renderer *p){
896 if( p->wantAutoParagraph==0 ) return;
897 if( p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return;
898 blob_appendf(p->pOut, "<p type=\"auto\">", -1);
899 pushStack(p, MARKUP_P);
900 p->wantAutoParagraph = 0;
901 p->inAutoParagraph = 1;
902 }
903
904
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -745,13 +745,10 @@
745 static void renderMarkup(Blob *pOut, ParsedMarkup *p){
746 int i;
747 if( p->endTag ){
748 blob_appendf(pOut, "</%s>", aMarkup[p->iCode].zName);
749 }else{
 
 
 
750 blob_appendf(pOut, "<%s", aMarkup[p->iCode].zName);
751 for(i=0; i<p->nAttr; i++){
752 blob_appendf(pOut, " %s", aAttribute[p->aAttr[i].iACode].zName);
753 if( p->aAttr[i].zValue ){
754 const char *zVal = p->aAttr[i].zValue;
@@ -893,11 +890,11 @@
890 ** Begin a new paragraph if that something that is needed.
891 */
892 static void startAutoParagraph(Renderer *p){
893 if( p->wantAutoParagraph==0 ) return;
894 if( p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return;
895 blob_appendf(p->pOut, "<p>", -1);
896 pushStack(p, MARKUP_P);
897 p->wantAutoParagraph = 0;
898 p->inAutoParagraph = 1;
899 }
900
901

Keyboard Shortcuts

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