Fossil SCM

Rename variable 'trunk' to 'zTrunk'. Improve comment.

jan.nijtmans 2013-12-10 08:31 hidden-tag
Commit b75cc0e345e7f040ae20729d0e348b162b42360d
Parent 51cd44361e1a171…
2 files changed +5 -5 +1 -1
~ src/info.c ~ src/timeline.c
M src/info.c
+5 -5
--- src/info.c
+++ src/info.c
@@ -2060,11 +2060,11 @@
20602060
 int fHasClosed = 0; /* True if closed tag already set */
20612061
 const char *zChngTime = 0; /* Value of chngtime= query param, if any */
20622062
 char *zUuid;
20632063
 Blob comment;
20642064
 char *zBranchName = 0;
2065
- const char *trunk;
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,11 @@
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
- trunk = db_get("main-branch", "trunk");
2330
+ zTrunk = db_get("main-branch", "trunk");
23312331
 while( db_step(&q)==SQLITE_ROW ){
23322332
 int tagid = db_column_int(&q, 0);
23332333
 const char *zTagName = db_column_text(&q, 1);
23342334
 int isSpecialTag = strncmp(zTagName, "sym-", 4)!=0;
23352335
 char zLabel[30];
@@ -2365,11 +2365,11 @@
23652365
23662366
 @ <tr><th align="right" valign="top">Branching:</th>
23672367
 @ <td valign="top">
23682368
 @ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag)
23692369
 if( !fHasHidden && zBranchName ){
2370
- if( fossil_strcmp(zBranchName, trunk)==0 ){
2370
+ if( fossil_strcmp(zBranchName, zTrunk)==0 ){
23712371
 @ onclick="hauc(gebi('hidebr'),'%h(zBranchName)',
23722372
 @ 'brname',this.value)"
23732373
 }else{
23742374
 @ onclick="hauc(null,'%h(zBranchName)',
23752375
 @ 'brname',this.value)"
@@ -2383,11 +2383,11 @@
23832383
 @ onkeyup="f=!!this.value
23842384
 if( zBranchName ){
23852385
 @ if(f)f=this.value!='%h(zBranchName)'
23862386
 }
23872387
 @ gebi('newbr').checked=f
2388
- if( fossil_strcmp(zBranchName, trunk)==0 ){
2388
+ if( fossil_strcmp(zBranchName, zTrunk)==0 ){
23892389
 @ hauc(gebi('hidebr'),'%h(zBranchName)',
23902390
 @ 'brname',!f)"
23912391
 }else{
23922392
 @ hauc(null,'%h(zBranchName)','brname',!f)"
23932393
 }
@@ -2397,11 +2397,11 @@
23972397
23982398
 if( !fHasHidden && zBranchName ){
23992399
 @ <tr><th align="right" valign="top">Branch Hiding:</th>
24002400
 @ <td valign="top">
24012401
 @ <label><input type="checkbox" id="hidebr" name="hide"%s(zHideFlag)
2402
- if( fossil_strcmp(zBranchName, trunk)==0 ){
2402
+ if( fossil_strcmp(zBranchName, zTrunk)==0 ){
24032403
 @ disabled />
24042404
 }else{
24052405
 @ />
24062406
 }
24072407
 @ Hide branch
24082408
--- src/info.c
+++ src/info.c
@@ -2060,11 +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");
@@ -2325,11 +2325,11 @@
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 trunk = 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];
@@ -2365,11 +2365,11 @@
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, trunk)==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 +2383,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, trunk)==0 ){
2389 @ hauc(gebi('hidebr'),'%h(zBranchName)',
2390 @ 'brname',!f)"
2391 }else{
2392 @ hauc(null,'%h(zBranchName)','brname',!f)"
2393 }
@@ -2397,11 +2397,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, trunk)==0 ){
2403 @ disabled />
2404 }else{
2405 @ />
2406 }
2407 @ Hide branch
2408
--- src/info.c
+++ src/info.c
@@ -2060,11 +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 *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,11 @@
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];
@@ -2365,11 +2365,11 @@
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 +2383,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 +2397,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
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -111,11 +111,11 @@
111111
 #define TIMELINE_DISJOINT 0x0010 /* Elements are not contiguous */
112112
 #define TIMELINE_FCHANGES 0x0020 /* Detail file changes */
113113
 #define TIMELINE_BRCOLOR 0x0040 /* Background color by branch name */
114114
 #define TIMELINE_UCOLOR 0x0080 /* Background color by user */
115115
 #define TIMELINE_FRENAMES 0x0100 /* Detail only file name changes */
116
-#define TIMELINE_UNHIDE 0x0200 /* Unhide */
116
+#define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
117117
 #endif
118118
119119
 /*
120120
 ** Hash a string and use the hash to determine a background color.
121121
 */
122122
--- src/timeline.c
+++ src/timeline.c
@@ -111,11 +111,11 @@
111 #define TIMELINE_DISJOINT 0x0010 /* Elements are not contiguous */
112 #define TIMELINE_FCHANGES 0x0020 /* Detail file changes */
113 #define TIMELINE_BRCOLOR 0x0040 /* Background color by branch name */
114 #define TIMELINE_UCOLOR 0x0080 /* Background color by user */
115 #define TIMELINE_FRENAMES 0x0100 /* Detail only file name changes */
116 #define TIMELINE_UNHIDE 0x0200 /* Unhide */
117 #endif
118
119 /*
120 ** Hash a string and use the hash to determine a background color.
121 */
122
--- src/timeline.c
+++ src/timeline.c
@@ -111,11 +111,11 @@
111 #define TIMELINE_DISJOINT 0x0010 /* Elements are not contiguous */
112 #define TIMELINE_FCHANGES 0x0020 /* Detail file changes */
113 #define TIMELINE_BRCOLOR 0x0040 /* Background color by branch name */
114 #define TIMELINE_UCOLOR 0x0080 /* Background color by user */
115 #define TIMELINE_FRENAMES 0x0100 /* Detail only file name changes */
116 #define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
117 #endif
118
119 /*
120 ** Hash a string and use the hash to determine a background color.
121 */
122

Keyboard Shortcuts

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