Fossil SCM

Attempt to prevent hiding of either main-branch or trunk.

andybradford 2013-12-13 02:46 hidden-tag
Commit 7a41dd2b0605f4a890aedbd42d0a73178743b1f1
Parent 820a599008bf9e7…
1 file changed +6 -5
~ src/info.c
M src/info.c
+6 -5
--- src/info.c
+++ src/info.c
@@ -2056,15 +2056,15 @@
20562056
 const char *zHideFlag;
20572057
 int fPropagateColor; /* True if color propagates before edit */
20582058
 int fNewPropagateColor; /* True if color propagates after edit */
20592059
 int fHasHidden = 0; /* True if hidden tag already set */
20602060
 int fHasClosed = 0; /* True if closed tag already set */
2061
+ int fMainBranch = 0; /* True if branch is trunk or main-branch */
20612062
 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
20622063
 char *zUuid;
20632064
 Blob comment;
20642065
 char *zBranchName = 0;
2065
- const char *zTrunk;
20662066
 Stmt q;
20672067
20682068
 login_check_credentials();
20692069
 if( !g.perm.Write ){ login_needed(); return; }
20702070
 rid = name_to_typed_rid(P("r"), "ci");
@@ -2325,11 +2325,10 @@
23252325
 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
23262326
 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
23272327
 " ELSE tagname END /*sort*/",
23282328
 rid
23292329
 );
2330
- zTrunk = db_get("main-branch", "trunk");
23312330
 while( db_step(&q)==SQLITE_ROW ){
23322331
 int tagid = db_column_int(&q, 0);
23332332
 const char *zTagName = db_column_text(&q, 1);
23342333
 int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0;
23352334
 char zLabel[30];
@@ -2358,18 +2357,20 @@
23582357
 @ Cancel special tag <b>%h(zTagName)</b></label>
23592358
 }else{
23602359
 @ Cancel tag <b>%h(&zTagName[4])</b></label>
23612360
 }
23622361
 }
2362
+ fMainBranch = fossil_strcmp("trunk", zBranchName)==0 ||
2363
+ fossil_strcmp(db_get("main-branch", "trunk"), zBranchName)==0;
23632364
 db_finalize(&q);
23642365
 @ </td></tr>
23652366
23662367
 @ <tr><th align="right" valign="top">Branching:</th>
23672368
 @ <td valign="top">
23682369
 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
23692370
 if( !fHasHidden && zBranchName ){
2370
- if( fossil_strcmp(zBranchName, zTrunk)==0 ){
2371
+ if( fMainBranch ){
23712372
 @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)',
23722373
 @ 'brname',this.value)"
23732374
 }else{
23742375
 @ onclick="hauc(null,'%h(zBranchName)',
23752376
 @ 'brname',this.value)"
@@ -2383,11 +2384,11 @@
23832384
 @ onkeyup="f=!!this.value
23842385
 if( zBranchName ){
23852386
 @ if(f)f=this.value!='%h(zBranchName)'
23862387
 }
23872388
 @ gebi('newbr').checked=f
