Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the "divider" lines in the timeline display. Add the --force option to the "import" command. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ef68b044493c76887d8cc02ea8a53f11 |
| User & Date: | drh 2010-11-10 13:36:46.000 |
Context
|
2010-11-10
| ||
| 18:42 | Fix the code for adding "mlink" entries so that it records file deletions on a baseline manifest. ... (check-in: 0ba2c86d2b user: drh tags: trunk) | |
| 13:36 | Fix the "divider" lines in the timeline display. Add the --force option to the "import" command. ... (check-in: ef68b04449 user: drh tags: trunk) | |
| 01:43 | Tweak check-in times slightly so that parents always come before their children. ... (check-in: 0e87f42762 user: drh tags: trunk) | |
Changes
Changes to src/import.c.
| ︙ | ︙ | |||
538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 |
** Read text generated by the git-fast-export command and use it to
** construct a new Fossil repository named by the NEW-REPOSITORY
** argument. The get-fast-export text is read from standard input.
*/
void git_import_cmd(void){
char *zPassword;
FILE *pIn;
if( g.argc!=3 && g.argc!=4 ){
usage("REPOSITORY-NAME");
}
if( g.argc==4 ){
pIn = fopen(g.argv[3], "rb");
}else{
pIn = stdin;
}
db_create_repository(g.argv[2]);
db_open_repository(g.argv[2]);
db_open_config(0);
db_multi_exec(
"ATTACH ':memory:' AS mem1;"
"CREATE TABLE mem1.xtag(tname TEXT UNIQUE, trid INT, tuuid TEXT);"
);
| > > | 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 |
** Read text generated by the git-fast-export command and use it to
** construct a new Fossil repository named by the NEW-REPOSITORY
** argument. The get-fast-export text is read from standard input.
*/
void git_import_cmd(void){
char *zPassword;
FILE *pIn;
int forceFlag = find_option("force", "f", 0)!=0;
if( g.argc!=3 && g.argc!=4 ){
usage("REPOSITORY-NAME");
}
if( g.argc==4 ){
pIn = fopen(g.argv[3], "rb");
}else{
pIn = stdin;
}
if( forceFlag ) unlink(g.argv[2]);
db_create_repository(g.argv[2]);
db_open_repository(g.argv[2]);
db_open_config(0);
db_multi_exec(
"ATTACH ':memory:' AS mem1;"
"CREATE TABLE mem1.xtag(tname TEXT UNIQUE, trid INT, tuuid TEXT);"
);
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
615 616 617 618 619 620 621 |
/*
** zDate is a localtime date. Insert records into the
** "timeline" table to cause <hr> to be inserted before and after
** entries of that date.
*/
static void timeline_add_dividers(const char *zDate){
db_multi_exec(
| | | | | | 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 |
/*
** zDate is a localtime date. Insert records into the
** "timeline" table to cause <hr> to be inserted before and after
** entries of that date.
*/
static void timeline_add_dividers(const char *zDate){
db_multi_exec(
"INSERT INTO timeline(rid,sortby,etype)"
"VALUES(-1,julianday(%Q,'utc')-5.0e-6,'div')",
zDate
);
db_multi_exec(
"INSERT INTO timeline(rid,sortby,etype)"
"VALUES(-2,julianday(%Q,'utc')+5.0e-6,'div')",
zDate
);
}
/*
** WEBPAGE: timeline
|
| ︙ | ︙ |