Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | s/branch_prepare_query/branch_prepare_list_query/g |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | json |
| Files: | files | file ages | folders |
| SHA1: |
267739dd20e2ea4f65f4146d531bbf47 |
| User & Date: | stephan 2011-09-21 18:55:15.696 |
Context
|
2011-09-21
| ||
| 19:31 | added POST.payload to json_getenv() list. Re-organized /json/branch/list CLI/HTTP arg handling to behave sanely in CLI mode. Minor typo fix in main.c. ... (check-in: 4a9b51649d user: stephan tags: json) | |
| 18:55 | s/branch_prepare_query/branch_prepare_list_query/g ... (check-in: 267739dd20 user: stephan tags: json) | |
| 18:53 | changed how /json/branch/list selects whether to look at open/all/closed branches. ... (check-in: 14423f3284 user: stephan tags: json) | |
Changes
Changes to src/branch.c.
| ︙ | ︙ | |||
182 183 184 185 186 187 188 | /* ** Prepare a query that will list branches. ** ** If (which<0) then the query pulls only closed branches. If ** (which>0) then the query pulls all (closed and opened) ** branches. Else the query pulls currently-opened branches. */ | | | 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 |
/*
** Prepare a query that will list branches.
**
** If (which<0) then the query pulls only closed branches. If
** (which>0) then the query pulls all (closed and opened)
** branches. Else the query pulls currently-opened branches.
*/
void branch_prepare_list_query(Stmt *pQuery, int which ){
if( which < 0 ){
db_prepare(pQuery,
"SELECT value FROM tagxref"
" WHERE tagid=%d AND value NOT NULL "
"EXCEPT "
"SELECT value FROM tagxref"
" WHERE tagid=%d"
|
| ︙ | ︙ | |||
262 263 264 265 266 267 268 |
int showClosed = find_option("closed",0,0)!=0;
if( g.localOpen ){
vid = db_lget_int("checkout", 0);
zCurrent = db_text(0, "SELECT value FROM tagxref"
" WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
}
| | | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 |
int showClosed = find_option("closed",0,0)!=0;
if( g.localOpen ){
vid = db_lget_int("checkout", 0);
zCurrent = db_text(0, "SELECT value FROM tagxref"
" WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
}
branch_prepare_list_query(&q, showAll?1:(showClosed?-1:0));
while( db_step(&q)==SQLITE_ROW ){
const char *zBr = db_column_text(&q, 0);
int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0;
fossil_print("%s%s\n", (isCur ? "* " : " "), zBr);
}
db_finalize(&q);
}else{
|
| ︙ | ︙ | |||
329 330 331 332 333 334 335 | @ <div class="sideboxDescribed"><a href="leaves?closed"> @ closed leaves</a></div>. @ Closed branches are fixed and do not change (unless they are first @ reopened)</li> @ </ol> style_sidebox_end(); | | | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 |
@ <div class="sideboxDescribed"><a href="leaves?closed">
@ closed leaves</a></div>.
@ Closed branches are fixed and do not change (unless they are first
@ reopened)</li>
@ </ol>
style_sidebox_end();
branch_prepare_list_query(&q, showAll?1:(showClosed?-1:0));
cnt = 0;
while( db_step(&q)==SQLITE_ROW ){
const char *zBr = db_column_text(&q, 0);
if( cnt==0 ){
if( colorTest ){
@ <h2>Default background colors for all branches:</h2>
}else if( showAll ){
|
| ︙ | ︙ |
Changes to src/json.c.
| ︙ | ︙ | |||
1594 1595 1596 1597 1598 1599 1600 |
break;
default:
range = "open";
which = 0;
break;
};
cson_object_set(pay,"range",cson_value_new_string(range,strlen(range)));
| | | 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 |
break;
default:
range = "open";
which = 0;
break;
};
cson_object_set(pay,"range",cson_value_new_string(range,strlen(range)));
branch_prepare_list_query(&q, which);
cson_object_set(pay,"branches",listV);
while((SQLITE_ROW==db_step(&q))){
cson_value * v = cson_sqlite3_column_to_value(q.pStmt,0);
if(v){
cson_array_append(list,v);
}else{
json_warn(FSL_JSON_W_COL_TO_JSON_FAILED,NULL);
|
| ︙ | ︙ |