Fossil SCM

Merge trunk. Disable new checkbox in stead of hiding it when not in use.

jan.nijtmans 2013-12-05 09:19 hidden-tag merge
Commit 56836278da73ceb02e21dee7bc78af162a8ef058
Parent 439f18e86609da6…
6 files changed +2 -1 +13 -15 +13 -15 +1 -1 +2 -2 +1 -1
~ src/db.c ~ src/info.c ~ src/info.c ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.PellesCGMake
M src/db.c
+2 -1
--- src/db.c
+++ src/db.c
@@ -1371,11 +1371,12 @@
13711371
 */
13721372
 db_multi_exec(
13731373
 "INSERT OR REPLACE INTO config"
13741374
 " SELECT name,value,mtime FROM settingSrc.config"
13751375
 " WHERE (name IN %s OR name IN %s)"
1376
- " AND name NOT GLOB 'project-*';",
1376
+ " AND name NOT GLOB 'project-*'"
1377
+ " AND name NOT GLOB 'short-project-*';",
13771378
 configure_inop_rhs(CONFIGSET_ALL),
13781379
 db_setting_inop_rhs()
13791380
 );
13801381
 db_multi_exec(
13811382
 "REPLACE INTO reportfmt SELECT * FROM settingSrc.reportfmt;"
13821383
--- src/db.c
+++ src/db.c
@@ -1371,11 +1371,12 @@
1371 */
1372 db_multi_exec(
1373 "INSERT OR REPLACE INTO config"
1374 " SELECT name,value,mtime FROM settingSrc.config"
1375 " WHERE (name IN %s OR name IN %s)"
1376 " AND name NOT GLOB 'project-*';",
 
1377 configure_inop_rhs(CONFIGSET_ALL),
1378 db_setting_inop_rhs()
1379 );
1380 db_multi_exec(
1381 "REPLACE INTO reportfmt SELECT * FROM settingSrc.reportfmt;"
1382
--- src/db.c
+++ src/db.c
@@ -1371,11 +1371,12 @@
1371 */
1372 db_multi_exec(
1373 "INSERT OR REPLACE INTO config"
1374 " SELECT name,value,mtime FROM settingSrc.config"
1375 " WHERE (name IN %s OR name IN %s)"
1376 " AND name NOT GLOB 'project-*'"
1377 " AND name NOT GLOB 'short-project-*';",
1378 configure_inop_rhs(CONFIGSET_ALL),
1379 db_setting_inop_rhs()
1380 );
1381 db_multi_exec(
1382 "REPLACE INTO reportfmt SELECT * FROM settingSrc.reportfmt;"
1383
M src/info.c
+13 -15
--- src/info.c
+++ src/info.c
@@ -1317,11 +1317,11 @@
13171317
 text_diff(&c1, &c2, pOut, pRe, diffFlags);
13181318
 blob_reset(&c1);
13191319
 blob_reset(&c2);
13201320
 return;
13211321
 }
1322
-
1322
+
13231323
 sideBySide = !is_false(PD("sbs","1"));
13241324
 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
13251325
 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
13261326
 diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
13271327
@@ -1667,12 +1667,12 @@
16671667
 content_get(rid, &content);
16681668
 if( renderAsWiki ){
16691669
 wiki_convert(&content, 0, 0);
16701670
 }else if( renderAsHtml ){
16711671
 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
1672
- @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673
- @ sandbox="allow-same-origin"
1672
+ @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673
+ @ sandbox="allow-same-origin"
16741674
 @ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
16751675
 @ </iframe>
16761676
 }else{
16771677
 style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
16781678
 zMime = mimetype_from_content(&content);
@@ -2152,15 +2152,12 @@
21522152
 db_finalize(&q);
21532153
 if( zHideFlag[0] ){
21542154
 db_multi_exec("REPLACE INTO newtags VALUES('hidden','*',NULL)");
21552155
 }
21562156
 if( zCloseFlag[0] ){
2157
- if( is_a_leaf(rid) ){
2158
- db_multi_exec("REPLACE INTO newtags VALUES('closed','+',NULL)");
2159
- }else{
2160
- db_multi_exec("REPLACE INTO newtags VALUES('closed','*',NULL)");
2161
- }
2157
+ db_multi_exec("REPLACE INTO newtags VALUES('closed','%s',NULL)",
2158
+ is_a_leaf(rid)?"+":"*");
21622159
 }
21632160
 if( zNewTagFlag[0] && zNewTag[0] ){
21642161
 db_multi_exec("REPLACE INTO newtags VALUES('sym-%q','+',NULL)", zNewTag);
21652162
 }
21662163
 if( zNewBrFlag[0] && zNewBranch[0] ){
@@ -2219,14 +2216,14 @@
22192216
 @ function stcbi(id,val){
22202217
 @ id.textContent = val;
22212218
 @ }
22222219
 @ function hcbxbi(id,toggle){
22232220
 @ if( toggle ){
2224
- @ id.style.visibility = "hidden";
2221
+ @ id.disabled = true;
22252222
 @ id.checked = false;
22262223
 @ }else{
2227
- @ id.style.visibility = "visible";
2224
+ @ id.disabled = false;
22282225
 @ }
22292226
 @ }
22302227
 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
22312228
 @ if( cbxid ) hcbxbi(cbxid,toggle);
22322229
 @ if( toggle ){
@@ -2388,11 +2385,11 @@
23882385
 if( !fHasHidden && zBranchName ){
23892386
 @ <tr><th align="right" valign="top">Branch Hiding:</th>
23902387
 @ <td valign="top">
23912388
 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
23922389
 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2393
- @ style="visibility: hidden" />
2390
+ @ disabled />
23942391
 }else{
23952392
 @ />
23962393
 }
23972394
 @ Hide branch
23982395
 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
@@ -2407,17 +2404,18 @@
24072404
 @ <td valign="top">
24082405
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
24092406
 @ Mark this leaf as "closed" so that it no longer appears on the
24102407
 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
24112408
 @ </td></tr>
2412
- }else{
2409
+ }else if( zBranchName ){
24132410
 @ <tr><th align="right" valign="top">Branch Closure:</th>
24142411
 @ <td valign="top">
24152412
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2416
- @ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leaf no
2417
- @ longer appears on the "leaves" page and is no longer labeled as a
2418
- @ "<b>Leaf</b>"</label>
2413
+ @ Mark branch
2414
+ @ <span style="font-weight:bold" id="cbranch">%h(zBranchName)</span>
2415
+ @ as "closed" so that its leafs no longer appear on the "leaves" page
2416
+ @ and are no longer labeled as a leaf "<b>Leaf</b>"</label>
24192417
 @ </td></tr>
24202418
 }
24212419
 }
24222420
 if(zBranchName) fossil_free(zBranchName);
24232421
24242422
--- src/info.c
+++ src/info.c
@@ -1317,11 +1317,11 @@
1317 text_diff(&c1, &c2, pOut, pRe, diffFlags);
1318 blob_reset(&c1);
1319 blob_reset(&c2);
1320 return;
1321 }
1322
1323 sideBySide = !is_false(PD("sbs","1"));
1324 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1325 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1326 diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
1327
@@ -1667,12 +1667,12 @@
1667 content_get(rid, &content);
1668 if( renderAsWiki ){
1669 wiki_convert(&content, 0, 0);
1670 }else if( renderAsHtml ){
1671 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
1672 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673 @ sandbox="allow-same-origin"
1674 @ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
1675 @ </iframe>
1676 }else{
1677 style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1678 zMime = mimetype_from_content(&content);
@@ -2152,15 +2152,12 @@
2152 db_finalize(&q);
2153 if( zHideFlag[0] ){
2154 db_multi_exec("REPLACE INTO newtags VALUES('hidden','*',NULL)");
2155 }
2156 if( zCloseFlag[0] ){
2157 if( is_a_leaf(rid) ){
2158 db_multi_exec("REPLACE INTO newtags VALUES('closed','+',NULL)");
2159 }else{
2160 db_multi_exec("REPLACE INTO newtags VALUES('closed','*',NULL)");
2161 }
2162 }
2163 if( zNewTagFlag[0] && zNewTag[0] ){
2164 db_multi_exec("REPLACE INTO newtags VALUES('sym-%q','+',NULL)", zNewTag);
2165 }
2166 if( zNewBrFlag[0] && zNewBranch[0] ){
@@ -2219,14 +2216,14 @@
2219 @ function stcbi(id,val){
2220 @ id.textContent = val;
2221 @ }
2222 @ function hcbxbi(id,toggle){
2223 @ if( toggle ){
2224 @ id.style.visibility = "hidden";
2225 @ id.checked = false;
2226 @ }else{
2227 @ id.style.visibility = "visible";
2228 @ }
2229 @ }
2230 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
2231 @ if( cbxid ) hcbxbi(cbxid,toggle);
2232 @ if( toggle ){
@@ -2388,11 +2385,11 @@
2388 if( !fHasHidden && zBranchName ){
2389 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2390 @ <td valign="top">
2391 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2392 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2393 @ style="visibility: hidden" />
2394 }else{
2395 @ />
2396 }
2397 @ Hide branch
2398 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
@@ -2407,17 +2404,18 @@
2407 @ <td valign="top">
2408 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2409 @ Mark this leaf as "closed" so that it no longer appears on the
2410 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2411 @ </td></tr>
2412 }else{
2413 @ <tr><th align="right" valign="top">Branch Closure:</th>
2414 @ <td valign="top">
2415 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2416 @ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leaf no
2417 @ longer appears on the "leaves" page and is no longer labeled as a
2418 @ "<b>Leaf</b>"</label>
 
2419 @ </td></tr>
2420 }
2421 }
2422 if(zBranchName) fossil_free(zBranchName);
2423
2424
--- src/info.c
+++ src/info.c
@@ -1317,11 +1317,11 @@
1317 text_diff(&c1, &c2, pOut, pRe, diffFlags);
1318 blob_reset(&c1);
1319 blob_reset(&c2);
1320 return;
1321 }
1322
1323 sideBySide = !is_false(PD("sbs","1"));
1324 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1325 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1326 diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
1327
@@ -1667,12 +1667,12 @@
1667 content_get(rid, &content);
1668 if( renderAsWiki ){
1669 wiki_convert(&content, 0, 0);
1670 }else if( renderAsHtml ){
1671 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
1672 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673 @ sandbox="allow-same-origin"
1674 @ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
1675 @ </iframe>
1676 }else{
1677 style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1678 zMime = mimetype_from_content(&content);
@@ -2152,15 +2152,12 @@
2152 db_finalize(&q);
2153 if( zHideFlag[0] ){
2154 db_multi_exec("REPLACE INTO newtags VALUES('hidden','*',NULL)");
2155 }
2156 if( zCloseFlag[0] ){
2157 db_multi_exec("REPLACE INTO newtags VALUES('closed','%s',NULL)",
2158 is_a_leaf(rid)?"+":"*");
 
 
 
2159 }
2160 if( zNewTagFlag[0] && zNewTag[0] ){
2161 db_multi_exec("REPLACE INTO newtags VALUES('sym-%q','+',NULL)", zNewTag);
2162 }
2163 if( zNewBrFlag[0] && zNewBranch[0] ){
@@ -2219,14 +2216,14 @@
2216 @ function stcbi(id,val){
2217 @ id.textContent = val;
2218 @ }
2219 @ function hcbxbi(id,toggle){
2220 @ if( toggle ){
2221 @ id.disabled = true;
2222 @ id.checked = false;
2223 @ }else{
2224 @ id.disabled = false;
2225 @ }
2226 @ }
2227 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
2228 @ if( cbxid ) hcbxbi(cbxid,toggle);
2229 @ if( toggle ){
@@ -2388,11 +2385,11 @@
2385 if( !fHasHidden && zBranchName ){
2386 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2387 @ <td valign="top">
2388 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2389 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2390 @ disabled />
2391 }else{
2392 @ />
2393 }
2394 @ Hide branch
2395 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
@@ -2407,17 +2404,18 @@
2404 @ <td valign="top">
2405 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2406 @ Mark this leaf as "closed" so that it no longer appears on the
2407 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2408 @ </td></tr>
2409 }else if( zBranchName ){
2410 @ <tr><th align="right" valign="top">Branch Closure:</th>
2411 @ <td valign="top">
2412 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2413 @ Mark branch
2414 @ <span style="font-weight:bold" id="cbranch">%h(zBranchName)</span>
2415 @ as "closed" so that its leafs no longer appear on the "leaves" page
2416 @ and are no longer labeled as a leaf "<b>Leaf</b>"</label>
2417 @ </td></tr>
2418 }
2419 }
2420 if(zBranchName) fossil_free(zBranchName);
2421
2422
M src/info.c
+13 -15
--- src/info.c
+++ src/info.c
@@ -1317,11 +1317,11 @@
13171317
 text_diff(&c1, &c2, pOut, pRe, diffFlags);
13181318
 blob_reset(&c1);
13191319
 blob_reset(&c2);
13201320
 return;
13211321
 }
1322
-
1322
+
13231323
 sideBySide = !is_false(PD("sbs","1"));
13241324
 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
13251325
 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
13261326
 diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
13271327
@@ -1667,12 +1667,12 @@
16671667
 content_get(rid, &content);
16681668
 if( renderAsWiki ){
16691669
 wiki_convert(&content, 0, 0);
16701670
 }else if( renderAsHtml ){
16711671
 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
1672
- @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673
- @ sandbox="allow-same-origin"
1672
+ @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673
+ @ sandbox="allow-same-origin"
16741674
 @ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
16751675
 @ </iframe>
16761676
 }else{
16771677
 style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
16781678
 zMime = mimetype_from_content(&content);
@@ -2152,15 +2152,12 @@
21522152
 db_finalize(&q);
21532153
 if( zHideFlag[0] ){
21542154
 db_multi_exec("REPLACE INTO newtags VALUES('hidden','*',NULL)");
21552155
 }
21562156
 if( zCloseFlag[0] ){
2157
- if( is_a_leaf(rid) ){
2158
- db_multi_exec("REPLACE INTO newtags VALUES('closed','+',NULL)");
2159
- }else{
2160
- db_multi_exec("REPLACE INTO newtags VALUES('closed','*',NULL)");
2161
- }
2157
+ db_multi_exec("REPLACE INTO newtags VALUES('closed','%s',NULL)",
2158
+ is_a_leaf(rid)?"+":"*");
21622159
 }
21632160
 if( zNewTagFlag[0] && zNewTag[0] ){
21642161
 db_multi_exec("REPLACE INTO newtags VALUES('sym-%q','+',NULL)", zNewTag);
21652162
 }
21662163
 if( zNewBrFlag[0] && zNewBranch[0] ){
@@ -2219,14 +2216,14 @@
22192216
 @ function stcbi(id,val){
22202217
 @ id.textContent = val;
22212218
 @ }
22222219
 @ function hcbxbi(id,toggle){
22232220
 @ if( toggle ){
2224
- @ id.style.visibility = "hidden";
2221
+ @ id.disabled = true;
22252222
 @ id.checked = false;
22262223
 @ }else{
2227
- @ id.style.visibility = "visible";
2224
+ @ id.disabled = false;
22282225
 @ }
22292226
 @ }
22302227
 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
22312228
 @ if( cbxid ) hcbxbi(cbxid,toggle);
22322229
 @ if( toggle ){
@@ -2388,11 +2385,11 @@
23882385
 if( !fHasHidden && zBranchName ){
23892386
 @ <tr><th align="right" valign="top">Branch Hiding:</th>
23902387
 @ <td valign="top">
23912388
 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
23922389
 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2393
- @ style="visibility: hidden" />
2390
+ @ disabled />
23942391
 }else{
23952392
 @ />
23962393
 }
23972394
 @ Hide branch
23982395
 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
@@ -2407,17 +2404,18 @@
24072404
 @ <td valign="top">
24082405
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
24092406
 @ Mark this leaf as "closed" so that it no longer appears on the
24102407
 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
24112408
 @ </td></tr>
2412
- }else{
2409
+ }else if( zBranchName ){
24132410
 @ <tr><th align="right" valign="top">Branch Closure:</th>
24142411
 @ <td valign="top">
24152412
 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2416
- @ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leaf no
2417
- @ longer appears on the "leaves" page and is no longer labeled as a
2418
- @ "<b>Leaf</b>"</label>
2413
+ @ Mark branch
2414
+ @ <span style="font-weight:bold" id="cbranch">%h(zBranchName)</span>
2415
+ @ as "closed" so that its leafs no longer appear on the "leaves" page
2416
+ @ and are no longer labeled as a leaf "<b>Leaf</b>"</label>
24192417
 @ </td></tr>
24202418
 }
24212419
 }
24222420
 if(zBranchName) fossil_free(zBranchName);
24232421
24242422
--- src/info.c
+++ src/info.c
@@ -1317,11 +1317,11 @@
1317 text_diff(&c1, &c2, pOut, pRe, diffFlags);
1318 blob_reset(&c1);
1319 blob_reset(&c2);
1320 return;
1321 }
1322
1323 sideBySide = !is_false(PD("sbs","1"));
1324 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1325 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1326 diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
1327
@@ -1667,12 +1667,12 @@
1667 content_get(rid, &content);
1668 if( renderAsWiki ){
1669 wiki_convert(&content, 0, 0);
1670 }else if( renderAsHtml ){
1671 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
1672 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673 @ sandbox="allow-same-origin"
1674 @ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
1675 @ </iframe>
1676 }else{
1677 style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1678 zMime = mimetype_from_content(&content);
@@ -2152,15 +2152,12 @@
2152 db_finalize(&q);
2153 if( zHideFlag[0] ){
2154 db_multi_exec("REPLACE INTO newtags VALUES('hidden','*',NULL)");
2155 }
2156 if( zCloseFlag[0] ){
2157 if( is_a_leaf(rid) ){
2158 db_multi_exec("REPLACE INTO newtags VALUES('closed','+',NULL)");
2159 }else{
2160 db_multi_exec("REPLACE INTO newtags VALUES('closed','*',NULL)");
2161 }
2162 }
2163 if( zNewTagFlag[0] && zNewTag[0] ){
2164 db_multi_exec("REPLACE INTO newtags VALUES('sym-%q','+',NULL)", zNewTag);
2165 }
2166 if( zNewBrFlag[0] && zNewBranch[0] ){
@@ -2219,14 +2216,14 @@
2219 @ function stcbi(id,val){
2220 @ id.textContent = val;
2221 @ }
2222 @ function hcbxbi(id,toggle){
2223 @ if( toggle ){
2224 @ id.style.visibility = "hidden";
2225 @ id.checked = false;
2226 @ }else{
2227 @ id.style.visibility = "visible";
2228 @ }
2229 @ }
2230 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
2231 @ if( cbxid ) hcbxbi(cbxid,toggle);
2232 @ if( toggle ){
@@ -2388,11 +2385,11 @@
2388 if( !fHasHidden && zBranchName ){
2389 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2390 @ <td valign="top">
2391 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2392 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2393 @ style="visibility: hidden" />
2394 }else{
2395 @ />
2396 }
2397 @ Hide branch
2398 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
@@ -2407,17 +2404,18 @@
2407 @ <td valign="top">
2408 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2409 @ Mark this leaf as "closed" so that it no longer appears on the
2410 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2411 @ </td></tr>
2412 }else{
2413 @ <tr><th align="right" valign="top">Branch Closure:</th>
2414 @ <td valign="top">
2415 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2416 @ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leaf no
2417 @ longer appears on the "leaves" page and is no longer labeled as a
2418 @ "<b>Leaf</b>"</label>
 
2419 @ </td></tr>
2420 }
2421 }
2422 if(zBranchName) fossil_free(zBranchName);
2423
2424
--- src/info.c
+++ src/info.c
@@ -1317,11 +1317,11 @@
1317 text_diff(&c1, &c2, pOut, pRe, diffFlags);
1318 blob_reset(&c1);
1319 blob_reset(&c2);
1320 return;
1321 }
1322
1323 sideBySide = !is_false(PD("sbs","1"));
1324 zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1325 zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1326 diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
1327
@@ -1667,12 +1667,12 @@
1667 content_get(rid, &content);
1668 if( renderAsWiki ){
1669 wiki_convert(&content, 0, 0);
1670 }else if( renderAsHtml ){
1671 @ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
1672 @ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
1673 @ sandbox="allow-same-origin"
1674 @ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
1675 @ </iframe>
1676 }else{
1677 style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
1678 zMime = mimetype_from_content(&content);
@@ -2152,15 +2152,12 @@
2152 db_finalize(&q);
2153 if( zHideFlag[0] ){
2154 db_multi_exec("REPLACE INTO newtags VALUES('hidden','*',NULL)");
2155 }
2156 if( zCloseFlag[0] ){
2157 db_multi_exec("REPLACE INTO newtags VALUES('closed','%s',NULL)",
2158 is_a_leaf(rid)?"+":"*");
 
 
 
2159 }
2160 if( zNewTagFlag[0] && zNewTag[0] ){
2161 db_multi_exec("REPLACE INTO newtags VALUES('sym-%q','+',NULL)", zNewTag);
2162 }
2163 if( zNewBrFlag[0] && zNewBranch[0] ){
@@ -2219,14 +2216,14 @@
2216 @ function stcbi(id,val){
2217 @ id.textContent = val;
2218 @ }
2219 @ function hcbxbi(id,toggle){
2220 @ if( toggle ){
2221 @ id.disabled = true;
2222 @ id.checked = false;
2223 @ }else{
2224 @ id.disabled = false;
2225 @ }
2226 @ }
2227 @ function hauc(cbxid,hidbrid,zdef,formid,toggle){
2228 @ if( cbxid ) hcbxbi(cbxid,toggle);
2229 @ if( toggle ){
@@ -2388,11 +2385,11 @@
2385 if( !fHasHidden && zBranchName ){
2386 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2387 @ <td valign="top">
2388 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2389 if( fossil_strcmp(zBranchName, "trunk")==0 ){
2390 @ disabled />
2391 }else{
2392 @ />
2393 }
2394 @ Hide branch
2395 @ <span style="font-weight:bold" id="hbranch">%h(zBranchName)</span>
@@ -2407,17 +2404,18 @@
2404 @ <td valign="top">
2405 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2406 @ Mark this leaf as "closed" so that it no longer appears on the
2407 @ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
2408 @ </td></tr>
2409 }else if( zBranchName ){
2410 @ <tr><th align="right" valign="top">Branch Closure:</th>
2411 @ <td valign="top">
2412 @ <label><input type="checkbox" name="close"%s(zCloseFlag) />
2413 @ Mark branch
2414 @ <span style="font-weight:bold" id="cbranch">%h(zBranchName)</span>
2415 @ as "closed" so that its leafs no longer appear on the "leaves" page
2416 @ and are no longer labeled as a leaf "<b>Leaf</b>"</label>
2417 @ </td></tr>
2418 }
2419 }
2420 if(zBranchName) fossil_free(zBranchName);
2421
2422
M src/main.mk
+1 -1
--- src/main.mk
+++ src/main.mk
@@ -1160,11 +1160,11 @@
11601160
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
11611161
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
11621162
11631163
 $(OBJDIR)/zip.h: $(OBJDIR)/headers
11641164
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1165
+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
11661166
11671167
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
11681168
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11691169
11701170
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11711171
--- src/main.mk
+++ src/main.mk
@@ -1160,11 +1160,11 @@
1160 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1164 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1171
--- src/main.mk
+++ src/main.mk
@@ -1160,11 +1160,11 @@
1160 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1161 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1162
1163 $(OBJDIR)/zip.h: $(OBJDIR)/headers
1164 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1165 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1166
1167 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1168 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1169
1170 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1171
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -295,11 +295,11 @@
295295
 append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296296
 append opt " -Dlocaltime=fossil_localtime"
297297
 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298298
 append opt " -DSQLITE_WIN32_NO_ANSI"
299299
 set SQLITE_OPTIONS $opt
300
-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
300
+writeln "\t\$(XTCC) $opt -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301301
302302
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303303
 set opt {-Dmain=sqlite3_shell}
304304
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305305
 append opt " -Dsqlite3_strglob=strglob"
@@ -1280,11 +1280,11 @@
12801280
12811281
 # define the sqlite files, which need special flags on compile
12821282
 SQLITESRC=sqlite3.c
12831283
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
12841284
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1285
-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
1285
+SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
12861286
12871287
 # define the sqlite shell files, which need special flags on compile
12881288
 SQLITESHELLSRC=shell.c
12891289
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
12901290
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
12911291
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -295,11 +295,11 @@
295 append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296 append opt " -Dlocaltime=fossil_localtime"
297 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298 append opt " -DSQLITE_WIN32_NO_ANSI"
299 set SQLITE_OPTIONS $opt
300 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301
302 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303 set opt {-Dmain=sqlite3_shell}
304 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305 append opt " -Dsqlite3_strglob=strglob"
@@ -1280,11 +1280,11 @@
1280
1281 # define the sqlite files, which need special flags on compile
1282 SQLITESRC=sqlite3.c
1283 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1284 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1285 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
1286
1287 # define the sqlite shell files, which need special flags on compile
1288 SQLITESHELLSRC=shell.c
1289 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1290 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1291
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -295,11 +295,11 @@
295 append opt " -DSQLITE_ENABLE_EXPLAIN_COMMENTS"
296 append opt " -Dlocaltime=fossil_localtime"
297 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0"
298 append opt " -DSQLITE_WIN32_NO_ANSI"
299 set SQLITE_OPTIONS $opt
300 writeln "\t\$(XTCC) $opt -DSQLITE_WINNT_MAX_PATH_CHARS=4096 -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
301
302 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
303 set opt {-Dmain=sqlite3_shell}
304 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
305 append opt " -Dsqlite3_strglob=strglob"
@@ -1280,11 +1280,11 @@
1280
1281 # define the sqlite files, which need special flags on compile
1282 SQLITESRC=sqlite3.c
1283 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
1284 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
1285 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
1286
1287 # define the sqlite shell files, which need special flags on compile
1288 SQLITESHELLSRC=shell.c
1289 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1290 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1291
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
8383
8484
 # define the sqlite files, which need special flags on compile
8585
 SQLITESRC=sqlite3.c
8686
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
8787
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88
-SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
88
+SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
8989
9090
 # define the sqlite shell files, which need special flags on compile
9191
 SQLITESHELLSRC=shell.c
9292
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
9393
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
9494
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
83
84 # define the sqlite files, which need special flags on compile
85 SQLITESRC=sqlite3.c
86 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
83
84 # define the sqlite files, which need special flags on compile
85 SQLITESRC=sqlite3.c
86 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88 SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED=1 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WIN32_NO_ANSI
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94

Keyboard Shortcuts

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