Fossil SCM

A few more places where displayed UUID length should be configurable.

jan.nijtmans 2015-02-13 09:03 UTC trunk
Commit c62e94f8a3da2acda7e2737680e6c096c349c533
Parent d96488860f5a855…
6 files changed +2 -2 +1 -1 +2 -2 +3 -3 +1 -1 +2 -2
~ src/attach.c ~ src/branch.c ~ src/browse.c ~ src/checkin.c ~ src/finfo.c ~ src/info.c
M src/attach.c
+2 -2
--- src/attach.c
+++ src/attach.c
@@ -443,11 +443,11 @@
443443
 }
444444
445445
 if( P("del")
446446
 && ((zTktUuid && g.perm.WrTkt) || (zWikiName && g.perm.WrWiki))
447447
 ){
448
- form_begin(0, "%R/ainfo/%s", zUuid);
448
+ form_begin(0, "%R/ainfo/%!S", zUuid);
449449
 @ <p>Confirm you want to delete the attachment shown below.
450450
 @ <input type="submit" name="confirm" value="Confirm">
451451
 @ </form>
452452
 }
453453
@@ -456,11 +456,11 @@
456456
 (zWikiName && g.perm.ModWiki);
457457
 if( isModerator && (zModAction = P("modaction"))!=0 ){
458458
 if( strcmp(zModAction,"delete")==0 ){
459459
 moderation_disapprove(rid);
460460
 if( zTktUuid ){
461
- cgi_redirectf("%R/tktview/%s", zTktUuid);
461
+ cgi_redirectf("%R/tktview/%!S", zTktUuid);
462462
 }else{
463463
 cgi_redirectf("%R/wiki?name=%t", zWikiName);
464464
 }
465465
 return;
466466
 }
467467
--- src/attach.c
+++ src/attach.c
@@ -443,11 +443,11 @@
443 }
444
445 if( P("del")
446 && ((zTktUuid && g.perm.WrTkt) || (zWikiName && g.perm.WrWiki))
447 ){
448 form_begin(0, "%R/ainfo/%s", zUuid);
449 @ <p>Confirm you want to delete the attachment shown below.
450 @ <input type="submit" name="confirm" value="Confirm">
451 @ </form>
452 }
453
@@ -456,11 +456,11 @@
456 (zWikiName && g.perm.ModWiki);
457 if( isModerator && (zModAction = P("modaction"))!=0 ){
458 if( strcmp(zModAction,"delete")==0 ){
459 moderation_disapprove(rid);
460 if( zTktUuid ){
461 cgi_redirectf("%R/tktview/%s", zTktUuid);
462 }else{
463 cgi_redirectf("%R/wiki?name=%t", zWikiName);
464 }
465 return;
466 }
467
--- src/attach.c
+++ src/attach.c
@@ -443,11 +443,11 @@
443 }
444
445 if( P("del")
446 && ((zTktUuid && g.perm.WrTkt) || (zWikiName && g.perm.WrWiki))
447 ){
448 form_begin(0, "%R/ainfo/%!S", zUuid);
449 @ <p>Confirm you want to delete the attachment shown below.
450 @ <input type="submit" name="confirm" value="Confirm">
451 @ </form>
452 }
453
@@ -456,11 +456,11 @@
456 (zWikiName && g.perm.ModWiki);
457 if( isModerator && (zModAction = P("modaction"))!=0 ){
458 if( strcmp(zModAction,"delete")==0 ){
459 moderation_disapprove(rid);
460 if( zTktUuid ){
461 cgi_redirectf("%R/tktview/%!S", zTktUuid);
462 }else{
463 cgi_redirectf("%R/wiki?name=%t", zWikiName);
464 }
465 return;
466 }
467
M src/branch.c
+1 -1
--- src/branch.c
+++ src/branch.c
@@ -159,11 +159,11 @@
159159
 fossil_fatal("%s\n", g.zErrMsg);
160160
 }
161161
 assert( blob_is_reset(&branch) );
162162
 content_deltify(rootid, brid, 0);
163163
 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid);
