Fossil SCM

Merge recent changes from trunk.

drh 2014-12-17 21:36 search-using-fts4 merge
Commit 03309b1b9561466c193a3fcd7d2f2d1be92614a0
Parent bbcce76f2645a98…
2 files changed +5 -5 +47 -32
~ src/browse.c ~ src/sitemap.c
M src/browse.c
+5 -5
--- src/browse.c
+++ src/browse.c
@@ -940,20 +940,20 @@
940940
 char *human_readable_age(double rAge){
941941
 if( rAge*86400.0<120 ){
942942
 if( rAge*86400.0<1.0 ){
943943
 return mprintf("current");
944944
 }else{
945
- return mprintf("-%d seconds", (int)(rAge*86400.0));
945
+ return mprintf("%d seconds", (int)(rAge*86400.0));
946946
 }
947947
 }else if( rAge*1440.0<90 ){
948
- return mprintf("-%.1f minutes", rAge*1440.0);
948
+ return mprintf("%.1f minutes", rAge*1440.0);
949949
 }else if( rAge*24.0<36 ){
950
- return mprintf("-%.1f hours", rAge*24.0);
950
+ return mprintf("%.1f hours", rAge*24.0);
951951
 }else if( rAge<365.0 ){
952
- return mprintf("-%.1f days", rAge);
952
+ return mprintf("%.1f days", rAge);
953953
 }else{
954
- return mprintf("-%.2f years", rAge/365.0);
954
+ return mprintf("%.2f years", rAge/365.0);
955955
 }
956956
 }
