Fossil SCM

More changes to make 'check-in' terminology consistent in source comments, SQL comments, JSON error messages, and web page link text.

mistachkin 2015-03-01 20:56 trunk
Commit 30c107e2c8de3f7dcd59f287f1d3c1b2a45625cd
Parent 6ec2c2e3d966cee…
10 files changed +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1 +2 -2 +1 -1 +2 -2 +1 -1
~ src/foci.c ~ src/info.c ~ src/json_artifact.c ~ src/json_dir.c ~ src/json_finfo.c ~ src/json_timeline.c ~ src/main.c ~ src/name.c ~ src/schema.c ~ src/tkt.c
M src/foci.c
+1 -1
--- src/foci.c
+++ src/foci.c
@@ -16,11 +16,11 @@
1616
 *******************************************************************************
1717
 **
1818
 ** This routine implements an SQLite virtual table that gives all of the
1919
 ** files associated with a single check-in.
2020
 **
21
-** The filename "foci" is short for "Files Of CheckIn".
21
+** The filename "foci" is short for "Files of Check-in".
2222
 **
2323
 ** Usage example:
2424
 **
2525
 ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin;
2626
 ** -- ^^^^--- important!
2727
--- src/foci.c
+++ src/foci.c
@@ -16,11 +16,11 @@
16 *******************************************************************************
17 **
18 ** This routine implements an SQLite virtual table that gives all of the
19 ** files associated with a single check-in.
20 **
21 ** The filename "foci" is short for "Files Of CheckIn".
22 **
23 ** Usage example:
24 **
25 ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin;
26 ** -- ^^^^--- important!
27
--- src/foci.c
+++ src/foci.c
@@ -16,11 +16,11 @@
16 *******************************************************************************
17 **
18 ** This routine implements an SQLite virtual table that gives all of the
19 ** files associated with a single check-in.
20 **
21 ** The filename "foci" is short for "Files of Check-in".
22 **
23 ** Usage example:
24 **
25 ** CREATE VIRTUAL TABLE temp.foci USING files_of_checkin;
26 ** -- ^^^^--- important!
27
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -1817,11 +1817,11 @@
18171817
 blob_zero(&downloadName);
18181818
 objType = object_description(rid, objdescFlags, &downloadName);
18191819
 style_submenu_element("Download", "Download",
18201820
 "%R/raw/%T?name=%s", blob_str(&downloadName), zUuid);
18211821
 if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
1822
- style_submenu_element("Checkins Using", "Checkins Using",
1822
+ style_submenu_element("Check-ins Using", "Check-ins Using",
18231823
 "%R/timeline?n=200&uf=%s",zUuid);
18241824
 }
18251825
 asText = P("txt")!=0;
18261826
 zMime = mimetype_from_name(blob_str(&downloadName));