164
- fossil_print("New branch: %s\n", zUuid);
164
+ fossil_print("New branch: %S\n", zUuid);
165165
 if( g.argc==3 ){
166166
 fossil_print(
167167
 "\n"
168168
 "Note: the local check-out has not been updated to the new\n"
169169
 " branch. To begin working on the new branch, do this:\n"
170170
--- src/branch.c
+++ src/branch.c
@@ -159,11 +159,11 @@
159 fossil_fatal("%s\n", g.zErrMsg);
160 }
161 assert( blob_is_reset(&branch) );
162 content_deltify(rootid, brid, 0);
163 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid);
164 fossil_print("New branch: %s\n", zUuid);
165 if( g.argc==3 ){
166 fossil_print(
167 "\n"
168 "Note: the local check-out has not been updated to the new\n"
169 " branch. To begin working on the new branch, do this:\n"
170
--- src/branch.c
+++ src/branch.c
@@ -159,11 +159,11 @@
159 fossil_fatal("%s\n", g.zErrMsg);
160 }
161 assert( blob_is_reset(&branch) );
162 content_deltify(rootid, brid, 0);
163 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid);
164 fossil_print("New branch: %S\n", zUuid);
165 if( g.argc==3 ){
166 fossil_print(
167 "\n"
168 "Note: the local check-out has not been updated to the new\n"
169 " branch. To begin working on the new branch, do this:\n"
170
M src/browse.c
+2 -2
--- src/browse.c
+++ src/browse.c
@@ -181,13 +181,13 @@
181181
 url_render(&sURI, "ci", "tip", 0, 0));
182182
 }
183183
 if( zCI ){
184184
 @ <h2>Files of check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>]
185185
 @ %s(blob_str(&dirname))</h2>
186
- zSubdirLink = mprintf("%R/dir?ci=%s&name=%T", zUuid, zPrefix);
186
+ zSubdirLink = mprintf("%R/dir?name=%T&ci=%!S", zPrefix, zUuid);
187187
 if( nD==0 ){
188
- style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%s",
188
+ style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%!S",
189189
 zUuid);
190190
 }
191191
 }else{
192192
 @ <h2>The union of all files from all check-ins
193193
 @ %s(blob_str(&dirname))</h2>
194194
--- src/browse.c
+++ src/browse.c
@@ -181,13 +181,13 @@
181 url_render(&sURI, "ci", "tip", 0, 0));
182 }
183 if( zCI ){
184 @ <h2>Files of check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>]
185 @ %s(blob_str(&dirname))</h2>
186 zSubdirLink = mprintf("%R/dir?ci=%s&name=%T", zUuid, zPrefix);
187 if( nD==0 ){
188 style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%s",
189 zUuid);
190 }
191 }else{
192 @ <h2>The union of all files from all check-ins
193 @ %s(blob_str(&dirname))</h2>
194
--- src/browse.c
+++ src/browse.c
@@ -181,13 +181,13 @@
181 url_render(&sURI, "ci", "tip", 0, 0));
182 }
183 if( zCI ){
184 @ <h2>Files of check-in [%z(href("vinfo?name=%!S",zUuid))%S(zUuid)</a>]
185 @ %s(blob_str(&dirname))</h2>
186 zSubdirLink = mprintf("%R/dir?name=%T&ci=%!S", zPrefix, zUuid);
187 if( nD==0 ){
188 style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%!S",
189 zUuid);
190 }
191 }else{
192 @ <h2>The union of all files from all check-ins
193 @ %s(blob_str(&dirname))</h2>
194
M src/checkin.c
+3 -3
--- src/checkin.c
+++ src/checkin.c
@@ -1936,18 +1936,18 @@
19361936
 db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
19371937
 " WHERE id=-4");
19381938
 while( db_step(&q)==SQLITE_ROW ){
19391939
 const char *zIntegrateUuid = db_column_text(&q, 0);
19401940
 if( is_a_leaf(db_column_int(&q, 1)) ){
1941
- fossil_print("Closed: %s\n", zIntegrateUuid);
1941
+ fossil_print("Closed: %S\n", zIntegrateUuid);
19421942
 }else{
1943
- fossil_print("Not_Closed: %s (not a leaf any more)\n", zIntegrateUuid);
1943
+ fossil_print("Not_Closed: %S (not a leaf any more)\n", zIntegrateUuid);
19441944
 }
19451945
 }
