Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the is_a_leaf() function so that it correctly identifies nodes as leaves if they have no non-merge children in the same branch. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
0a89d03cf658ecb54d63f22e872b569d |
| User & Date: | drh 2011-04-22 13:49:13 |
Context
|
2011-04-25
| ||
| 16:57 | Refactoring some of the configuration sync logic in preparation for bigger changes. check-in: b44d4a89 user: drh tags: trunk | |
|
2011-04-22
| ||
| 13:49 | Fix the is_a_leaf() function so that it correctly identifies nodes as leaves if they have no non-merge children in the same branch. check-in: 0a89d03c user: drh tags: trunk | |
|
2011-04-19
| ||
| 20:30 | Fix a copy of minor display problems out the output of "fossil push". check-in: 085b6a1b user: drh tags: trunk | |
Changes
Changes to src/checkin.c.
466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 |
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** Return true if the check-in with RID=rid is a leaf.
** A leaf has no children in the same branch.
*/
int is_a_leaf(int rid){
int rc;
static const char zSql[] =
@ SELECT 1 FROM plink
@ WHERE pid=%d
@ AND coalesce((SELECT value FROM tagxref
@ WHERE tagid=%d AND rid=plink.pid), 'trunk')
@ =coalesce((SELECT value FROM tagxref
@ WHERE tagid=%d AND rid=plink.cid), 'trunk')
;
rc = db_int(0, zSql, rid, TAG_BRANCH, TAG_BRANCH);
return rc==0;
}
/*
** Make sure the current check-in with timestamp zDate is younger than its
|
| > |
466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 |
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** Return true if the check-in with RID=rid is a leaf.
** A leaf has no primary children in the same branch.
*/
int is_a_leaf(int rid){
int rc;
static const char zSql[] =
@ SELECT 1 FROM plink
@ WHERE pid=%d
@ AND coalesce((SELECT value FROM tagxref
@ WHERE tagid=%d AND rid=plink.pid), 'trunk')
@ =coalesce((SELECT value FROM tagxref
@ WHERE tagid=%d AND rid=plink.cid), 'trunk')
@ AND isprim
;
rc = db_int(0, zSql, rid, TAG_BRANCH, TAG_BRANCH);
return rc==0;
}
/*
** Make sure the current check-in with timestamp zDate is younger than its
|