18271827
 if( zMime ){
18281828
--- src/info.c
+++ src/info.c
@@ -1817,11 +1817,11 @@
1817 blob_zero(&downloadName);
1818 objType = object_description(rid, objdescFlags, &downloadName);
1819 style_submenu_element("Download", "Download",
1820 "%R/raw/%T?name=%s", blob_str(&downloadName), zUuid);
1821 if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
1822 style_submenu_element("Checkins Using", "Checkins Using",
1823 "%R/timeline?n=200&uf=%s",zUuid);
1824 }
1825 asText = P("txt")!=0;
1826 zMime = mimetype_from_name(blob_str(&downloadName));
1827 if( zMime ){
1828
--- src/info.c
+++ src/info.c
@@ -1817,11 +1817,11 @@
1817 blob_zero(&downloadName);
1818 objType = object_description(rid, objdescFlags, &downloadName);
1819 style_submenu_element("Download", "Download",
1820 "%R/raw/%T?name=%s", blob_str(&downloadName), zUuid);
1821 if( db_exists("SELECT 1 FROM mlink WHERE fid=%d", rid) ){
1822 style_submenu_element("Check-ins Using", "Check-ins Using",
1823 "%R/timeline?n=200&uf=%s",zUuid);
1824 }
1825 asText = P("txt")!=0;
1826 zMime = mimetype_from_name(blob_str(&downloadName));
1827 if( zMime ){
1828
M src/json_artifact.c
+1 -1
--- src/json_artifact.c
+++ src/json_artifact.c
@@ -79,11 +79,11 @@
7979
 return cson_array_value(pParents);
8080
 }
8181
8282
 /*
8383
 ** Generates an artifact Object for the given rid,
84
-** which must refer to a Checkin.
84
+** which must refer to a Check-in.
8585
 **
8686
 ** Returned value is NULL or an Object owned by the caller.
8787
 */
8888
 cson_value * json_artifact_for_ci( int rid, char showFiles ){
8989
 cson_value * v = NULL;
9090
--- src/json_artifact.c
+++ src/json_artifact.c
@@ -79,11 +79,11 @@
79 return cson_array_value(pParents);
80 }
81
82 /*
83 ** Generates an artifact Object for the given rid,
84 ** which must refer to a Checkin.
85 **
86 ** Returned value is NULL or an Object owned by the caller.
87 */
88 cson_value * json_artifact_for_ci( int rid, char showFiles ){
89 cson_value * v = NULL;
90
--- src/json_artifact.c
+++ src/json_artifact.c
@@ -79,11 +79,11 @@
79 return cson_array_value(pParents);
80 }
81
82 /*
83 ** Generates an artifact Object for the given rid,
84 ** which must refer to a Check-in.
85 **
86 ** Returned value is NULL or an Object owned by the caller.
87 */
88 cson_value * json_artifact_for_ci( int rid, char showFiles ){
89 cson_value * v = NULL;
90
M src/json_dir.c
+1 -1
--- src/json_dir.c
+++ src/json_dir.c
@@ -82,11 +82,11 @@
8282
 pM = manifest_get_by_name(zCI, &rid);
8383
 if( pM ){
8484
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
8585
 }else{
8686
 json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
87
- "Checkin name [%s] is unresolved.",
87
+ "Check-in name [%s] is unresolved.",
8888
 zCI);
8989
 return NULL;
9090
 }
9191
 }
9292
9393
--- src/json_dir.c
+++ src/json_dir.c
@@ -82,11 +82,11 @@
82 pM = manifest_get_by_name(zCI, &rid);
83 if( pM ){
84 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
85 }else{
86 json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
87 "Checkin name [%s] is unresolved.",
88 zCI);
89 return NULL;
90 }
91 }
92
93
--- src/json_dir.c
+++ src/json_dir.c
@@ -82,11 +82,11 @@
82 pM = manifest_get_by_name(zCI, &rid);
83 if( pM ){
84 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
85 }else{
86 json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
87 "Check-in name [%s] is unresolved.",
88 zCI);
89 return NULL;
90 }
91 }
92
93
M src/json_finfo.c
+1 -1
--- src/json_finfo.c
+++ src/json_finfo.c
@@ -89,11 +89,11 @@
8989
 char * zU = NULL;
9090
 int rc = name_to_uuid2( zCheckin, "ci", &zU );
9191
 /*printf("zCheckin=[%s], zU=[%s]", zCheckin, zU);*/
9292
 if(rc<=0){
9393
 json_set_err((rc<0) ? FSL_JSON_E_AMBIGUOUS_UUID : FSL_JSON_E_RESOURCE_NOT_FOUND,
94
- "Checkin UUID %s.", (rc<0) ? "is ambiguous" : "not found");
94
+ "Check-in UUID %s.", (rc<0) ? "is ambiguous" : "not found");
9595
 blob_reset(&sql);
9696
 return NULL;
9797
 }
9898
 blob_append_sql(&sql, " AND ci.uuid='%q'", zU);
9999
 free(zU);