19461946
 db_finalize(&q);
19471947
1948
- fossil_print("New_Version: %s\n", zUuid);
1948
+ fossil_print("New_Version: %S\n", zUuid);
19491949
 if( outputManifest ){
19501950
 zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot);
19511951
 blob_zero(&muuid);
19521952
 blob_appendf(&muuid, "%s\n", zUuid);
19531953
 blob_write_to_file(&muuid, zManifestFile);
19541954
--- src/checkin.c
+++ src/checkin.c
@@ -1936,18 +1936,18 @@
1936 db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
1937 " WHERE id=-4");
1938 while( db_step(&q)==SQLITE_ROW ){
1939 const char *zIntegrateUuid = db_column_text(&q, 0);
1940 if( is_a_leaf(db_column_int(&q, 1)) ){
1941 fossil_print("Closed: %s\n", zIntegrateUuid);
1942 }else{
1943 fossil_print("Not_Closed: %s (not a leaf any more)\n", zIntegrateUuid);
1944 }
1945 }
1946 db_finalize(&q);
1947
1948 fossil_print("New_Version: %s\n", zUuid);
1949 if( outputManifest ){
1950 zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot);
1951 blob_zero(&muuid);
1952 blob_appendf(&muuid, "%s\n", zUuid);
1953 blob_write_to_file(&muuid, zManifestFile);
1954
--- src/checkin.c
+++ src/checkin.c
@@ -1936,18 +1936,18 @@
1936 db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid"
1937 " WHERE id=-4");
1938 while( db_step(&q)==SQLITE_ROW ){
1939 const char *zIntegrateUuid = db_column_text(&q, 0);
1940 if( is_a_leaf(db_column_int(&q, 1)) ){
1941 fossil_print("Closed: %S\n", zIntegrateUuid);
1942 }else{
1943 fossil_print("Not_Closed: %S (not a leaf any more)\n", zIntegrateUuid);
1944 }
1945 }
1946 db_finalize(&q);
1947
1948 fossil_print("New_Version: %S\n", zUuid);
1949 if( outputManifest ){
1950 zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot);
1951 blob_zero(&muuid);
1952 blob_appendf(&muuid, "%s\n", zUuid);
1953 blob_write_to_file(&muuid, zManifestFile);
1954
M src/finfo.c
+1 -1
--- src/finfo.c
+++ src/finfo.c
@@ -215,11 +215,11 @@
215215
 zCiUuid, zCom, zUser, zFileUuid, zBr);
216216
 comment_print(zOut, zCom, 11, iWidth, g.comFmtFlags);
217217
 fossil_free(zOut);
218218
 }else{
219219
 blob_reset(&line);
220
- blob_appendf(&line, "%.10s ", zCiUuid);
220
+ blob_appendf(&line, "%S ", zCiUuid);
221221
 blob_appendf(&line, "%.10s ", zDate);
222222
 blob_appendf(&line, "%8.8s ", zUser);
223223
 blob_appendf(&line, "%8.8s ", zBr);
224224
 blob_appendf(&line,"%-39.39s", zCom );
225225
 comment_print(blob_str(&line), zCom, 0, iWidth, g.comFmtFlags);
226226
--- src/finfo.c
+++ src/finfo.c
@@ -215,11 +215,11 @@
215 zCiUuid, zCom, zUser, zFileUuid, zBr);
216 comment_print(zOut, zCom, 11, iWidth, g.comFmtFlags);
217 fossil_free(zOut);
218 }else{
219 blob_reset(&line);
220 blob_appendf(&line, "%.10s ", zCiUuid);
221 blob_appendf(&line, "%.10s ", zDate);
222 blob_appendf(&line, "%8.8s ", zUser);
223 blob_appendf(&line, "%8.8s ", zBr);
224 blob_appendf(&line,"%-39.39s", zCom );
225 comment_print(blob_str(&line), zCom, 0, iWidth, g.comFmtFlags);
226
--- src/finfo.c
+++ src/finfo.c
@@ -215,11 +215,11 @@
215 zCiUuid, zCom, zUser, zFileUuid, zBr);
216 comment_print(zOut, zCom, 11, iWidth, g.comFmtFlags);
217 fossil_free(zOut);
218 }else{
219 blob_reset(&line);
220 blob_appendf(&line, "%S ", zCiUuid);
221 blob_appendf(&line, "%.10s ", zDate);
222 blob_appendf(&line, "%8.8s ", zUser);
223 blob_appendf(&line, "%8.8s ", zBr);
224 blob_appendf(&line,"%-39.39s", zCom );
225 comment_print(blob_str(&line), zCom, 0, iWidth, g.comFmtFlags);
226
M src/info.c
+2 -2
--- src/info.c
+++ src/info.c
@@ -1336,11 +1336,11 @@
13361336
 }
