Fossil SCM
merge trunk
Commit
46a88543ca23c1ac83c2d206d1a969c890ebeaba
Parent
9395e8d434dd1e4…
2 files changed
+7
-3
+7
-3
+7
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2377,16 +2377,20 @@ | ||
| 2377 | 2377 | @ /> |
| 2378 | 2378 | @ Make this check-in the start of a new branch named:</label> |
| 2379 | 2379 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2380 | 2380 | @ value="%h(zNewBranch)" |
| 2381 | 2381 | if( !fHasHidden && zBranchName ){ |
| 2382 | - @ onkeyup="gebi('newbr').checked=!!this.value; | |
| 2382 | + @ onkeyup="f=!!this.value | |
| 2383 | + if( zBranchName ){ | |
| 2384 | + @ if(f)f=this.value!='%h(zBranchName)' | |
| 2385 | + } | |
| 2386 | + @ gebi('newbr').checked=f | |
| 2383 | 2387 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2384 | 2388 | @ hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2385 | - @ 'brname',!this.value)" | |
| 2389 | + @ 'brname',!f)" | |
| 2386 | 2390 | }else{ |
| 2387 | - @ hauc(null,'%h(zBranchName)','brname',!this.value)" | |
| 2391 | + @ hauc(null,'%h(zBranchName)','brname',!f)" | |
| 2388 | 2392 | } |
| 2389 | 2393 | } |
| 2390 | 2394 | @ /> |
| 2391 | 2395 | @ </td></tr> |
| 2392 | 2396 | |
| 2393 | 2397 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2377,16 +2377,20 @@ | |
| 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 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2377,16 +2377,20 @@ | |
| 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="f=!!this.value |
| 2383 | if( zBranchName ){ |
| 2384 | @ if(f)f=this.value!='%h(zBranchName)' |
| 2385 | } |
| 2386 | @ gebi('newbr').checked=f |
| 2387 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2388 | @ hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2389 | @ 'brname',!f)" |
| 2390 | }else{ |
| 2391 | @ hauc(null,'%h(zBranchName)','brname',!f)" |
| 2392 | } |
| 2393 | } |
| 2394 | @ /> |
| 2395 | @ </td></tr> |
| 2396 | |
| 2397 |
+7
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -2377,16 +2377,20 @@ | ||
| 2377 | 2377 | @ /> |
| 2378 | 2378 | @ Make this check-in the start of a new branch named:</label> |
| 2379 | 2379 | @ <input type="text" style="width:15;" id="brname" name="brname" |
| 2380 | 2380 | @ value="%h(zNewBranch)" |
| 2381 | 2381 | if( !fHasHidden && zBranchName ){ |
| 2382 | - @ onkeyup="gebi('newbr').checked=!!this.value; | |
| 2382 | + @ onkeyup="f=!!this.value | |
| 2383 | + if( zBranchName ){ | |
| 2384 | + @ if(f)f=this.value!='%h(zBranchName)' | |
| 2385 | + } | |
| 2386 | + @ gebi('newbr').checked=f | |
| 2383 | 2387 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2384 | 2388 | @ hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2385 | - @ 'brname',!this.value)" | |
| 2389 | + @ 'brname',!f)" | |
| 2386 | 2390 | }else{ |
| 2387 | - @ hauc(null,'%h(zBranchName)','brname',!this.value)" | |
| 2391 | + @ hauc(null,'%h(zBranchName)','brname',!f)" | |
| 2388 | 2392 | } |
| 2389 | 2393 | } |
| 2390 | 2394 | @ /> |
| 2391 | 2395 | @ </td></tr> |
| 2392 | 2396 | |
| 2393 | 2397 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2377,16 +2377,20 @@ | |
| 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 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -2377,16 +2377,20 @@ | |
| 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="f=!!this.value |
| 2383 | if( zBranchName ){ |
| 2384 | @ if(f)f=this.value!='%h(zBranchName)' |
| 2385 | } |
| 2386 | @ gebi('newbr').checked=f |
| 2387 | if( fossil_strcmp(zBranchName, trunk)==0 ){ |
| 2388 | @ hauc(gebi('hidebr'),'%h(zBranchName)', |
| 2389 | @ 'brname',!f)" |
| 2390 | }else{ |
| 2391 | @ hauc(null,'%h(zBranchName)','brname',!f)" |
| 2392 | } |
| 2393 | } |
| 2394 | @ /> |
| 2395 | @ </td></tr> |
| 2396 | |
| 2397 |