Fossil SCM

Remove wordy side bars from two obscure pages. Change "Checkin" to "Check-in" on generated pages. Fix a typo on the webpage-ex.md documentation page.

drh 2015-02-27 13:36 trunk
Commit 76e77aba292c7a174def31e4d1a1e5c569eacbef
Parent fe38a768db2ccfe…
9 files changed +3 -1 +1 -1 +2 +1 -1 +5 -5 +6 -6 +12 -12 +5 -5 -1
~ src/branch.c ~ src/browse.c ~ src/descendants.c ~ src/name.c ~ src/sitemap.c ~ src/statrep.c ~ src/timeline.c ~ src/update.c ~ www/webpage-ex.md
M src/branch.c
+3 -1
--- src/branch.c
+++ src/branch.c
@@ -350,11 +350,11 @@
350350
 rNow = db_double(0.0, "SELECT julianday('now')");
351351
 @ <div class="brlist"><table id="branchlisttable">
352352
 @ <thead><tr>
353353
 @ <th>Branch Name</th>
354354
 @ <th>Age</th>
355
- @ <th>Checkins</th>
355
+ @ <th>Check-ins</th>
356356
 @ <th>Status</th>
357357
 @ <th>Resolution</th>
358358
 @ </tr></thead><tbody>
359359
 while( db_step(&q)==SQLITE_ROW ){
360360
 const char *zBranch = db_column_text(&q, 0);
@@ -435,10 +435,11 @@
435435
 style_submenu_element("Color-Test", "Color-Test", "brlist?colortest");
436436
 }else{
437437
 style_submenu_element("All", "All", "brlist?all");
438438
 }
439439
 login_anonymous_available();
440
+#if 0
440441
 style_sidebox_begin("Nomenclature:", "33%");
441442
 @ <ol>
442443
 @ <li> An <div class="sideboxDescribed">%z(href("brlist"))
443444
 @ open branch</a></div> is a branch that has one or more
444445
 @ <div class="sideboxDescribed">%z(href("leaves"))open leaves.</a></div>
@@ -450,10 +451,11 @@
450451
 @ closed leaves</a></div>.
451452
 @ Closed branches are fixed and do not change (unless they are first
452453
 @ reopened).</li>
453454
 @ </ol>
454455
 style_sidebox_end();
456
+#endif
455457
456458
 branch_prepare_list_query(&q, brFlags);
457459
 cnt = 0;
