Fossil SCM
Change branch name in "Branch Closure" section in the same was as in "Branch Hiding"
Commit
9395e8d434dd1e43563832c5e30451a8dbbc8b5a
Parent
56836278da73ceb…
2 files changed
+17
-9
+17
-9
+17
-9
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2060,10 +2060,11 @@ | ||
| 2060 | 2060 | int fHasClosed = 0; /* True if closed tag already set */ |
| 2061 | 2061 | const char *zChngTime = 0; /* Value of chngtime= query param, if any */ |
| 2062 | 2062 | char *zUuid; |
| 2063 | 2063 | Blob comment; |
| 2064 | 2064 | char *zBranchName = 0; |
| 2065 | + const char *trunk; | |
| 2065 | 2066 | Stmt q; |
| 2066 | 2067 | |
| 2067 | 2068 | login_check_credentials(); |
| 2068 | 2069 | if( !g.perm.Write ){ login_needed(); return; } |
| 2069 | 2070 | rid = name_to_typed_rid(P("r"), "ci"); |
| @@ -2222,16 +2223,22 @@ | ||
| 2222 | 2223 | @ id.checked = false; |
| 2223 | 2224 | @ }else{ |
| 2224 | 2225 | @ id.disabled = false; |
| 2225 | 2226 | @ } |
| 2226 | 2227 | @ } |
| 2227 | - @ function hauc(cbxid,hidbrid,zdef,formid,toggle){ | |
| 2228 | + @ function hauc(cbxid,zdef,formid,toggle){ | |
| 2228 | 2229 | @ if( cbxid ) hcbxbi(cbxid,toggle); |
| 2230 | + @ hidbrid = gebi('hbranch'); | |
| 2231 | + @ cidbrid = gebi('cbranch'); | |
| 2229 | 2232 | @ if( toggle ){ |
| 2230 | 2233 | @ stcbi(hidbrid,zdef); |
| 2234 | + @ if(cidbrid) stcbi(cidbrid,zdef); | |
| 2231 | 2235 | @ }else{ |
| 2232 | - @ if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value); | |
| 2236 | + @ if( gebi(formid).value ){ | |
| 2237 | + @ stcbi(hidbrid,gebi(formid).value); | |
| 2238 | + @ if(cidbrid) stcbi(cidbrid,gebi(formid).value); | |
| 2239 | + @ } | |
| 2233 | 2240 | @ } |
| 2234 | 2241 | @ } |
| 2235 | 2242 | @ </script> |
| 2236 | 2243 | if( P("preview") ){ |
| 2237 | 2244 | Blob suffix; |
| @@ -2317,10 +2324,11 @@ | ||
| 2317 | 2324 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2318 | 2325 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2319 | 2326 | " ELSE tagname END /*sort*/", |
| 2320 | 2327 | rid |
| 2321 | 2328 | ); |
| 2329 | + trunk = db_get("main-branch", "trunk"); | |
| 2322 | 2330 | while( db_step(&q)==SQLITE_ROW ){ |
| 2323 | 2331 | int tagid = db_column_int(&q, 0); |
| 2324 | 2332 | const char *zTagName = db_column_text(&q, 1); |
| 2325 | 2333 | int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0; |
| 2326 | 2334 | char zLabel[30]; |
| @@ -2356,39 +2364,39 @@ | ||
| 2356 | 2364 | |
| 2357 | 2365 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2358 | 2366 | @ <td valign="top"> |
| 2359 | 2367 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) |
| 2360 | 2368 | if( !fHasHidden && zBranchName ){ |
| 2361 | - if( fossil_strcmp(zBranchName, "trunk")==0 ){ | |
| 2362 | - @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', | |
| 2369 | + if( fossil_strcmp(zBranchName, trunk)==0 ){ | |
| 2370 | + @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)', | |
| 2363 | 2371 | @ 'brname',this.value)" |
| 2364 | 2372 | }else{ |
| 2365 | - @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)', | |
| 2373 | + @ onclick="hauc(null,'%h(zBranchName)', | |
| 2366 | 2374 | @ 'brname',this.value)" |
| 2367 | 2375 | } |
| 2368 | 2376 | } |
| 2369 | 2377 | @ /> |
| 2370 | 2378 | @ Make this check-in the start of a new branch named:</label> |
| 2371 | 2379 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2372 | 2380 | @ value="%h(zNewBranch)" |
| 2373 | 2381 | if( !fHasHidden && zBranchName ){ |
| 2374 | 2382 | @ onkeyup="gebi('newbr').checked=!!this.value; |
| 2375 | - if( fossil_strcmp(zBranchName, "trunk")==0 ){ | |
| 2376 | - @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', | |
| 2383 | + if( fossil_strcmp(zBranchName, trunk)==0 ){ | |
| 2384 | + @ hauc(gebi('hidebr'),'%h(zBranchName)', | |
| 2377 | 2385 | @ 'brname',!this.value)" |
| 2378 | 2386 | }else{ |
| 2379 | - @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)" | |
| 2387 | + @ hauc(null,'%h(zBranchName)','brname',!this.value)" | |
| 2380 | 2388 | } |
| 2381 | 2389 | } |
| 2382 | 2390 | @ /> |
| 2383 | 2391 | @ </td></tr> |
| 2384 | 2392 | |
| 2385 | 2393 | if( !fHasHidden && zBranchName ){ |
| 2386 | 2394 | @ <tr><th align="right" valign="top">Branch Hiding:</th> |
| 2387 | 2395 | @ <td valign="top"> |
| 2388 | 2396 | @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) |
| 2389 | - if( fossil_strcmp(zBranchName, "trunk")==0 ){ | |
| 2397 | + if( fossil_strcmp(zBranchName, trunk)==0 ){ | |
| 2390 | 2398 | @ disabled /> |
| 2391 | 2399 | }else{ |
| 2392 | 2400 | @ /> |
| 2393 | 2401 | } |
| 2394 | 2402 | @ Hide branch |
| 2395 | 2403 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2060,10 +2060,11 @@ | |
| 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 | Stmt q; |
| 2066 | |
| 2067 | login_check_credentials(); |
| 2068 | if( !g.perm.Write ){ login_needed(); return; } |
| 2069 | rid = name_to_typed_rid(P("r"), "ci"); |
| @@ -2222,16 +2223,22 @@ | |
| 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 ){ |
| 2230 | @ stcbi(hidbrid,zdef); |
| 2231 | @ }else{ |
| 2232 | @ if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value); |
| 2233 | @ } |
| 2234 | @ } |
| 2235 | @ </script> |
| 2236 | if( P("preview") ){ |
| 2237 | Blob suffix; |
| @@ -2317,10 +2324,11 @@ | |
| 2317 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2318 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2319 | " ELSE tagname END /*sort*/", |
| 2320 | rid |
| 2321 | ); |
| 2322 | while( db_step(&q)==SQLITE_ROW ){ |
| 2323 | int tagid = db_column_int(&q, 0); |
| 2324 | const char *zTagName = db_column_text(&q, 1); |
| 2325 | int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0; |
| 2326 | char zLabel[30]; |
| @@ -2356,39 +2364,39 @@ | |
| 2356 | |
| 2357 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2358 | @ <td valign="top"> |
| 2359 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) |
| 2360 | if( !fHasHidden && zBranchName ){ |
| 2361 | if( fossil_strcmp(zBranchName, "trunk")==0 ){ |
| 2362 | @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', |
| 2363 | @ 'brname',this.value)" |
| 2364 | }else{ |
| 2365 | @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)', |
| 2366 | @ 'brname',this.value)" |
| 2367 | } |
| 2368 | } |
| 2369 | @ /> |
| 2370 | @ Make this check-in the start of a new branch named:</label> |
| 2371 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2372 | @ value="%h(zNewBranch)" |
| 2373 | if( !fHasHidden && zBranchName ){ |
| 2374 | @ onkeyup="gebi('newbr').checked=!!this.value; |
| 2375 | if( fossil_strcmp(zBranchName, "trunk")==0 ){ |
| 2376 | @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', |
| 2377 | @ 'brname',!this.value)" |
| 2378 | }else{ |
| 2379 | @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)" |
| 2380 | } |
| 2381 | } |
| 2382 | @ /> |
| 2383 | @ </td></tr> |
| 2384 | |
| 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 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2060,10 +2060,11 @@ | |
| 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 *trunk; |
| 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"); |
| @@ -2222,16 +2223,22 @@ | |
| 2223 | @ id.checked = false; |
| 2224 | @ }else{ |
| 2225 | @ id.disabled = false; |
| 2226 | @ } |
| 2227 | @ } |
| 2228 | @ function hauc(cbxid,zdef,formid,toggle){ |
| 2229 | @ if( cbxid ) hcbxbi(cbxid,toggle); |
| 2230 | @ hidbrid = gebi('hbranch'); |
| 2231 | @ cidbrid = gebi('cbranch'); |
| 2232 | @ if( toggle ){ |
| 2233 | @ stcbi(hidbrid,zdef); |
| 2234 | @ if(cidbrid) stcbi(cidbrid,zdef); |
| 2235 | @ }else{ |
| 2236 | @ if( gebi(formid).value ){ |
| 2237 | @ stcbi(hidbrid,gebi(formid).value); |
| 2238 | @ if(cidbrid) stcbi(cidbrid,gebi(formid).value); |
| 2239 | @ } |
| 2240 | @ } |
| 2241 | @ } |
| 2242 | @ </script> |
| 2243 | if( P("preview") ){ |
| 2244 | Blob suffix; |
| @@ -2317,10 +2324,11 @@ | |
| 2324 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2325 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2326 | " ELSE tagname END /*sort*/", |
| 2327 | rid |
| 2328 | ); |
| 2329 | trunk = db_get("main-branch", "trunk"); |
| 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]; |
| @@ -2356,39 +2364,39 @@ | |
| 2364 | |
| 2365 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2366 | @ <td valign="top"> |
| 2367 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) |
| 2368 | if( !fHasHidden && zBranchName ){ |
| 2369 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2370 | @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2371 | @ 'brname',this.value)" |
| 2372 | }else{ |
| 2373 | @ onclick="hauc(null,'%h(zBranchName)', |
| 2374 | @ 'brname',this.value)" |
| 2375 | } |
| 2376 | } |
| 2377 | @ /> |
| 2378 | @ Make this check-in the start of a new branch named:</label> |
| 2379 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2380 | @ value="%h(zNewBranch)" |
| 2381 | if( !fHasHidden && zBranchName ){ |
| 2382 | @ onkeyup="gebi('newbr').checked=!!this.value; |
| 2383 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2384 | @ hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2385 | @ 'brname',!this.value)" |
| 2386 | }else{ |
| 2387 | @ hauc(null,'%h(zBranchName)','brname',!this.value)" |
| 2388 | } |
| 2389 | } |
| 2390 | @ /> |
| 2391 | @ </td></tr> |
| 2392 | |
| 2393 | if( !fHasHidden && zBranchName ){ |
| 2394 | @ <tr><th align="right" valign="top">Branch Hiding:</th> |
| 2395 | @ <td valign="top"> |
| 2396 | @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) |
| 2397 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2398 | @ disabled /> |
| 2399 | }else{ |
| 2400 | @ /> |
| 2401 | } |
| 2402 | @ Hide branch |
| 2403 |
+17
-9
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2060,10 +2060,11 @@ | ||
| 2060 | 2060 | int fHasClosed = 0; /* True if closed tag already set */ |
| 2061 | 2061 | const char *zChngTime = 0; /* Value of chngtime= query param, if any */ |
| 2062 | 2062 | char *zUuid; |
| 2063 | 2063 | Blob comment; |
| 2064 | 2064 | char *zBranchName = 0; |
| 2065 | + const char *trunk; | |
| 2065 | 2066 | Stmt q; |
| 2066 | 2067 | |
| 2067 | 2068 | login_check_credentials(); |
| 2068 | 2069 | if( !g.perm.Write ){ login_needed(); return; } |
| 2069 | 2070 | rid = name_to_typed_rid(P("r"), "ci"); |
| @@ -2222,16 +2223,22 @@ | ||
| 2222 | 2223 | @ id.checked = false; |
| 2223 | 2224 | @ }else{ |
| 2224 | 2225 | @ id.disabled = false; |
| 2225 | 2226 | @ } |
| 2226 | 2227 | @ } |
| 2227 | - @ function hauc(cbxid,hidbrid,zdef,formid,toggle){ | |
| 2228 | + @ function hauc(cbxid,zdef,formid,toggle){ | |
| 2228 | 2229 | @ if( cbxid ) hcbxbi(cbxid,toggle); |
| 2230 | + @ hidbrid = gebi('hbranch'); | |
| 2231 | + @ cidbrid = gebi('cbranch'); | |
| 2229 | 2232 | @ if( toggle ){ |
| 2230 | 2233 | @ stcbi(hidbrid,zdef); |
| 2234 | + @ if(cidbrid) stcbi(cidbrid,zdef); | |
| 2231 | 2235 | @ }else{ |
| 2232 | - @ if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value); | |
| 2236 | + @ if( gebi(formid).value ){ | |
| 2237 | + @ stcbi(hidbrid,gebi(formid).value); | |
| 2238 | + @ if(cidbrid) stcbi(cidbrid,gebi(formid).value); | |
| 2239 | + @ } | |
| 2233 | 2240 | @ } |
| 2234 | 2241 | @ } |
| 2235 | 2242 | @ </script> |
| 2236 | 2243 | if( P("preview") ){ |
| 2237 | 2244 | Blob suffix; |
| @@ -2317,10 +2324,11 @@ | ||
| 2317 | 2324 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2318 | 2325 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2319 | 2326 | " ELSE tagname END /*sort*/", |
| 2320 | 2327 | rid |
| 2321 | 2328 | ); |
| 2329 | + trunk = db_get("main-branch", "trunk"); | |
| 2322 | 2330 | while( db_step(&q)==SQLITE_ROW ){ |
| 2323 | 2331 | int tagid = db_column_int(&q, 0); |
| 2324 | 2332 | const char *zTagName = db_column_text(&q, 1); |
| 2325 | 2333 | int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0; |
| 2326 | 2334 | char zLabel[30]; |
| @@ -2356,39 +2364,39 @@ | ||
| 2356 | 2364 | |
| 2357 | 2365 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2358 | 2366 | @ <td valign="top"> |
| 2359 | 2367 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) |
| 2360 | 2368 | if( !fHasHidden && zBranchName ){ |
| 2361 | - if( fossil_strcmp(zBranchName, "trunk")==0 ){ | |
| 2362 | - @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', | |
| 2369 | + if( fossil_strcmp(zBranchName, trunk)==0 ){ | |
| 2370 | + @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)', | |
| 2363 | 2371 | @ 'brname',this.value)" |
| 2364 | 2372 | }else{ |
| 2365 | - @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)', | |
| 2373 | + @ onclick="hauc(null,'%h(zBranchName)', | |
| 2366 | 2374 | @ 'brname',this.value)" |
| 2367 | 2375 | } |
| 2368 | 2376 | } |
| 2369 | 2377 | @ /> |
| 2370 | 2378 | @ Make this check-in the start of a new branch named:</label> |
| 2371 | 2379 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2372 | 2380 | @ value="%h(zNewBranch)" |
| 2373 | 2381 | if( !fHasHidden && zBranchName ){ |
| 2374 | 2382 | @ onkeyup="gebi('newbr').checked=!!this.value; |
| 2375 | - if( fossil_strcmp(zBranchName, "trunk")==0 ){ | |
| 2376 | - @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', | |
| 2383 | + if( fossil_strcmp(zBranchName, trunk)==0 ){ | |
| 2384 | + @ hauc(gebi('hidebr'),'%h(zBranchName)', | |
| 2377 | 2385 | @ 'brname',!this.value)" |
| 2378 | 2386 | }else{ |
| 2379 | - @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)" | |
| 2387 | + @ hauc(null,'%h(zBranchName)','brname',!this.value)" | |
| 2380 | 2388 | } |
| 2381 | 2389 | } |
| 2382 | 2390 | @ /> |
| 2383 | 2391 | @ </td></tr> |
| 2384 | 2392 | |
| 2385 | 2393 | if( !fHasHidden && zBranchName ){ |
| 2386 | 2394 | @ <tr><th align="right" valign="top">Branch Hiding:</th> |
| 2387 | 2395 | @ <td valign="top"> |
| 2388 | 2396 | @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) |
| 2389 | - if( fossil_strcmp(zBranchName, "trunk")==0 ){ | |
| 2397 | + if( fossil_strcmp(zBranchName, trunk)==0 ){ | |
| 2390 | 2398 | @ disabled /> |
| 2391 | 2399 | }else{ |
| 2392 | 2400 | @ /> |
| 2393 | 2401 | } |
| 2394 | 2402 | @ Hide branch |
| 2395 | 2403 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2060,10 +2060,11 @@ | |
| 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 | Stmt q; |
| 2066 | |
| 2067 | login_check_credentials(); |
| 2068 | if( !g.perm.Write ){ login_needed(); return; } |
| 2069 | rid = name_to_typed_rid(P("r"), "ci"); |
| @@ -2222,16 +2223,22 @@ | |
| 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 ){ |
| 2230 | @ stcbi(hidbrid,zdef); |
| 2231 | @ }else{ |
| 2232 | @ if( gebi(formid).value ) stcbi(hidbrid,gebi(formid).value); |
| 2233 | @ } |
| 2234 | @ } |
| 2235 | @ </script> |
| 2236 | if( P("preview") ){ |
| 2237 | Blob suffix; |
| @@ -2317,10 +2324,11 @@ | |
| 2317 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2318 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2319 | " ELSE tagname END /*sort*/", |
| 2320 | rid |
| 2321 | ); |
| 2322 | while( db_step(&q)==SQLITE_ROW ){ |
| 2323 | int tagid = db_column_int(&q, 0); |
| 2324 | const char *zTagName = db_column_text(&q, 1); |
| 2325 | int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0; |
| 2326 | char zLabel[30]; |
| @@ -2356,39 +2364,39 @@ | |
| 2356 | |
| 2357 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2358 | @ <td valign="top"> |
| 2359 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) |
| 2360 | if( !fHasHidden && zBranchName ){ |
| 2361 | if( fossil_strcmp(zBranchName, "trunk")==0 ){ |
| 2362 | @ onclick="hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', |
| 2363 | @ 'brname',this.value)" |
| 2364 | }else{ |
| 2365 | @ onclick="hauc(null,gebi('hbranch'),'%h(zBranchName)', |
| 2366 | @ 'brname',this.value)" |
| 2367 | } |
| 2368 | } |
| 2369 | @ /> |
| 2370 | @ Make this check-in the start of a new branch named:</label> |
| 2371 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2372 | @ value="%h(zNewBranch)" |
| 2373 | if( !fHasHidden && zBranchName ){ |
| 2374 | @ onkeyup="gebi('newbr').checked=!!this.value; |
| 2375 | if( fossil_strcmp(zBranchName, "trunk")==0 ){ |
| 2376 | @ hauc(gebi('hidebr'),gebi('hbranch'),'%h(zBranchName)', |
| 2377 | @ 'brname',!this.value)" |
| 2378 | }else{ |
| 2379 | @ hauc(null,gebi('hbranch'),'%h(zBranchName)','brname',!this.value)" |
| 2380 | } |
| 2381 | } |
| 2382 | @ /> |
| 2383 | @ </td></tr> |
| 2384 | |
| 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 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2060,10 +2060,11 @@ | |
| 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 *trunk; |
| 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"); |
| @@ -2222,16 +2223,22 @@ | |
| 2223 | @ id.checked = false; |
| 2224 | @ }else{ |
| 2225 | @ id.disabled = false; |
| 2226 | @ } |
| 2227 | @ } |
| 2228 | @ function hauc(cbxid,zdef,formid,toggle){ |
| 2229 | @ if( cbxid ) hcbxbi(cbxid,toggle); |
| 2230 | @ hidbrid = gebi('hbranch'); |
| 2231 | @ cidbrid = gebi('cbranch'); |
| 2232 | @ if( toggle ){ |
| 2233 | @ stcbi(hidbrid,zdef); |
| 2234 | @ if(cidbrid) stcbi(cidbrid,zdef); |
| 2235 | @ }else{ |
| 2236 | @ if( gebi(formid).value ){ |
| 2237 | @ stcbi(hidbrid,gebi(formid).value); |
| 2238 | @ if(cidbrid) stcbi(cidbrid,gebi(formid).value); |
| 2239 | @ } |
| 2240 | @ } |
| 2241 | @ } |
| 2242 | @ </script> |
| 2243 | if( P("preview") ){ |
| 2244 | Blob suffix; |
| @@ -2317,10 +2324,11 @@ | |
| 2324 | " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" |
| 2325 | " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" |
| 2326 | " ELSE tagname END /*sort*/", |
| 2327 | rid |
| 2328 | ); |
| 2329 | trunk = db_get("main-branch", "trunk"); |
| 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]; |
| @@ -2356,39 +2364,39 @@ | |
| 2364 | |
| 2365 | @ <tr><th align="right" valign="top">Branching:</th> |
| 2366 | @ <td valign="top"> |
| 2367 | @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) |
| 2368 | if( !fHasHidden && zBranchName ){ |
| 2369 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2370 | @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2371 | @ 'brname',this.value)" |
| 2372 | }else{ |
| 2373 | @ onclick="hauc(null,'%h(zBranchName)', |
| 2374 | @ 'brname',this.value)" |
| 2375 | } |
| 2376 | } |
| 2377 | @ /> |
| 2378 | @ Make this check-in the start of a new branch named:</label> |
| 2379 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2380 | @ value="%h(zNewBranch)" |
| 2381 | if( !fHasHidden && zBranchName ){ |
| 2382 | @ onkeyup="gebi('newbr').checked=!!this.value; |
| 2383 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2384 | @ hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2385 | @ 'brname',!this.value)" |
| 2386 | }else{ |
| 2387 | @ hauc(null,'%h(zBranchName)','brname',!this.value)" |
| 2388 | } |
| 2389 | } |
| 2390 | @ /> |
| 2391 | @ </td></tr> |
| 2392 | |
| 2393 | if( !fHasHidden && zBranchName ){ |
| 2394 | @ <tr><th align="right" valign="top">Branch Hiding:</th> |
| 2395 | @ <td valign="top"> |
| 2396 | @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag) |
| 2397 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2398 | @ disabled /> |
| 2399 | }else{ |
| 2400 | @ /> |
| 2401 | } |
| 2402 | @ Hide branch |
| 2403 |