100100
--- src/json_finfo.c
+++ src/json_finfo.c
@@ -89,11 +89,11 @@
89 char * zU = NULL;
90 int rc = name_to_uuid2( zCheckin, "ci", &zU );
91 /*printf("zCheckin=[%s], zU=[%s]", zCheckin, zU);*/
92 if(rc<=0){
93 json_set_err((rc<0) ? FSL_JSON_E_AMBIGUOUS_UUID : FSL_JSON_E_RESOURCE_NOT_FOUND,
94 "Checkin UUID %s.", (rc<0) ? "is ambiguous" : "not found");
95 blob_reset(&sql);
96 return NULL;
97 }
98 blob_append_sql(&sql, " AND ci.uuid='%q'", zU);
99 free(zU);
100
--- src/json_finfo.c
+++ src/json_finfo.c
@@ -89,11 +89,11 @@
89 char * zU = NULL;
90 int rc = name_to_uuid2( zCheckin, "ci", &zU );
91 /*printf("zCheckin=[%s], zU=[%s]", zCheckin, zU);*/
92 if(rc<=0){
93 json_set_err((rc<0) ? FSL_JSON_E_AMBIGUOUS_UUID : FSL_JSON_E_RESOURCE_NOT_FOUND,
94 "Check-in UUID %s.", (rc<0) ? "is ambiguous" : "not found");
95 blob_reset(&sql);
96 return NULL;
97 }
98 blob_append_sql(&sql, " AND ci.uuid='%q'", zU);
99 free(zU);
100
M src/json_timeline.c
+1 -1
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -457,11 +457,11 @@
457457
 Blob sql = empty_blob;
458458
 if( !g.perm.Hyperlink ){
459459
 /* Reminder to self: HTML impl requires 'o' (Read)
460460
 rights.
461461
 */
462
- json_set_err( FSL_JSON_E_DENIED, "Checkin timeline requires 'h' access." );
462
+ json_set_err( FSL_JSON_E_DENIED, "Check-in timeline requires 'h' access." );
463463
 return NULL;
464464
 }
465465
 verboseFlag = json_find_option_bool("verbose",NULL,"v",0);