13371337
 @ - %!w(zCom) by
13381338
 hyperlink_to_user(zUser,zDate," on");
13391339
 hyperlink_to_date(zDate, ".");
13401340
 if( pDownloadName && blob_size(pDownloadName)==0 ){
1341
- blob_appendf(pDownloadName, "%.10s.txt", zUuid);
1341
+ blob_appendf(pDownloadName, "%S.txt", zUuid);
13421342
 }
13431343
 tag_private_status(rid);
13441344
 cnt++;
13451345
 }
13461346
 db_finalize(&q);
@@ -1388,11 +1388,11 @@
13881388
 }
13891389
 db_finalize(&q);
13901390
 if( cnt==0 ){
13911391
 @ Control artifact.
13921392
 if( pDownloadName && blob_size(pDownloadName)==0 ){
1393
- blob_appendf(pDownloadName, "%.10s.txt", zUuid);
1393
+ blob_appendf(pDownloadName, "%S.txt", zUuid);
13941394
 }
13951395
 tag_private_status(rid);
13961396
 }
13971397
 return objType;
13981398
 }
13991399
--- src/info.c
+++ src/info.c
@@ -1336,11 +1336,11 @@
1336 }
1337 @ - %!w(zCom) by
1338 hyperlink_to_user(zUser,zDate," on");
1339 hyperlink_to_date(zDate, ".");
1340 if( pDownloadName && blob_size(pDownloadName)==0 ){
1341 blob_appendf(pDownloadName, "%.10s.txt", zUuid);
1342 }
1343 tag_private_status(rid);
1344 cnt++;
1345 }
1346 db_finalize(&q);
@@ -1388,11 +1388,11 @@
1388 }
1389 db_finalize(&q);
1390 if( cnt==0 ){
1391 @ Control artifact.
1392 if( pDownloadName && blob_size(pDownloadName)==0 ){
1393 blob_appendf(pDownloadName, "%.10s.txt", zUuid);
1394 }
1395 tag_private_status(rid);
1396 }
1397 return objType;
1398 }
1399
--- src/info.c
+++ src/info.c
@@ -1336,11 +1336,11 @@
1336 }
1337 @ - %!w(zCom) by
1338 hyperlink_to_user(zUser,zDate," on");
1339 hyperlink_to_date(zDate, ".");
1340 if( pDownloadName && blob_size(pDownloadName)==0 ){
1341 blob_appendf(pDownloadName, "%S.txt", zUuid);
1342 }
1343 tag_private_status(rid);
1344 cnt++;
1345 }
1346 db_finalize(&q);
@@ -1388,11 +1388,11 @@
1388 }
1389 db_finalize(&q);
1390 if( cnt==0 ){
1391 @ Control artifact.
1392 if( pDownloadName && blob_size(pDownloadName)==0 ){
1393 blob_appendf(pDownloadName, "%S.txt", zUuid);
1394 }
1395 tag_private_status(rid);
1396 }
1397 return objType;
1398 }
1399

Keyboard Shortcuts

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