458460
 while( db_step(&q)==SQLITE_ROW ){
459461
 const char *zBr = db_column_text(&q, 0);
460462
--- src/branch.c
+++ src/branch.c
@@ -350,11 +350,11 @@
350 rNow = db_double(0.0, "SELECT julianday('now')");
351 @ <div class="brlist"><table id="branchlisttable">
352 @ <thead><tr>
353 @ <th>Branch Name</th>
354 @ <th>Age</th>
355 @ <th>Checkins</th>
356 @ <th>Status</th>
357 @ <th>Resolution</th>
358 @ </tr></thead><tbody>
359 while( db_step(&q)==SQLITE_ROW ){
360 const char *zBranch = db_column_text(&q, 0);
@@ -435,10 +435,11 @@
435 style_submenu_element("Color-Test", "Color-Test", "brlist?colortest");
436 }else{
437 style_submenu_element("All", "All", "brlist?all");
438 }
439 login_anonymous_available();
 
440 style_sidebox_begin("Nomenclature:", "33%");
441 @ <ol>
442 @ <li> An <div class="sideboxDescribed">%z(href("brlist"))
443 @ open branch</a></div> is a branch that has one or more
444 @ <div class="sideboxDescribed">%z(href("leaves"))open leaves.</a></div>
@@ -450,10 +451,11 @@
450 @ closed leaves</a></div>.
451 @ Closed branches are fixed and do not change (unless they are first
452 @ reopened).</li>
453 @ </ol>
454 style_sidebox_end();
 
455
456 branch_prepare_list_query(&q, brFlags);
457 cnt = 0;
458 while( db_step(&q)==SQLITE_ROW ){
459 const char *zBr = db_column_text(&q, 0);
460
--- src/branch.c
+++ src/branch.c
@@ -350,11 +350,11 @@
350 rNow = db_double(0.0, "SELECT julianday('now')");
351 @ <div class="brlist"><table id="branchlisttable">
352 @ <thead><tr>
353 @ <th>Branch Name</th>
354 @ <th>Age</th>
355 @ <th>Check-ins</th>
356 @ <th>Status</th>
357 @ <th>Resolution</th>
358 @ </tr></thead><tbody>
359 while( db_step(&q)==SQLITE_ROW ){
360 const char *zBranch = db_column_text(&q, 0);
@@ -435,10 +435,11 @@
435 style_submenu_element("Color-Test", "Color-Test", "brlist?colortest");
436 }else{
437 style_submenu_element("All", "All", "brlist?all");
438 }
439 login_anonymous_available();
440 #if 0
441 style_sidebox_begin("Nomenclature:", "33%");
442 @ <ol>
443 @ <li> An <div class="sideboxDescribed">%z(href("brlist"))
444 @ open branch</a></div> is a branch that has one or more
445 @ <div class="sideboxDescribed">%z(href("leaves"))open leaves.</a></div>
@@ -450,10 +451,11 @@
451 @ closed leaves</a></div>.
452 @ Closed branches are fixed and do not change (unless they are first
453 @ reopened).</li>
454 @ </ol>
455 style_sidebox_end();
456 #endif
457
458 branch_prepare_list_query(&q, brFlags);
459 cnt = 0;
460 while( db_step(&q)==SQLITE_ROW ){
461 const char *zBr = db_column_text(&q, 0);
462
M src/browse.c
+1 -1
--- src/browse.c
+++ src/browse.c
@@ -1033,11 +1033,11 @@
10331033
 @ <p>Times are relative to the checkin time for
10341034
 @ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
10351035
 @ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
10361036
 @
10371037
 @ <div class='fileage'><table>
1038
- @ <tr><th>Time</th><th>Files</th><th>Checkin</th></tr>
1038
+ @ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr>
10391039
 db_prepare(&q1,
10401040
 "SELECT event.mtime, event.objid, blob.uuid,\n"
10411041
 " coalesce(event.ecomment,event.comment),\n"
10421042
 " coalesce(event.euser,event.user),\n"
10431043
 " coalesce((SELECT value FROM tagxref\n"
10441044
--- src/browse.c
+++ src/browse.c
@@ -1033,11 +1033,11 @@
1033 @ <p>Times are relative to the checkin time for
1034 @ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
1035 @ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
1036 @
1037 @ <div class='fileage'><table>
1038 @ <tr><th>Time</th><th>Files</th><th>Checkin</th></tr>
1039 db_prepare(&q1,
1040 "SELECT event.mtime, event.objid, blob.uuid,\n"
1041 " coalesce(event.ecomment,event.comment),\n"
1042 " coalesce(event.euser,event.user),\n"
1043 " coalesce((SELECT value FROM tagxref\n"
1044
--- src/browse.c
+++ src/browse.c
@@ -1033,11 +1033,11 @@
1033 @ <p>Times are relative to the checkin time for
1034 @ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
1035 @ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
1036 @
1037 @ <div class='fileage'><table>
1038 @ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr>
1039 db_prepare(&q1,
1040 "SELECT event.mtime, event.objid, blob.uuid,\n"
1041 " coalesce(event.ecomment,event.comment),\n"
1042 " coalesce(event.euser,event.user),\n"
1043 " coalesce((SELECT value FROM tagxref\n"
1044
M src/descendants.c
+2
--- src/descendants.c
+++ src/descendants.c
@@ -452,10 +452,11 @@
452452
 if( showClosed || showAll ){
453453
 style_submenu_element("Open", "Open", "leaves");
454454
 }
455455
 style_header("Leaves");
456456
 login_anonymous_available();
457
+#if 0
457458
 style_sidebox_begin("Nomenclature:", "33%");
458459
 @ <ol>
459460
 @ <li> A <div class="sideboxDescribed">leaf</div>
460461
 @ is a check-in with no descendants in the same branch.</li>
461462
 @ <li> An <div class="sideboxDescribed">open leaf</div>
@@ -464,10 +465,11 @@
464465
 @ <li> A <div class="sideboxDescribed">closed leaf</div>
465466
 @ has a "closed" tag and is thus assumed to
466467
 @ be historical and no longer in active use.</li>
467468
 @ </ol>
468469
 style_sidebox_end();
470
+#endif
469471
470472
 if( showAll ){
471473
 @ <h1>All leaves, both open and closed:</h1>
472474
 }else if( showClosed ){
473475
 @ <h1>Closed leaves:</h1>
474476
--- src/descendants.c
+++ src/descendants.c
@@ -452,10 +452,11 @@
452 if( showClosed || showAll ){
453 style_submenu_element("Open", "Open", "leaves");
454 }
455 style_header("Leaves");
456 login_anonymous_available();
 
457 style_sidebox_begin("Nomenclature:", "33%");
458 @ <ol>
459 @ <li> A <div class="sideboxDescribed">leaf</div>
460 @ is a check-in with no descendants in the same branch.</li>
461 @ <li> An <div class="sideboxDescribed">open leaf</div>
@@ -464,10 +465,11 @@
464 @ <li> A <div class="sideboxDescribed">closed leaf</div>
465 @ has a "closed" tag and is thus assumed to
466 @ be historical and no longer in active use.</li>
467 @ </ol>
468 style_sidebox_end();
 
469
470 if( showAll ){
471 @ <h1>All leaves, both open and closed:</h1>
472 }else if( showClosed ){
473 @ <h1>Closed leaves:</h1>
474
--- src/descendants.c
+++ src/descendants.c
@@ -452,10 +452,11 @@
452 if( showClosed || showAll ){
453 style_submenu_element("Open", "Open", "leaves");
454 }
455 style_header("Leaves");
456 login_anonymous_available();
457 #if 0
458 style_sidebox_begin("Nomenclature:", "33%");
459 @ <ol>
460 @ <li> A <div class="sideboxDescribed">leaf</div>
461 @ is a check-in with no descendants in the same branch.</li>
462 @ <li> An <div class="sideboxDescribed">open leaf</div>
@@ -464,10 +465,11 @@
465 @ <li> A <div class="sideboxDescribed">closed leaf</div>
466 @ has a "closed" tag and is thus assumed to
467 @ be historical and no longer in active use.</li>
468 @ </ol>
469 style_sidebox_end();
470 #endif
471
472 if( showAll ){
473 @ <h1>All leaves, both open and closed:</h1>
474 }else if( showClosed ){
475 @ <h1>Closed leaves:</h1>
476
M src/name.c
+1 -1
--- src/name.c
+++ src/name.c
@@ -806,11 +806,11 @@
806806
807807
 /* Describe checkins */
808808
 db_multi_exec(
809809
 "INSERT OR IGNORE INTO description(rid,uuid,ctime,type,summary)\n"
810810
 "SELECT blob.rid, blob.uuid, event.mtime, 'checkin',\n"
811
- " 'checkin on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
811
+ " 'check-in on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
812812
 " FROM event, blob\n"
813813
 " WHERE (event.objid %s) AND event.type='ci'\n"
814814
 " AND event.objid=blob.rid;",
815815
 zWhere /*safe-for-%s*/
816816
 );
817817
--- src/name.c
+++ src/name.c
@@ -806,11 +806,11 @@
806
807 /* Describe checkins */
808 db_multi_exec(
809 "INSERT OR IGNORE INTO description(rid,uuid,ctime,type,summary)\n"
810 "SELECT blob.rid, blob.uuid, event.mtime, 'checkin',\n"
811 " 'checkin on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
812 " FROM event, blob\n"
813 " WHERE (event.objid %s) AND event.type='ci'\n"
814 " AND event.objid=blob.rid;",
815 zWhere /*safe-for-%s*/
816 );
817
--- src/name.c
+++ src/name.c
@@ -806,11 +806,11 @@
806
807 /* Describe checkins */
808 db_multi_exec(
809 "INSERT OR IGNORE INTO description(rid,uuid,ctime,type,summary)\n"
810 "SELECT blob.rid, blob.uuid, event.mtime, 'checkin',\n"
811 " 'check-in on ' || strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
812 " FROM event, blob\n"
813 " WHERE (event.objid %s) AND event.type='ci'\n"
814 " AND event.objid=blob.rid;",
815 zWhere /*safe-for-%s*/
816 );
817
M src/sitemap.c
+5 -5
--- src/sitemap.c
+++ src/sitemap.c
@@ -41,25 +41,25 @@
4141
 @ <li>%z(href("%R/docsrc"))Search Project Documentation</a></li>
4242
 @ </ul></li>
4343
 @ <li>%z(href("%R/tree"))File Browser</a></li>
4444
 @ <ul>
4545
 @ <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
46
- @ Trunk Checkin</a></li>
46
+ @ Trunk Check-in</a></li>
4747
 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
4848
 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
4949
 @ </ul>
5050
 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
5151
 @ <ul>
5252
 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
53
- @ checkins</a></li>
54
- @ <li>%z(href("%R/timeline?n=all&namechng"))All checkins with file name
53
+ @ check-ins</a></li>
54
+ @ <li>%z(href("%R/timeline?n=all&namechng"))All check-ins with file name
5555
 @ changes</a></li>
5656
 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
5757
 @ </ul>
5858
 @ <li>%z(href("%R/brlist"))Branches</a></li>
5959
 @ <ul>
60
- @ <li>%z(href("%R/leaves"))Leaf Checkins</a></li>
60
+ @ <li>%z(href("%R/leaves"))Leaf Check-ins</a></li>
6161
 @ <li>%z(href("%R/taglist"))List of Tags</a></li>
6262
 @ </ul>
6363
 @ </li>
6464
 @ <li>%z(href("%R/wikihelp"))Wiki</a>
6565
 @ <ul>
@@ -102,13 +102,13 @@
102102
 @ <li>%z(href("%R/cachestat"))Status of the web-page cache</a></li>
103103
 @ </ul></li>
104104
 @ <li>Test Pages
105105
 @ <ul>
106106
 @ <li>%z(href("%R/test_env"))CGI Environment Test</a></li>
107
- @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Checkins</a></li>
107
+ @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Check-ins</a></li>
108108
 @ <li>%z(href("%R/test-rename-list"))List of file renames</a></li>
109109
 @ <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
110110
 @ colors assigned to branch names</a>
111111
 @ </ul></li>
112112
 @ </ul></li>
113113
 style_footer();
114114
 }
115115
--- src/sitemap.c
+++ src/sitemap.c
@@ -41,25 +41,25 @@
41 @ <li>%z(href("%R/docsrc"))Search Project Documentation</a></li>
42 @ </ul></li>
43 @ <li>%z(href("%R/tree"))File Browser</a></li>
44 @ <ul>
45 @ <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
46 @ Trunk Checkin</a></li>
47 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
48 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
49 @ </ul>
50 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
51 @ <ul>
52 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
53 @ checkins</a></li>
54 @ <li>%z(href("%R/timeline?n=all&namechng"))All checkins with file name
55 @ changes</a></li>
56 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
57 @ </ul>
58 @ <li>%z(href("%R/brlist"))Branches</a></li>
59 @ <ul>
60 @ <li>%z(href("%R/leaves"))Leaf Checkins</a></li>
61 @ <li>%z(href("%R/taglist"))List of Tags</a></li>
62 @ </ul>
63 @ </li>
64 @ <li>%z(href("%R/wikihelp"))Wiki</a>
65 @ <ul>
@@ -102,13 +102,13 @@
102 @ <li>%z(href("%R/cachestat"))Status of the web-page cache</a></li>
103 @ </ul></li>
104 @ <li>Test Pages
105 @ <ul>
106 @ <li>%z(href("%R/test_env"))CGI Environment Test</a></li>
107 @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Checkins</a></li>
108 @ <li>%z(href("%R/test-rename-list"))List of file renames</a></li>
109 @ <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
110 @ colors assigned to branch names</a>
111 @ </ul></li>
112 @ </ul></li>
113 style_footer();
114 }
115
--- src/sitemap.c
+++ src/sitemap.c
@@ -41,25 +41,25 @@
41 @ <li>%z(href("%R/docsrc"))Search Project Documentation</a></li>
42 @ </ul></li>
43 @ <li>%z(href("%R/tree"))File Browser</a></li>
44 @ <ul>
45 @ <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
46 @ Trunk Check-in</a></li>
47 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
48 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
49 @ </ul>
50 @ <li>%z(href("%R/timeline?n=200"))Project Timeline</a></li>
51 @ <ul>
52 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
53 @ check-ins</a></li>
54 @ <li>%z(href("%R/timeline?n=all&namechng"))All check-ins with file name
55 @ changes</a></li>
56 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
57 @ </ul>
58 @ <li>%z(href("%R/brlist"))Branches</a></li>
59 @ <ul>
60 @ <li>%z(href("%R/leaves"))Leaf Check-ins</a></li>
61 @ <li>%z(href("%R/taglist"))List of Tags</a></li>
62 @ </ul>
63 @ </li>
64 @ <li>%z(href("%R/wikihelp"))Wiki</a>
65 @ <ul>
@@ -102,13 +102,13 @@
102 @ <li>%z(href("%R/cachestat"))Status of the web-page cache</a></li>
103 @ </ul></li>
104 @ <li>Test Pages
105 @ <ul>
106 @ <li>%z(href("%R/test_env"))CGI Environment Test</a></li>
107 @ <li>%z(href("%R/test_timewarps"))List of "Timewarp" Check-ins</a></li>
108 @ <li>%z(href("%R/test-rename-list"))List of file renames</a></li>
109 @ <li>%z(href("%R/hash-color-test"))Page to experiment with the automatic
110 @ colors assigned to branch names</a>
111 @ </ul></li>
112 @ </ul></li>
113 style_footer();
114 }
115
M src/statrep.c
+6 -6
--- src/statrep.c
+++ src/statrep.c
@@ -127,11 +127,11 @@
127127
 */
128128
 static const char *stats_report_label_for_type(){
129129
 assert( statsReportType && "Must call stats_report_init_view() first." );
130130
 switch( statsReportType ){
131131
 case 'c':
132
- return "checkins";
132
+ return "check-ins";
133133
 case 'e':
134134
 return "technotes";
135135
 case 'w':
136136
 return "wiki changes";
137137
 case 't':
@@ -166,13 +166,13 @@
166166
 cgi_printf(" <strong>all</strong>", zTop);
167167
 }else{
168168
 cgi_printf(" <a href='%s'>all</a>", zTop);
169169
 }
170170
 if('c' == statsReportType){
171
- cgi_printf(" <strong>checkins</strong>", zTop);
171
+ cgi_printf(" <strong>check-ins</strong>", zTop);
172172
 }else{
173
- cgi_printf(" <a href='%s&type=ci'>checkins</a>", zTop);
173
+ cgi_printf(" <a href='%s&type=ci'>check-ins</a>", zTop);
174174
 }
175175
 if('e' == statsReportType){
176176
 cgi_printf(" <strong>technotes</strong>", zTop);
177177
 }else{
178178
 cgi_printf(" <a href='%s&type=e'>technotes</a>", zTop);
@@ -474,16 +474,16 @@
474474
 );
475475
 db_prepare(&query,
476476
 "SELECT filename, cnt FROM statrep ORDER BY cnt DESC, filename /*sort*/"
477477
 );
478478
 mxEvent = db_int(1, "SELECT max(cnt) FROM statrep");
479
- @ <h1>Checkins Per File</h1>
479
+ @ <h1>Check-ins Per File</h1>
480480
 @ <table class='statistics-report-table-events' border='0'
481481
 @ cellpadding='2' cellspacing='0' id='statsTable'>
482482
 @ <thead><tr>
483483
 @ <th>File</th>
484
- @ <th>Checkins</th>
484
+ @ <th>Check-ins</th>
485485
 @ <th width='90%%'><!-- relative commits graph --></th>
486486
 @ </tr></thead><tbody>
487487
 while( SQLITE_ROW == db_step(&query) ){
488488
 const char *zFile = db_column_text(&query, 0);
489489
 const int n = db_column_int(&query, 1);
@@ -712,11 +712,11 @@
712712
 ** Query Parameters:
713713
 **
714714
 ** view=REPORT_NAME Valid values: bymonth, byyear, byuser
715715
 ** user=NAME Restricts statistics to the given user
716716
 ** type=TYPE Restricts the report to a specific event type:
717
-** ci (checkin), w (wiki), t (ticket), g (tag)
717
+** ci (check-in), w (wiki), t (ticket), g (tag)
718718
 ** Defaulting to all event types.
719719
 **
720720
 ** The view-specific query parameters include:
721721
 **
722722
 ** view=byweek:
723723
--- src/statrep.c
+++ src/statrep.c
@@ -127,11 +127,11 @@
127 */
128 static const char *stats_report_label_for_type(){
129 assert( statsReportType && "Must call stats_report_init_view() first." );
130 switch( statsReportType ){
131 case 'c':
132 return "checkins";
133 case 'e':
134 return "technotes";
135 case 'w':
136 return "wiki changes";
137 case 't':
@@ -166,13 +166,13 @@
166 cgi_printf(" <strong>all</strong>", zTop);
167 }else{
168 cgi_printf(" <a href='%s'>all</a>", zTop);
169 }
170 if('c' == statsReportType){
171 cgi_printf(" <strong>checkins</strong>", zTop);
172 }else{
173 cgi_printf(" <a href='%s&type=ci'>checkins</a>", zTop);
174 }
175 if('e' == statsReportType){
176 cgi_printf(" <strong>technotes</strong>", zTop);
177 }else{
178 cgi_printf(" <a href='%s&type=e'>technotes</a>", zTop);
@@ -474,16 +474,16 @@
474 );
475 db_prepare(&query,
476 "SELECT filename, cnt FROM statrep ORDER BY cnt DESC, filename /*sort*/"
477 );
478 mxEvent = db_int(1, "SELECT max(cnt) FROM statrep");
479 @ <h1>Checkins Per File</h1>
480 @ <table class='statistics-report-table-events' border='0'
481 @ cellpadding='2' cellspacing='0' id='statsTable'>
482 @ <thead><tr>
483 @ <th>File</th>
484 @ <th>Checkins</th>
485 @ <th width='90%%'><!-- relative commits graph --></th>
486 @ </tr></thead><tbody>
487 while( SQLITE_ROW == db_step(&query) ){
488 const char *zFile = db_column_text(&query, 0);
489 const int n = db_column_int(&query, 1);
@@ -712,11 +712,11 @@
712 ** Query Parameters:
713 **
714 ** view=REPORT_NAME Valid values: bymonth, byyear, byuser
715 ** user=NAME Restricts statistics to the given user
716 ** type=TYPE Restricts the report to a specific event type:
717 ** ci (checkin), w (wiki), t (ticket), g (tag)
718 ** Defaulting to all event types.
719 **
720 ** The view-specific query parameters include:
721 **
722 ** view=byweek:
723
--- src/statrep.c
+++ src/statrep.c
@@ -127,11 +127,11 @@
127 */
128 static const char *stats_report_label_for_type(){
129 assert( statsReportType && "Must call stats_report_init_view() first." );
130 switch( statsReportType ){
131 case 'c':
132 return "check-ins";
133 case 'e':
134 return "technotes";
135 case 'w':
136 return "wiki changes";
137 case 't':
@@ -166,13 +166,13 @@
166 cgi_printf(" <strong>all</strong>", zTop);
167 }else{
168 cgi_printf(" <a href='%s'>all</a>", zTop);
169 }
170 if('c' == statsReportType){
171 cgi_printf(" <strong>check-ins</strong>", zTop);
172 }else{
173 cgi_printf(" <a href='%s&type=ci'>check-ins</a>", zTop);
174 }
175 if('e' == statsReportType){
176 cgi_printf(" <strong>technotes</strong>", zTop);
177 }else{
178 cgi_printf(" <a href='%s&type=e'>technotes</a>", zTop);
@@ -474,16 +474,16 @@
474 );
475 db_prepare(&query,
476 "SELECT filename, cnt FROM statrep ORDER BY cnt DESC, filename /*sort*/"
477 );
478 mxEvent = db_int(1, "SELECT max(cnt) FROM statrep");
479 @ <h1>Check-ins Per File</h1>
480 @ <table class='statistics-report-table-events' border='0'
481 @ cellpadding='2' cellspacing='0' id='statsTable'>
482 @ <thead><tr>
483 @ <th>File</th>
484 @ <th>Check-ins</th>
485 @ <th width='90%%'><!-- relative commits graph --></th>
486 @ </tr></thead><tbody>
487 while( SQLITE_ROW == db_step(&query) ){
488 const char *zFile = db_column_text(&query, 0);
489 const int n = db_column_int(&query, 1);
@@ -712,11 +712,11 @@
712 ** Query Parameters:
713 **
714 ** view=REPORT_NAME Valid values: bymonth, byyear, byuser
715 ** user=NAME Restricts statistics to the given user
716 ** type=TYPE Restricts the report to a specific event type:
717 ** ci (check-in), w (wiki), t (ticket), g (tag)
718 ** Defaulting to all event types.
719 **
720 ** The view-specific query parameters include:
721 **
722 ** view=byweek:
723
M src/timeline.c
+12 -12
--- src/timeline.c
+++ src/timeline.c
@@ -1093,14 +1093,14 @@
10931093
 ** v Show details of files changed
10941094
 ** f=UUID Show family (immediate parents and children) of UUID
10951095
 ** from=UUID Path from...
10961096
 ** to=UUID ... to this
10971097
 ** shortest ... show only the shortest path
1098
-** uf=FUUID Show only checkins that use given file version
1098
+** uf=FUUID Show only check-ins that use given file version
10991099
 ** brbg Background color from branch name
11001100
 ** ubg Background color from user
1101
-** namechng Show only checkins that filename changes
1101
+** namechng Show only check-ins that filename changes
11021102
 ** ym=YYYY-MM Shown only events for the given year/month.
11031103
 ** datefmt=N Override the date format
11041104
 **
11051105
 ** p= and d= can appear individually or together. If either p= or d=
11061106
 ** appear, then u=, y=, a=, and b= are ignored.
@@ -1125,15 +1125,15 @@
11251125
 const char *zCirca = P("c"); /* Events near this time */
11261126
 const char *zMark = P("m"); /* Mark this event or an event this time */
11271127
 const char *zTagName = P("t"); /* Show events with this tag */
11281128
 const char *zBrName = P("r"); /* Show events related to this tag */
11291129
 const char *zSearch = P("s"); /* Search string */
1130
- const char *zUses = P("uf"); /* Only show checkins hold this file */
1131
- const char *zYearMonth = P("ym"); /* Show checkins for the given YYYY-MM */
1132
- const char *zYearWeek = P("yw"); /* Checkins for YYYY-WW (week-of-year) */
1130
+ const char *zUses = P("uf"); /* Only show check-ins hold this file */
1131
+ const char *zYearMonth = P("ym"); /* Show check-ins for the given YYYY-MM */
1132
+ const char *zYearWeek = P("yw"); /* Check-ins for YYYY-WW (week-of-year) */
11331133
 int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1134
- int renameOnly = P("namechng")!=0; /* Show only checkins that rename files */
1134
+ int renameOnly = P("namechng")!=0; /* Show only check-ins that rename files */
11351135
 int tagid; /* Tag ID */
11361136
 int tmFlags = 0; /* Timeline flags */
11371137
 const char *zThisTag = 0; /* Suppress links to this tag */
11381138
 const char *zThisUser = 0; /* Suppress links to this user */
11391139
 HQuery url; /* URL for various branch links */
@@ -1380,11 +1380,11 @@
13801380
 blob_append_sql(&sql,
13811381
 " AND (EXISTS(SELECT 1 FROM tagxref"
13821382
 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n", tagid);
13831383
13841384
 if( zBrName ){
1385
- /* The next two blob_appendf() calls add SQL that causes checkins that
1385
+ /* The next two blob_appendf() calls add SQL that causes check-ins that
13861386
 ** are not part of the branch which are parents or children of the
13871387
 ** branch to be included in the report. This related check-ins are
13881388
 ** useful in helping to visualize what has happened on a quiescent
13891389
 ** branch that is infrequently merged with a much more activate branch.
13901390
 */
@@ -1444,11 +1444,11 @@
14441444
 blob_append_sql(&sql, ")");
14451445
 }
14461446
 }else{ /* zType!="all" */
14471447
 blob_append_sql(&sql, " AND event.type=%Q", zType);
14481448
 if( zType[0]=='c' ){
1449
- zEType = "checkin";
1449
+ zEType = "check-in";
14501450
 }else if( zType[0]=='w' ){
14511451
 zEType = "wiki edit";
14521452
 }else if( zType[0]=='t' ){
14531453
 zEType = "ticket change";
14541454
 }else if( zType[0]=='e' ){
@@ -1825,11 +1825,11 @@
18251825
 ** e = technical notes only
18261826
 ** t = tickets only
18271827
 ** w = wiki commits only
18281828
 ** -v|--verbose Output the list of files changed by each commit
18291829
 ** and the type of each change (edited, deleted,
1830
-** etc.) after the checkin comment.
1830
+** etc.) after the check-in comment.
18311831
 ** -W|--width <num> Width of lines (default is to auto-detect). Must be
18321832
 ** >20 or 0 (= no limit, resulting in a single line per
18331833
 ** entry).
18341834
 ** -R REPO_FILE Specifies the repository db to use. Default is
18351835
 ** the current checkout's repository.
@@ -1941,11 +1941,11 @@
19411941
 }
19421942
19431943
 if( zFilePattern ){
19441944
 if( zType==0 ){
19451945
 /* When zFilePattern is specified and type is not specified, only show
1946
- * file checkins */
1946
+ * file check-ins */
19471947
 zType="ci";
19481948
 }
19491949
 file_tree_name(zFilePattern, &treeName, 1);
19501950
 if( fossil_strcmp(blob_str(&treeName), ".")==0 ){
19511951
 /* When zTreeName refers to g.zLocalRoot, it's like not specifying
@@ -2032,13 +2032,13 @@
20322032
 /*
20332033
 ** COMMAND: test-timewarp-list
20342034
 **
20352035
 ** Usage: %fossil test-timewarp-list ?-v|---verbose?
20362036
 **
2037
-** Display all instances of child checkins that appear earlier in time
2037
+** Display all instances of child check-ins that appear earlier in time
20382038
 ** than their parent. If the -v|--verbose option is provided, both the
2039
-** parent and child checking and their times are shown.
2039
+** parent and child check-ins and their times are shown.
20402040
 */
20412041
 void test_timewarp_cmd(void){
20422042
 Stmt q;
20432043
 int verboseFlag;
20442044
20452045
--- src/timeline.c
+++ src/timeline.c
@@ -1093,14 +1093,14 @@
1093 ** v Show details of files changed
1094 ** f=UUID Show family (immediate parents and children) of UUID
1095 ** from=UUID Path from...
1096 ** to=UUID ... to this
1097 ** shortest ... show only the shortest path
1098 ** uf=FUUID Show only checkins that use given file version
1099 ** brbg Background color from branch name
1100 ** ubg Background color from user
1101 ** namechng Show only checkins that filename changes
1102 ** ym=YYYY-MM Shown only events for the given year/month.
1103 ** datefmt=N Override the date format
1104 **
1105 ** p= and d= can appear individually or together. If either p= or d=
1106 ** appear, then u=, y=, a=, and b= are ignored.
@@ -1125,15 +1125,15 @@
1125 const char *zCirca = P("c"); /* Events near this time */
1126 const char *zMark = P("m"); /* Mark this event or an event this time */
1127 const char *zTagName = P("t"); /* Show events with this tag */
1128 const char *zBrName = P("r"); /* Show events related to this tag */
1129 const char *zSearch = P("s"); /* Search string */
1130 const char *zUses = P("uf"); /* Only show checkins hold this file */
1131 const char *zYearMonth = P("ym"); /* Show checkins for the given YYYY-MM */
1132 const char *zYearWeek = P("yw"); /* Checkins for YYYY-WW (week-of-year) */
1133 int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1134 int renameOnly = P("namechng")!=0; /* Show only checkins that rename files */
1135 int tagid; /* Tag ID */
1136 int tmFlags = 0; /* Timeline flags */
1137 const char *zThisTag = 0; /* Suppress links to this tag */
1138 const char *zThisUser = 0; /* Suppress links to this user */
1139 HQuery url; /* URL for various branch links */
@@ -1380,11 +1380,11 @@
1380 blob_append_sql(&sql,
1381 " AND (EXISTS(SELECT 1 FROM tagxref"
1382 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n", tagid);
1383
1384 if( zBrName ){
1385 /* The next two blob_appendf() calls add SQL that causes checkins that
1386 ** are not part of the branch which are parents or children of the
1387 ** branch to be included in the report. This related check-ins are
1388 ** useful in helping to visualize what has happened on a quiescent
1389 ** branch that is infrequently merged with a much more activate branch.
1390 */
@@ -1444,11 +1444,11 @@
1444 blob_append_sql(&sql, ")");
1445 }
1446 }else{ /* zType!="all" */
1447 blob_append_sql(&sql, " AND event.type=%Q", zType);
1448 if( zType[0]=='c' ){
1449 zEType = "checkin";
1450 }else if( zType[0]=='w' ){
1451 zEType = "wiki edit";
1452 }else if( zType[0]=='t' ){
1453 zEType = "ticket change";
1454 }else if( zType[0]=='e' ){
@@ -1825,11 +1825,11 @@
1825 ** e = technical notes only
1826 ** t = tickets only
1827 ** w = wiki commits only
1828 ** -v|--verbose Output the list of files changed by each commit
1829 ** and the type of each change (edited, deleted,
1830 ** etc.) after the checkin comment.
1831 ** -W|--width <num> Width of lines (default is to auto-detect). Must be
1832 ** >20 or 0 (= no limit, resulting in a single line per
1833 ** entry).
1834 ** -R REPO_FILE Specifies the repository db to use. Default is
1835 ** the current checkout's repository.
@@ -1941,11 +1941,11 @@
1941 }
1942
1943 if( zFilePattern ){
1944 if( zType==0 ){
1945 /* When zFilePattern is specified and type is not specified, only show
1946 * file checkins */
1947 zType="ci";
1948 }
1949 file_tree_name(zFilePattern, &treeName, 1);
1950 if( fossil_strcmp(blob_str(&treeName), ".")==0 ){
1951 /* When zTreeName refers to g.zLocalRoot, it's like not specifying
@@ -2032,13 +2032,13 @@
2032 /*
2033 ** COMMAND: test-timewarp-list
2034 **
2035 ** Usage: %fossil test-timewarp-list ?-v|---verbose?
2036 **
2037 ** Display all instances of child checkins that appear earlier in time
2038 ** than their parent. If the -v|--verbose option is provided, both the
2039 ** parent and child checking and their times are shown.
2040 */
2041 void test_timewarp_cmd(void){
2042 Stmt q;
2043 int verboseFlag;
2044
2045
--- src/timeline.c
+++ src/timeline.c
@@ -1093,14 +1093,14 @@
1093 ** v Show details of files changed
1094 ** f=UUID Show family (immediate parents and children) of UUID
1095 ** from=UUID Path from...
1096 ** to=UUID ... to this
1097 ** shortest ... show only the shortest path
1098 ** uf=FUUID Show only check-ins that use given file version
1099 ** brbg Background color from branch name
1100 ** ubg Background color from user
1101 ** namechng Show only check-ins that filename changes
1102 ** ym=YYYY-MM Shown only events for the given year/month.
1103 ** datefmt=N Override the date format
1104 **
1105 ** p= and d= can appear individually or together. If either p= or d=
1106 ** appear, then u=, y=, a=, and b= are ignored.
@@ -1125,15 +1125,15 @@
1125 const char *zCirca = P("c"); /* Events near this time */
1126 const char *zMark = P("m"); /* Mark this event or an event this time */
1127 const char *zTagName = P("t"); /* Show events with this tag */
1128 const char *zBrName = P("r"); /* Show events related to this tag */
1129 const char *zSearch = P("s"); /* Search string */
1130 const char *zUses = P("uf"); /* Only show check-ins hold this file */
1131 const char *zYearMonth = P("ym"); /* Show check-ins for the given YYYY-MM */
1132 const char *zYearWeek = P("yw"); /* Check-ins for YYYY-WW (week-of-year) */
1133 int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1134 int renameOnly = P("namechng")!=0; /* Show only check-ins that rename files */
1135 int tagid; /* Tag ID */
1136 int tmFlags = 0; /* Timeline flags */
1137 const char *zThisTag = 0; /* Suppress links to this tag */
1138 const char *zThisUser = 0; /* Suppress links to this user */
1139 HQuery url; /* URL for various branch links */
@@ -1380,11 +1380,11 @@
1380 blob_append_sql(&sql,
1381 " AND (EXISTS(SELECT 1 FROM tagxref"
1382 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)\n", tagid);
1383
1384 if( zBrName ){
1385 /* The next two blob_appendf() calls add SQL that causes check-ins that
1386 ** are not part of the branch which are parents or children of the
1387 ** branch to be included in the report. This related check-ins are
1388 ** useful in helping to visualize what has happened on a quiescent
1389 ** branch that is infrequently merged with a much more activate branch.
1390 */
@@ -1444,11 +1444,11 @@
1444 blob_append_sql(&sql, ")");
1445 }
1446 }else{ /* zType!="all" */
1447 blob_append_sql(&sql, " AND event.type=%Q", zType);
1448 if( zType[0]=='c' ){
1449 zEType = "check-in";
1450 }else if( zType[0]=='w' ){
1451 zEType = "wiki edit";
1452 }else if( zType[0]=='t' ){
1453 zEType = "ticket change";
1454 }else if( zType[0]=='e' ){
@@ -1825,11 +1825,11 @@
1825 ** e = technical notes only
1826 ** t = tickets only
1827 ** w = wiki commits only
1828 ** -v|--verbose Output the list of files changed by each commit
1829 ** and the type of each change (edited, deleted,
1830 ** etc.) after the check-in comment.
1831 ** -W|--width <num> Width of lines (default is to auto-detect). Must be
1832 ** >20 or 0 (= no limit, resulting in a single line per
1833 ** entry).
1834 ** -R REPO_FILE Specifies the repository db to use. Default is
1835 ** the current checkout's repository.
@@ -1941,11 +1941,11 @@
1941 }
1942
1943 if( zFilePattern ){
1944 if( zType==0 ){
1945 /* When zFilePattern is specified and type is not specified, only show
1946 * file check-ins */
1947 zType="ci";
1948 }
1949 file_tree_name(zFilePattern, &treeName, 1);
1950 if( fossil_strcmp(blob_str(&treeName), ".")==0 ){
1951 /* When zTreeName refers to g.zLocalRoot, it's like not specifying
@@ -2032,13 +2032,13 @@
2032 /*
2033 ** COMMAND: test-timewarp-list
2034 **
2035 ** Usage: %fossil test-timewarp-list ?-v|---verbose?
2036 **
2037 ** Display all instances of child check-ins that appear earlier in time
2038 ** than their parent. If the -v|--verbose option is provided, both the
2039 ** parent and child check-ins and their times are shown.
2040 */
2041 void test_timewarp_cmd(void){
2042 Stmt q;
2043 int verboseFlag;
2044
2045
M src/update.c
+5 -5
--- src/update.c
+++ src/update.c
@@ -641,15 +641,15 @@
641641
 }
642642
 }
643643
644644
645645
 /*
646
-** Get the contents of a file within the checking "revision". If
646
+** Get the contents of a file within the check-in "revision". If
647647
 ** revision==NULL then get the file content for the current checkout.
648648
 */
649649
 int historical_version_of_file(
650
- const char *revision, /* The checkin containing the file */
650
+ const char *revision, /* The check-in containing the file */
651651
 const char *file, /* Full treename of the file */
652652
 Blob *content, /* Put the content here */
653653
 int *pIsLink, /* Set to true if file is link. */
654654
 int *pIsExe, /* Set to true if file is executable */
655655
 int *pIsBin, /* Set to true if file is binary */
@@ -666,11 +666,11 @@
666666
 }else{
667667
 rid = db_lget_int("checkout", 0);
668668
 }
669669
 if( !is_a_version(rid) ){
670670
 if( errCode>0 ) return errCode;
671
- fossil_fatal("no such checkin: %s", revision);
671
+ fossil_fatal("no such check-in: %s", revision);
672672
 }
673673
 pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
674674
675675
 if( pManifest ){
676676
 pFile = manifest_file_find(pManifest, file);
@@ -686,17 +686,17 @@
686686
 }
687687
 return rc;
688688
 }
689689
 manifest_destroy(pManifest);
690690
 if( errCode<=0 ){
691
- fossil_fatal("file %s does not exist in checkin: %s", file, revision);
691
+ fossil_fatal("file %s does not exist in check-in: %s", file, revision);
692692
 }
693693
 }else if( errCode<=0 ){
694694
 if( revision==0 ){
695695
 revision = db_text("current", "SELECT uuid FROM blob WHERE rid=%d", rid);
696696
 }
697
- fossil_fatal("could not parse manifest for checkin: %s", revision);
697
+ fossil_fatal("could not parse manifest for check-in: %s", revision);
698698
 }
699699
 return errCode;
700700
 }
701701
702702
703703
--- src/update.c
+++ src/update.c
@@ -641,15 +641,15 @@
641 }
642 }
643
644
645 /*
646 ** Get the contents of a file within the checking "revision". If
647 ** revision==NULL then get the file content for the current checkout.
648 */
649 int historical_version_of_file(
650 const char *revision, /* The checkin containing the file */
651 const char *file, /* Full treename of the file */
652 Blob *content, /* Put the content here */
653 int *pIsLink, /* Set to true if file is link. */
654 int *pIsExe, /* Set to true if file is executable */
655 int *pIsBin, /* Set to true if file is binary */
@@ -666,11 +666,11 @@
666 }else{
667 rid = db_lget_int("checkout", 0);
668 }
669 if( !is_a_version(rid) ){
670 if( errCode>0 ) return errCode;
671 fossil_fatal("no such checkin: %s", revision);
672 }
673 pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
674
675 if( pManifest ){
676 pFile = manifest_file_find(pManifest, file);
@@ -686,17 +686,17 @@
686 }
687 return rc;
688 }
689 manifest_destroy(pManifest);
690 if( errCode<=0 ){
691 fossil_fatal("file %s does not exist in checkin: %s", file, revision);
692 }
693 }else if( errCode<=0 ){
694 if( revision==0 ){
695 revision = db_text("current", "SELECT uuid FROM blob WHERE rid=%d", rid);
696 }
697 fossil_fatal("could not parse manifest for checkin: %s", revision);
698 }
699 return errCode;
700 }
701
702
703
--- src/update.c
+++ src/update.c
@@ -641,15 +641,15 @@
641 }
642 }
643
644
645 /*
646 ** Get the contents of a file within the check-in "revision". If
647 ** revision==NULL then get the file content for the current checkout.
648 */
649 int historical_version_of_file(
650 const char *revision, /* The check-in containing the file */
651 const char *file, /* Full treename of the file */
652 Blob *content, /* Put the content here */
653 int *pIsLink, /* Set to true if file is link. */
654 int *pIsExe, /* Set to true if file is executable */
655 int *pIsBin, /* Set to true if file is binary */
@@ -666,11 +666,11 @@
666 }else{
667 rid = db_lget_int("checkout", 0);
668 }
669 if( !is_a_version(rid) ){
670 if( errCode>0 ) return errCode;
671 fossil_fatal("no such check-in: %s", revision);
672 }
673 pManifest = manifest_get(rid, CFTYPE_MANIFEST, 0);
674
675 if( pManifest ){
676 pFile = manifest_file_find(pManifest, file);
@@ -686,17 +686,17 @@
686 }
687 return rc;
688 }
689 manifest_destroy(pManifest);
690 if( errCode<=0 ){
691 fossil_fatal("file %s does not exist in check-in: %s", file, revision);
692 }
693 }else if( errCode<=0 ){
694 if( revision==0 ){
695 revision = db_text("current", "SELECT uuid FROM blob WHERE rid=%d", rid);
696 }
697 fossil_fatal("could not parse manifest for check-in: %s", revision);
698 }
699 return errCode;
700 }
701
702
703
M www/webpage-ex.md
-1
--- www/webpage-ex.md
+++ www/webpage-ex.md
@@ -71,11 +71,10 @@
7171
 last modification time.
7272
7373
 * <a target='_blank' class='exbtn'
7474
 href='../../../fileage?name=svn-import'>Example</a>
7575
 Age of all files in the latest checking for branch "svn-import".
76
- last modification time.
7776
7877
 * <a target='_blank' class='exbtn'
7978
 href='../../../brlist'>Example</a>
8079
 Table of branches. (Click on column headers to sort.)
8180
8281
--- www/webpage-ex.md
+++ www/webpage-ex.md
@@ -71,11 +71,10 @@
71 last modification time.
72
73 * <a target='_blank' class='exbtn'
74 href='../../../fileage?name=svn-import'>Example</a>
75 Age of all files in the latest checking for branch "svn-import".
76 last modification time.
77
78 * <a target='_blank' class='exbtn'
79 href='../../../brlist'>Example</a>
80 Table of branches. (Click on column headers to sort.)
81
82
--- www/webpage-ex.md
+++ www/webpage-ex.md
@@ -71,11 +71,10 @@
71 last modification time.
72
73 * <a target='_blank' class='exbtn'
74 href='../../../fileage?name=svn-import'>Example</a>
75 Age of all files in the latest checking for branch "svn-import".
 
76
77 * <a target='_blank' class='exbtn'
78 href='../../../brlist'>Example</a>
79 Table of branches. (Click on column headers to sort.)
80
81

Keyboard Shortcuts

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