466466
 if( !verboseFlag ){
467467
 verboseFlag = json_find_option_bool("files",NULL,"f",0);
468468
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -457,11 +457,11 @@
457 Blob sql = empty_blob;
458 if( !g.perm.Hyperlink ){
459 /* Reminder to self: HTML impl requires 'o' (Read)
460 rights.
461 */
462 json_set_err( FSL_JSON_E_DENIED, "Checkin timeline requires 'h' access." );
463 return NULL;
464 }
465 verboseFlag = json_find_option_bool("verbose",NULL,"v",0);
466 if( !verboseFlag ){
467 verboseFlag = json_find_option_bool("files",NULL,"f",0);
468
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -457,11 +457,11 @@
457 Blob sql = empty_blob;
458 if( !g.perm.Hyperlink ){
459 /* Reminder to self: HTML impl requires 'o' (Read)
460 rights.
461 */
462 json_set_err( FSL_JSON_E_DENIED, "Check-in timeline requires 'h' access." );
463 return NULL;
464 }
465 verboseFlag = json_find_option_bool("verbose",NULL,"v",0);
466 if( !verboseFlag ){
467 verboseFlag = json_find_option_bool("files",NULL,"f",0);
468
M src/main.c
+2 -2
--- src/main.c
+++ src/main.c
@@ -72,12 +72,12 @@
7272
 char Setup; /* s: use Setup screens on web interface */
7373
 char Admin; /* a: administrative permission */
7474
 char Delete; /* d: delete wiki or tickets */
7575
 char Password; /* p: change password */
7676
 char Query; /* q: create new reports */
77
- char Write; /* i: xfer inbound. checkin */
78
- char Read; /* o: xfer outbound. checkout */
77
+ char Write; /* i: xfer inbound. check-in */
78
+ char Read; /* o: xfer outbound. check-out */
7979
 char Hyperlink; /* h: enable the display of hyperlinks */
8080
 char Clone; /* g: clone */
8181
 char RdWiki; /* j: view wiki via web */
8282
 char NewWiki; /* f: create new wiki via web */
8383
 char ApndWiki; /* m: append to wiki via web */
8484
--- src/main.c
+++ src/main.c
@@ -72,12 +72,12 @@
72 char Setup; /* s: use Setup screens on web interface */
73 char Admin; /* a: administrative permission */
74 char Delete; /* d: delete wiki or tickets */
75 char Password; /* p: change password */
76 char Query; /* q: create new reports */
77 char Write; /* i: xfer inbound. checkin */
78 char Read; /* o: xfer outbound. checkout */
79 char Hyperlink; /* h: enable the display of hyperlinks */
80 char Clone; /* g: clone */
81 char RdWiki; /* j: view wiki via web */
82 char NewWiki; /* f: create new wiki via web */
83 char ApndWiki; /* m: append to wiki via web */
84
--- src/main.c
+++ src/main.c
@@ -72,12 +72,12 @@
72 char Setup; /* s: use Setup screens on web interface */
73 char Admin; /* a: administrative permission */
74 char Delete; /* d: delete wiki or tickets */
75 char Password; /* p: change password */
76 char Query; /* q: create new reports */
77 char Write; /* i: xfer inbound. check-in */
78 char Read; /* o: xfer outbound. check-out */
79 char Hyperlink; /* h: enable the display of hyperlinks */
80 char Clone; /* g: clone */
81 char RdWiki; /* j: view wiki via web */
82 char NewWiki; /* f: create new wiki via web */
83 char ApndWiki; /* m: append to wiki via web */
84
M src/name.c
+1 -1
--- src/name.c
+++ src/name.c
@@ -790,11 +790,11 @@
790790
 @ uuid TEXT, -- SHA1 hash of the object
791791
 @ ctime DATETIME, -- Time of creation
792792
 @ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
793793
 @ type TEXT, -- file, checkin, wiki, ticket, etc.
794794
 @ summary TEXT, -- Summary comment for the object
795
-@ detail TEXT -- filename, checkin comment, etc
795
+@ detail TEXT -- File name, check-in comment, etc
796796
 @ );
797797
 ;
798798
799799
 /*
800800
 ** Create the description table if it does not already exists.
801801
--- src/name.c
+++ src/name.c
@@ -790,11 +790,11 @@
790 @ uuid TEXT, -- SHA1 hash of the object
791 @ ctime DATETIME, -- Time of creation
792 @ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
793 @ type TEXT, -- file, checkin, wiki, ticket, etc.
794 @ summary TEXT, -- Summary comment for the object
795 @ detail TEXT -- filename, checkin comment, etc
796 @ );
797 ;
798
799 /*
800 ** Create the description table if it does not already exists.
801
--- src/name.c
+++ src/name.c
@@ -790,11 +790,11 @@
790 @ uuid TEXT, -- SHA1 hash of the object
791 @ ctime DATETIME, -- Time of creation
792 @ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
793 @ type TEXT, -- file, checkin, wiki, ticket, etc.
794 @ summary TEXT, -- Summary comment for the object
795 @ detail TEXT -- File name, check-in comment, etc
796 @ );
797 ;
798
799 /*
800 ** Create the description table if it does not already exists.
801
M src/schema.c
+2 -2
--- src/schema.c
+++ src/schema.c
@@ -253,13 +253,13 @@
253253
 @ --
254254
 @ -- pid==0 if the file is added by check-in mid.
255255
 @ -- fid==0 if the file is removed by check-in mid.
256256
 @ --
257257
 @ CREATE TABLE mlink(
258
-@ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
258
+@ mid INTEGER REFERENCES plink(cid), -- Check-in that contains fid
259259
 @ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
260
-@ pmid INTEGER REFERENCES plink(cid), -- Checkin that contains pid
260
+@ pmid INTEGER REFERENCES plink(cid), -- Check-in that contains pid
261261
 @ pid INTEGER REFERENCES blob, -- Prev file content. 0 if new
262262
 @ fnid INTEGER REFERENCES filename, -- Name of the file
263263
 @ pfnid INTEGER REFERENCES filename, -- Previous name. 0 if unchanged
264264
 @ mperm INTEGER, -- File permissions. 1==exec
265265
 @ isaux BOOLEAN DEFAULT 0 -- TRUE if pmid is the primary
266266
--- src/schema.c
+++ src/schema.c
@@ -253,13 +253,13 @@
253 @ --
254 @ -- pid==0 if the file is added by check-in mid.
255 @ -- fid==0 if the file is removed by check-in mid.
256 @ --
257 @ CREATE TABLE mlink(
258 @ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
259 @ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
260 @ pmid INTEGER REFERENCES plink(cid), -- Checkin that contains pid
261 @ pid INTEGER REFERENCES blob, -- Prev file content. 0 if new
262 @ fnid INTEGER REFERENCES filename, -- Name of the file
263 @ pfnid INTEGER REFERENCES filename, -- Previous name. 0 if unchanged
264 @ mperm INTEGER, -- File permissions. 1==exec
265 @ isaux BOOLEAN DEFAULT 0 -- TRUE if pmid is the primary
266
--- src/schema.c
+++ src/schema.c
@@ -253,13 +253,13 @@
253 @ --
254 @ -- pid==0 if the file is added by check-in mid.
255 @ -- fid==0 if the file is removed by check-in mid.
256 @ --
257 @ CREATE TABLE mlink(
258 @ mid INTEGER REFERENCES plink(cid), -- Check-in that contains fid
259 @ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
260 @ pmid INTEGER REFERENCES plink(cid), -- Check-in that contains pid
261 @ pid INTEGER REFERENCES blob, -- Prev file content. 0 if new
262 @ fnid INTEGER REFERENCES filename, -- Name of the file
263 @ pfnid INTEGER REFERENCES filename, -- Previous name. 0 if unchanged
264 @ mperm INTEGER, -- File permissions. 1==exec
265 @ isaux BOOLEAN DEFAULT 0 -- TRUE if pmid is the primary
266
M src/tkt.c
+1 -1
--- src/tkt.c
+++ src/tkt.c
@@ -860,11 +860,11 @@
860860
 style_submenu_element("History", "History",
861861
 "%s/tkthistory/%s", g.zTop, zUuid);
862862
 style_submenu_element("Status", "Status",
863863
 "%s/info/%s", g.zTop, zUuid);
864864
 if( zType[0]=='c' ){
865
- zTitle = mprintf("Check-Ins Associated With Ticket %h", zUuid);
865
+ zTitle = mprintf("Check-ins Associated With Ticket %h", zUuid);
866866
 }else{
867867
 zTitle = mprintf("Timeline Of Ticket %h", zUuid);
868868
 }
869869
 style_header("%z", zTitle);
870870
871871
--- src/tkt.c
+++ src/tkt.c
@@ -860,11 +860,11 @@
860 style_submenu_element("History", "History",
861 "%s/tkthistory/%s", g.zTop, zUuid);
862 style_submenu_element("Status", "Status",
863 "%s/info/%s", g.zTop, zUuid);
864 if( zType[0]=='c' ){
865 zTitle = mprintf("Check-Ins Associated With Ticket %h", zUuid);
866 }else{
867 zTitle = mprintf("Timeline Of Ticket %h", zUuid);
868 }
869 style_header("%z", zTitle);
870
871
--- src/tkt.c
+++ src/tkt.c
@@ -860,11 +860,11 @@
860 style_submenu_element("History", "History",
861 "%s/tkthistory/%s", g.zTop, zUuid);
862 style_submenu_element("Status", "Status",
863 "%s/info/%s", g.zTop, zUuid);
864 if( zType[0]=='c' ){
865 zTitle = mprintf("Check-ins Associated With Ticket %h", zUuid);
866 }else{
867 zTitle = mprintf("Timeline Of Ticket %h", zUuid);
868 }
869 style_header("%z", zTitle);
870
871

Keyboard Shortcuts

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