957957
958958
 /*
959959
 ** COMMAND: test-fileage
960960
--- src/browse.c
+++ src/browse.c
@@ -940,20 +940,20 @@
940 char *human_readable_age(double rAge){
941 if( rAge*86400.0<120 ){
942 if( rAge*86400.0<1.0 ){
943 return mprintf("current");
944 }else{
945 return mprintf("-%d seconds", (int)(rAge*86400.0));
946 }
947 }else if( rAge*1440.0<90 ){
948 return mprintf("-%.1f minutes", rAge*1440.0);
949 }else if( rAge*24.0<36 ){
950 return mprintf("-%.1f hours", rAge*24.0);
951 }else if( rAge<365.0 ){
952 return mprintf("-%.1f days", rAge);
953 }else{
954 return mprintf("-%.2f years", rAge/365.0);
955 }
956 }
957
958 /*
959 ** COMMAND: test-fileage
960
--- src/browse.c
+++ src/browse.c
@@ -940,20 +940,20 @@
940 char *human_readable_age(double rAge){
941 if( rAge*86400.0<120 ){
942 if( rAge*86400.0<1.0 ){
943 return mprintf("current");
944 }else{
945 return mprintf("%d seconds", (int)(rAge*86400.0));
946 }
947 }else if( rAge*1440.0<90 ){
948 return mprintf("%.1f minutes", rAge*1440.0);
949 }else if( rAge*24.0<36 ){
950 return mprintf("%.1f hours", rAge*24.0);
951 }else if( rAge<365.0 ){
952 return mprintf("%.1f days", rAge);
953 }else{
954 return mprintf("%.2f years", rAge/365.0);
955 }
956 }
957
958 /*
959 ** COMMAND: test-fileage
960
M src/sitemap.c
+47 -32
--- src/sitemap.c
+++ src/sitemap.c
@@ -33,54 +33,69 @@
3333
 @ The following links are just a few of the many web-pages available for
3434
 @ this Fossil repository:
3535
 @ </p>
3636
 @
3737
 @ <ul>
38
- @ <li>%z(href("%R/home"))Home Page</a>
39
- @ <li>%z(href("%R/tree"))File Browser</a>
38
+ @ <li>%z(href("%R/home"))Home Page</a></li>
39
+ @ <li>%z(href("%R/tree"))File Browser</a></li>
4040
 @ <ul>
41
- @ <li>%z(href("%R/tree?ci=trunk"))Tree-view, Trunk Checkin</a>
42
- @ <li>%z(href("%R/tree?type=flat"))Flat-view</a>
43
- @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a>
41
+ @ <li>%z(href("%R/tree?ci=trunk"))Tree-view, Trunk Checkin</a></li>
42
+ @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
43
+ @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
4444
 @ </ul>
45
- @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a>
45
+ @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
4646
 @ <ul>
47
- @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10 checkins</a>
47
+ @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10 checkins</a></li>
4848
 @ <li>%z(href("%R/timeline?n=0&namechng"))All checkins with file name
49
- @ changes</a>
49
+ @ changes</a></li>
50
+ @ <li>%z(href("%R/reports"))Activity Reports</a></li>
51
+ @ </ul>
52
+ @ <li>Branches and Tags</a>
53
+ @ <ul>
54
+ @ <li>%z(href("%R/brlist"))Branches</a></li>
55
+ @ <li>%z(href("%R/leaves"))Leaf Checkins</a></li>
56
+ @ <li>%z(href("%R/taglist"))List of Tags</a></li>
5057
 @ </ul>
51
- @ <li>%z(href("%R/brlist"))Branches</a>
52
- @ <li>%z(href("%R/leaves"))Leaf Checkins</a>
53
- @ <li>%z(href("%R/taglist"))List of Tags</a>
54
- @ <li>%z(href("%R/wcontent"))List of Wiki Pages</a>
55
- @ <li>%z(href("%R/reportlist"))Ticket Reports</a>
56
- @ <li>%z(href("%R/reports"))Activity Reports</a>
57
- @ <li>%z(href("%R/login"))Login/Logout/Change Password</a>
58
- @ <li>%z(href("%R/attachlist"))List of Attachments</a>
58
+ @ </li>
59
+ @ <li>%z(href("%R/wiki"))Wiki</a>
60
+ @ <ul>
61
+ @ <li>%z(href("%R/wcontent"))List of Wiki Pages</a></li>
62
+ @ <li>%z(href("%R/timeline?y=w"))Recent activity</a></li>
63
+ @ <li>%z(href("%R/wiki_rules"))Wiki Formatting Rules</a></li>
64
+ @ <li>%z(href("%R/attachlist"))List of Attachments</a></li>
65
+ @ </ul>
66
+ @ </li>
67
+ @ <li>%z(href("%R/reportlist"))Tickets</a>
68
+ @ <ul>
69
+ @ <li>%z(href("%R/timeline?y=t"))Recent activity</a></li>
70
+ @ <li>%z(href("%R/attachlist"))List of Attachments</a></li>
71
+ @ </ul>
72
+ @ </li>
73
+ @ <li>%z(href("%R/login"))Login/Logout/Change Password</a></li>
5974
 @ <li>Repository Status
6075
 @ <ul>
61
- @ <li>%z(href("%R/stat"))Status Summary</a>
62
- @ <li>%z(href("%R/urllist"))List of URLs used to access this repository</a>
63
- @ <li>%z(href("%R/bloblist"))List of Artifacts</a>
64
- @ </ul>
76
+ @ <li>%z(href("%R/stat"))Status Summary</a></li>
77
+ @ <li>%z(href("%R/urllist"))List of URLs used to access this repository</a></li>
78
+ @ <li>%z(href("%R/bloblist"))List of Artifacts</a></li>
79
+ @ </ul></li>
6580
 @ <li>On-line Documentation
6681
 @ <ul>
67
- @ <li>%z(href("%R/help"))List of All Commands and Web Pages</a>
68
- @ <li>%z(href("%R/test-all-help"))All "help" text on a single page</a>
69
- @ <li>%z(href("%R/wiki_rules"))Wiki Formatting Rules</a>
70
- @ </ul>
82
+ @ <li>%z(href("%R/help"))List of All Commands and Web Pages</a></li>
83
+ @ <li>%z(href("%R/test-all-help"))All "help" text on a single page</a></li>
84
+ @ </ul></li>
7185
 @ <li>Administration Pages
7286
 @ <ul>
73
- @ <li>%z(href("%R/setup"))Configuration and Setup Menu</a>
74
- @ <li>%z(href("%R/modreq"))Pending Moderation Requests</a>
75
- @ </ul>
87
+ @ <li>%z(href("%R/setup"))Configuration and Setup Menu</a></li>
88
+ @ <li>%z(href("%R/modreq"))Pending Moderation Requests</a></li>
89
+ @ <li>%z(href("%R/admin_log"))Admin log</a></li>
90
+ @ </ul></li>
7691
 @ <li>Test Pages
7792
 @ <ul>
78
- @ <li>%z(href("%R/test_env"))CGI Environment Test</a>
79
- @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Checkins</a>
80
- @ <li>%z(href("%R/test-rename-list"))List of file renames</a>
93
+ @ <li>%z(href("%R/test_env"))CGI Environment Test</a></li>
94
+ @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Checkins</a></li>
95
+ @ <li>%z(href("%R/test-rename-list"))List of file renames</a></li>
8196
 @ <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
8297
 @ colors assigned to branch names</a>
83
- @ </ul>
84
- @ </ul>
98
+ @ </ul></li>
99
+ @ </ul></li>
85100
 style_footer();
86101
 }
87102
--- src/sitemap.c
+++ src/sitemap.c
@@ -33,54 +33,69 @@
33 @ The following links are just a few of the many web-pages available for
34 @ this Fossil repository:
35 @ </p>
36 @
37 @ <ul>
38 @ <li>%z(href("%R/home"))Home Page</a>
39 @ <li>%z(href("%R/tree"))File Browser</a>
40 @ <ul>
41 @ <li>%z(href("%R/tree?ci=trunk"))Tree-view, Trunk Checkin</a>
42 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a>
43 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a>
44 @ </ul>
45 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a>
46 @ <ul>
47 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10 checkins</a>
48 @ <li>%z(href("%R/timeline?n=0&namechng"))All checkins with file name
49 @ changes</a>
 
 
 
 
 
 
 
50 @ </ul>
51 @ <li>%z(href("%R/brlist"))Branches</a>
52 @ <li>%z(href("%R/leaves"))Leaf Checkins</a>
53 @ <li>%z(href("%R/taglist"))List of Tags</a>
54 @ <li>%z(href("%R/wcontent"))List of Wiki Pages</a>
55 @ <li>%z(href("%R/reportlist"))Ticket Reports</a>
56 @ <li>%z(href("%R/reports"))Activity Reports</a>
57 @ <li>%z(href("%R/login"))Login/Logout/Change Password</a>
58 @ <li>%z(href("%R/attachlist"))List of Attachments</a>
 
 
 
 
 
 
 
 
59 @ <li>Repository Status
60 @ <ul>
61 @ <li>%z(href("%R/stat"))Status Summary</a>
62 @ <li>%z(href("%R/urllist"))List of URLs used to access this repository</a>
63 @ <li>%z(href("%R/bloblist"))List of Artifacts</a>
64 @ </ul>
65 @ <li>On-line Documentation
66 @ <ul>
67 @ <li>%z(href("%R/help"))List of All Commands and Web Pages</a>
68 @ <li>%z(href("%R/test-all-help"))All "help" text on a single page</a>
69 @ <li>%z(href("%R/wiki_rules"))Wiki Formatting Rules</a>
70 @ </ul>
71 @ <li>Administration Pages
72 @ <ul>
73 @ <li>%z(href("%R/setup"))Configuration and Setup Menu</a>
74 @ <li>%z(href("%R/modreq"))Pending Moderation Requests</a>
75 @ </ul>
 
76 @ <li>Test Pages
77 @ <ul>
78 @ <li>%z(href("%R/test_env"))CGI Environment Test</a>
79 @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Checkins</a>
80 @ <li>%z(href("%R/test-rename-list"))List of file renames</a>
81 @ <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
82 @ colors assigned to branch names</a>
83 @ </ul>
84 @ </ul>
85 style_footer();
86 }
87
--- src/sitemap.c
+++ src/sitemap.c
@@ -33,54 +33,69 @@
33 @ The following links are just a few of the many web-pages available for
34 @ this Fossil repository:
35 @ </p>
36 @
37 @ <ul>
38 @ <li>%z(href("%R/home"))Home Page</a></li>
39 @ <li>%z(href("%R/tree"))File Browser</a></li>
40 @ <ul>
41 @ <li>%z(href("%R/tree?ci=trunk"))Tree-view, Trunk Checkin</a></li>
42 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
43 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
44 @ </ul>
45 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
46 @ <ul>
47 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10 checkins</a></li>
48 @ <li>%z(href("%R/timeline?n=0&namechng"))All checkins with file name
49 @ changes</a></li>
50 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
51 @ </ul>
52 @ <li>Branches and Tags</a>
53 @ <ul>
54 @ <li>%z(href("%R/brlist"))Branches</a></li>
55 @ <li>%z(href("%R/leaves"))Leaf Checkins</a></li>
56 @ <li>%z(href("%R/taglist"))List of Tags</a></li>
57 @ </ul>
58 @ </li>
59 @ <li>%z(href("%R/wiki"))Wiki</a>
60 @ <ul>
61 @ <li>%z(href("%R/wcontent"))List of Wiki Pages</a></li>
62 @ <li>%z(href("%R/timeline?y=w"))Recent activity</a></li>
63 @ <li>%z(href("%R/wiki_rules"))Wiki Formatting Rules</a></li>
64 @ <li>%z(href("%R/attachlist"))List of Attachments</a></li>
65 @ </ul>
66 @ </li>
67 @ <li>%z(href("%R/reportlist"))Tickets</a>
68 @ <ul>
69 @ <li>%z(href("%R/timeline?y=t"))Recent activity</a></li>
70 @ <li>%z(href("%R/attachlist"))List of Attachments</a></li>
71 @ </ul>
72 @ </li>
73 @ <li>%z(href("%R/login"))Login/Logout/Change Password</a></li>
74 @ <li>Repository Status
75 @ <ul>
76 @ <li>%z(href("%R/stat"))Status Summary</a></li>
77 @ <li>%z(href("%R/urllist"))List of URLs used to access this repository</a></li>
78 @ <li>%z(href("%R/bloblist"))List of Artifacts</a></li>
79 @ </ul></li>
80 @ <li>On-line Documentation
81 @ <ul>
82 @ <li>%z(href("%R/help"))List of All Commands and Web Pages</a></li>
83 @ <li>%z(href("%R/test-all-help"))All "help" text on a single page</a></li>
84 @ </ul></li>
 
85 @ <li>Administration Pages
86 @ <ul>
87 @ <li>%z(href("%R/setup"))Configuration and Setup Menu</a></li>
88 @ <li>%z(href("%R/modreq"))Pending Moderation Requests</a></li>
89 @ <li>%z(href("%R/admin_log"))Admin log</a></li>
90 @ </ul></li>
91 @ <li>Test Pages
92 @ <ul>
93 @ <li>%z(href("%R/test_env"))CGI Environment Test</a></li>
94 @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Checkins</a></li>
95 @ <li>%z(href("%R/test-rename-list"))List of file renames</a></li>
96 @ <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
97 @ colors assigned to branch names</a>
98 @ </ul></li>
99 @ </ul></li>
100 style_footer();
101 }
102

Keyboard Shortcuts

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