Fossil SCM
Inconsequential whitespace changes
Commit
9ffc50171058859f9b4dae5b9286fe72679dfe5b
Parent
4d1bee54eeb284f…
1 file changed
+5
-5
+5
-5
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -281,11 +281,11 @@ | ||
| 281 | 281 | char zTime[20]; |
| 282 | 282 | |
| 283 | 283 | if( zDate==0 ){ |
| 284 | 284 | zDate = "YYYY-MM-DD HH:MM:SS"; /* Something wrong with the repo */ |
| 285 | 285 | } |
| 286 | - modPending = moderation_pending(rid); | |
| 286 | + modPending = moderation_pending(rid); | |
| 287 | 287 | if( tagid ){ |
| 288 | 288 | if( modPending ) tagid = -tagid; |
| 289 | 289 | if( tagid==prevTagid ){ |
| 290 | 290 | if( tmFlags & TIMELINE_BRIEF ){ |
| 291 | 291 | suppressCnt++; |
| @@ -573,11 +573,11 @@ | ||
| 573 | 573 | } |
| 574 | 574 | continue; |
| 575 | 575 | } |
| 576 | 576 | zA = href("%R/artifact/%!S",fid?zNew:zOld); |
| 577 | 577 | if( content_is_private(fid) ){ |
| 578 | - zUnpub = UNPUB_TAG; | |
| 578 | + zUnpub = UNPUB_TAG; | |
| 579 | 579 | } |
| 580 | 580 | if( isNew ){ |
| 581 | 581 | @ <li> %s(zA)%h(zFilename)</a>%s(zId) %s(zUnpub) |
| 582 | 582 | if( isMergeNew ){ |
| 583 | 583 | @ (added by merge) |
| @@ -1237,13 +1237,13 @@ | ||
| 1237 | 1237 | ** MS_GLOB, and MS_REGEXP match styles. For MS_EXACT, the returned expression |
| 1238 | 1238 | ** checks for integer match against the tag ID which is looked up directly by |
| 1239 | 1239 | ** this function. For the other modes, the returned SQL expression performs |
| 1240 | 1240 | ** string comparisons against the tag names, so it is necessary to join against |
| 1241 | 1241 | ** the tag table to access the "tagname" column. |
| 1242 | -** | |
| 1242 | +** | |
| 1243 | 1243 | ** Each pattern is adjusted to to start with "sym-" and be anchored at end. |
| 1244 | -** | |
| 1244 | +** | |
| 1245 | 1245 | ** In MS_REGEXP mode, backslash can be used to protect delimiter characters. |
| 1246 | 1246 | */ |
| 1247 | 1247 | static const char *tagMatchExpression( |
| 1248 | 1248 | MatchStyle matchStyle, /* Match style code */ |
| 1249 | 1249 | const char *zTag, /* Tag name, match pattern, or list of patterns */ |
| @@ -1259,11 +1259,11 @@ | ||
| 1259 | 1259 | if( matchStyle==MS_EXACT ){ |
| 1260 | 1260 | *pCount = 1; |
| 1261 | 1261 | return mprintf("(tagid=%d)", db_int(-1, |
| 1262 | 1262 | "SELECT tagid FROM tag WHERE tagname='sym-%q'", zTag)); |
| 1263 | 1263 | } |
| 1264 | - | |
| 1264 | + | |
| 1265 | 1265 | /* Decide pattern prefix and suffix strings according to match style. */ |
| 1266 | 1266 | if( matchStyle==MS_LIKE ){ |
| 1267 | 1267 | zStart = "("; |
| 1268 | 1268 | zDelimiter = " OR "; |
| 1269 | 1269 | zEnd = ")"; |
| 1270 | 1270 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -281,11 +281,11 @@ | |
| 281 | char zTime[20]; |
| 282 | |
| 283 | if( zDate==0 ){ |
| 284 | zDate = "YYYY-MM-DD HH:MM:SS"; /* Something wrong with the repo */ |
| 285 | } |
| 286 | modPending = moderation_pending(rid); |
| 287 | if( tagid ){ |
| 288 | if( modPending ) tagid = -tagid; |
| 289 | if( tagid==prevTagid ){ |
| 290 | if( tmFlags & TIMELINE_BRIEF ){ |
| 291 | suppressCnt++; |
| @@ -573,11 +573,11 @@ | |
| 573 | } |
| 574 | continue; |
| 575 | } |
| 576 | zA = href("%R/artifact/%!S",fid?zNew:zOld); |
| 577 | if( content_is_private(fid) ){ |
| 578 | zUnpub = UNPUB_TAG; |
| 579 | } |
| 580 | if( isNew ){ |
| 581 | @ <li> %s(zA)%h(zFilename)</a>%s(zId) %s(zUnpub) |
| 582 | if( isMergeNew ){ |
| 583 | @ (added by merge) |
| @@ -1237,13 +1237,13 @@ | |
| 1237 | ** MS_GLOB, and MS_REGEXP match styles. For MS_EXACT, the returned expression |
| 1238 | ** checks for integer match against the tag ID which is looked up directly by |
| 1239 | ** this function. For the other modes, the returned SQL expression performs |
| 1240 | ** string comparisons against the tag names, so it is necessary to join against |
| 1241 | ** the tag table to access the "tagname" column. |
| 1242 | ** |
| 1243 | ** Each pattern is adjusted to to start with "sym-" and be anchored at end. |
| 1244 | ** |
| 1245 | ** In MS_REGEXP mode, backslash can be used to protect delimiter characters. |
| 1246 | */ |
| 1247 | static const char *tagMatchExpression( |
| 1248 | MatchStyle matchStyle, /* Match style code */ |
| 1249 | const char *zTag, /* Tag name, match pattern, or list of patterns */ |
| @@ -1259,11 +1259,11 @@ | |
| 1259 | if( matchStyle==MS_EXACT ){ |
| 1260 | *pCount = 1; |
| 1261 | return mprintf("(tagid=%d)", db_int(-1, |
| 1262 | "SELECT tagid FROM tag WHERE tagname='sym-%q'", zTag)); |
| 1263 | } |
| 1264 | |
| 1265 | /* Decide pattern prefix and suffix strings according to match style. */ |
| 1266 | if( matchStyle==MS_LIKE ){ |
| 1267 | zStart = "("; |
| 1268 | zDelimiter = " OR "; |
| 1269 | zEnd = ")"; |
| 1270 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -281,11 +281,11 @@ | |
| 281 | char zTime[20]; |
| 282 | |
| 283 | if( zDate==0 ){ |
| 284 | zDate = "YYYY-MM-DD HH:MM:SS"; /* Something wrong with the repo */ |
| 285 | } |
| 286 | modPending = moderation_pending(rid); |
| 287 | if( tagid ){ |
| 288 | if( modPending ) tagid = -tagid; |
| 289 | if( tagid==prevTagid ){ |
| 290 | if( tmFlags & TIMELINE_BRIEF ){ |
| 291 | suppressCnt++; |
| @@ -573,11 +573,11 @@ | |
| 573 | } |
| 574 | continue; |
| 575 | } |
| 576 | zA = href("%R/artifact/%!S",fid?zNew:zOld); |
| 577 | if( content_is_private(fid) ){ |
| 578 | zUnpub = UNPUB_TAG; |
| 579 | } |
| 580 | if( isNew ){ |
| 581 | @ <li> %s(zA)%h(zFilename)</a>%s(zId) %s(zUnpub) |
| 582 | if( isMergeNew ){ |
| 583 | @ (added by merge) |
| @@ -1237,13 +1237,13 @@ | |
| 1237 | ** MS_GLOB, and MS_REGEXP match styles. For MS_EXACT, the returned expression |
| 1238 | ** checks for integer match against the tag ID which is looked up directly by |
| 1239 | ** this function. For the other modes, the returned SQL expression performs |
| 1240 | ** string comparisons against the tag names, so it is necessary to join against |
| 1241 | ** the tag table to access the "tagname" column. |
| 1242 | ** |
| 1243 | ** Each pattern is adjusted to to start with "sym-" and be anchored at end. |
| 1244 | ** |
| 1245 | ** In MS_REGEXP mode, backslash can be used to protect delimiter characters. |
| 1246 | */ |
| 1247 | static const char *tagMatchExpression( |
| 1248 | MatchStyle matchStyle, /* Match style code */ |
| 1249 | const char *zTag, /* Tag name, match pattern, or list of patterns */ |
| @@ -1259,11 +1259,11 @@ | |
| 1259 | if( matchStyle==MS_EXACT ){ |
| 1260 | *pCount = 1; |
| 1261 | return mprintf("(tagid=%d)", db_int(-1, |
| 1262 | "SELECT tagid FROM tag WHERE tagname='sym-%q'", zTag)); |
| 1263 | } |
| 1264 | |
| 1265 | /* Decide pattern prefix and suffix strings according to match style. */ |
| 1266 | if( matchStyle==MS_LIKE ){ |
| 1267 | zStart = "("; |
| 1268 | zDelimiter = " OR "; |
| 1269 | zEnd = ")"; |
| 1270 |