2388
- if( fossil_strcmp(zBranchName, zTrunk)==0 ){
2389
+ if( fMainBranch ){
23892390
 @ hauc(gebi('hidebr'),'%h(zBranchName)',
23902391
 @ 'brname',!f)"
23912392
 }else{
23922393
 @ hauc(null,'%h(zBranchName)','brname',!f)"
23932394
 }
@@ -2397,11 +2398,11 @@
23972398
23982399
 if( !fHasHidden && zBranchName ){
23992400
 @ <tr><th align="right" valign="top">Branch Hiding:</th>
24002401
 @ <td valign="top">
24012402
 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2402
- if( fossil_strcmp(zBranchName, zTrunk)==0 ){
2403
+ if( fMainBranch ){
24032404
 @ disabled />
24042405
 }else{
24052406
 @ />
24062407
 }
24072408
 @ Hide branch
24082409
--- src/info.c
+++ src/info.c
@@ -2056,15 +2056,15 @@
2056 const char *zHideFlag;
2057 int fPropagateColor; /* True if color propagates before edit */
2058 int fNewPropagateColor; /* True if color propagates after edit */
2059 int fHasHidden = 0; /* True if hidden tag already set */
2060 int fHasClosed = 0; /* True if closed tag already set */
 
2061 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
2062 char *zUuid;
2063 Blob comment;
2064 char *zBranchName = 0;
2065 const char *zTrunk;
2066 Stmt q;
2067
2068 login_check_credentials();
2069 if( !g.perm.Write ){ login_needed(); return; }
2070 rid = name_to_typed_rid(P("r"), "ci");
@@ -2325,11 +2325,10 @@
2325 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
2326 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
2327 " ELSE tagname END /*sort*/",
2328 rid
2329 );
2330 zTrunk = db_get("main-branch", "trunk");
2331 while( db_step(&q)==SQLITE_ROW ){
2332 int tagid = db_column_int(&q, 0);
2333 const char *zTagName = db_column_text(&q, 1);
2334 int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0;
2335 char zLabel[30];
@@ -2358,18 +2357,20 @@
2358 @ Cancel special tag <b>%h(zTagName)</b></label>
2359 }else{
2360 @ Cancel tag <b>%h(&zTagName[4])</b></label>
2361 }
2362 }
 
 
2363 db_finalize(&q);
2364 @ </td></tr>
2365
2366 @ <tr><th align="right" valign="top">Branching:</th>
2367 @ <td valign="top">
2368 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2369 if( !fHasHidden && zBranchName ){
2370 if( fossil_strcmp(zBranchName, zTrunk)==0 ){
2371 @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)',
2372 @ 'brname',this.value)"
2373 }else{
2374 @ onclick="hauc(null,'%h(zBranchName)',
2375 @ 'brname',this.value)"
@@ -2383,11 +2384,11 @@
2383 @ onkeyup="f=!!this.value
2384 if( zBranchName ){
2385 @ if(f)f=this.value!='%h(zBranchName)'
2386 }
2387 @ gebi('newbr').checked=f
2388 if( fossil_strcmp(zBranchName, zTrunk)==0 ){
2389 @ hauc(gebi('hidebr'),'%h(zBranchName)',
2390 @ 'brname',!f)"
2391 }else{
2392 @ hauc(null,'%h(zBranchName)','brname',!f)"
2393 }
@@ -2397,11 +2398,11 @@
2397
2398 if( !fHasHidden && zBranchName ){
2399 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2400 @ <td valign="top">
2401 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2402 if( fossil_strcmp(zBranchName, zTrunk)==0 ){
2403 @ disabled />
2404 }else{
2405 @ />
2406 }
2407 @ Hide branch
2408
--- src/info.c
+++ src/info.c
@@ -2056,15 +2056,15 @@
2056 const char *zHideFlag;
2057 int fPropagateColor; /* True if color propagates before edit */
2058 int fNewPropagateColor; /* True if color propagates after edit */
2059 int fHasHidden = 0; /* True if hidden tag already set */
2060 int fHasClosed = 0; /* True if closed tag already set */
2061 int fMainBranch = 0; /* True if branch is trunk or main-branch */
2062 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
2063 char *zUuid;
2064 Blob comment;
2065 char *zBranchName = 0;
 
2066 Stmt q;
2067
2068 login_check_credentials();
2069 if( !g.perm.Write ){ login_needed(); return; }
2070 rid = name_to_typed_rid(P("r"), "ci");
@@ -2325,11 +2325,10 @@
2325 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
2326 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
2327 " ELSE tagname END /*sort*/",
2328 rid
2329 );
 
2330 while( db_step(&q)==SQLITE_ROW ){
2331 int tagid = db_column_int(&q, 0);
2332 const char *zTagName = db_column_text(&q, 1);
2333 int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0;
2334 char zLabel[30];
@@ -2358,18 +2357,20 @@
2357 @ Cancel special tag <b>%h(zTagName)</b></label>
2358 }else{
2359 @ Cancel tag <b>%h(&zTagName[4])</b></label>
2360 }
2361 }
2362 fMainBranch = fossil_strcmp("trunk", zBranchName)==0 ||
2363 fossil_strcmp(db_get("main-branch", "trunk"), zBranchName)==0;
2364 db_finalize(&q);
2365 @ </td></tr>
2366
2367 @ <tr><th align="right" valign="top">Branching:</th>
2368 @ <td valign="top">
2369 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
2370 if( !fHasHidden && zBranchName ){
2371 if( fMainBranch ){
2372 @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)',
2373 @ 'brname',this.value)"
2374 }else{
2375 @ onclick="hauc(null,'%h(zBranchName)',
2376 @ 'brname',this.value)"
@@ -2383,11 +2384,11 @@
2384 @ onkeyup="f=!!this.value
2385 if( zBranchName ){
2386 @ if(f)f=this.value!='%h(zBranchName)'
2387 }
2388 @ gebi('newbr').checked=f
2389 if( fMainBranch ){
2390 @ hauc(gebi('hidebr'),'%h(zBranchName)',
2391 @ 'brname',!f)"
2392 }else{
2393 @ hauc(null,'%h(zBranchName)','brname',!f)"
2394 }
@@ -2397,11 +2398,11 @@
2398
2399 if( !fHasHidden && zBranchName ){
2400 @ <tr><th align="right" valign="top">Branch Hiding:</th>
2401 @ <td valign="top">
2402 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2403 if( fMainBranch ){
2404 @ disabled />
2405 }else{
2406 @ />
2407 }
2408 @ Hide branch
2409

Keyboard Shortcuts

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