Fossil SCM
Backout remaining of [8e01c2257d] and fix corresponding change log entry, as it apparently is not accepted upstream. See: [http://www.mail-archive.com/[email protected]/msg13883.html]. Sorry Joerg.
Commit
0625a42c686bce501a0e03eacdc971398b8d67d6
Parent
1460b7476ff5e4c…
2 files changed
+1
-5
+2
-3
+1
-5
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1521,19 +1521,18 @@ | ||
| 1521 | 1521 | int nEntry = 0; |
| 1522 | 1522 | char zPrevDate[20]; |
| 1523 | 1523 | const char *zCurrentUuid = 0; |
| 1524 | 1524 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| 1525 | 1525 | Stmt fchngQuery; /* Query for file changes on check-ins */ |
| 1526 | - int rc; | |
| 1527 | 1526 | |
| 1528 | 1527 | zPrevDate[0] = 0; |
| 1529 | 1528 | if( g.localOpen ){ |
| 1530 | 1529 | int rid = db_lget_int("checkout", 0); |
| 1531 | 1530 | zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1532 | 1531 | } |
| 1533 | 1532 | |
| 1534 | - while( (rc=db_step(q))==SQLITE_ROW ){ | |
| 1533 | + while( db_step(q)==SQLITE_ROW ){ | |
| 1535 | 1534 | int rid = db_column_int(q, 0); |
| 1536 | 1535 | const char *zId = db_column_text(q, 1); |
| 1537 | 1536 | const char *zDate = db_column_text(q, 2); |
| 1538 | 1537 | const char *zCom = db_column_text(q, 3); |
| 1539 | 1538 | int nChild = db_column_int(q, 4); |
| @@ -1613,13 +1612,10 @@ | ||
| 1613 | 1612 | } |
| 1614 | 1613 | db_reset(&fchngQuery); |
| 1615 | 1614 | } |
| 1616 | 1615 | nEntry++; /* record another complete entry */ |
| 1617 | 1616 | } |
| 1618 | - if( rc==SQLITE_DONE ){ | |
| 1619 | - fossil_print("+++ end of timeline +++\n"); | |
| 1620 | - } | |
| 1621 | 1617 | if( fchngQueryInit ) db_finalize(&fchngQuery); |
| 1622 | 1618 | } |
| 1623 | 1619 | |
| 1624 | 1620 | /* |
| 1625 | 1621 | ** Return a pointer to a static string that forms the basis for |
| 1626 | 1622 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1521,19 +1521,18 @@ | |
| 1521 | int nEntry = 0; |
| 1522 | char zPrevDate[20]; |
| 1523 | const char *zCurrentUuid = 0; |
| 1524 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| 1525 | Stmt fchngQuery; /* Query for file changes on check-ins */ |
| 1526 | int rc; |
| 1527 | |
| 1528 | zPrevDate[0] = 0; |
| 1529 | if( g.localOpen ){ |
| 1530 | int rid = db_lget_int("checkout", 0); |
| 1531 | zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1532 | } |
| 1533 | |
| 1534 | while( (rc=db_step(q))==SQLITE_ROW ){ |
| 1535 | int rid = db_column_int(q, 0); |
| 1536 | const char *zId = db_column_text(q, 1); |
| 1537 | const char *zDate = db_column_text(q, 2); |
| 1538 | const char *zCom = db_column_text(q, 3); |
| 1539 | int nChild = db_column_int(q, 4); |
| @@ -1613,13 +1612,10 @@ | |
| 1613 | } |
| 1614 | db_reset(&fchngQuery); |
| 1615 | } |
| 1616 | nEntry++; /* record another complete entry */ |
| 1617 | } |
| 1618 | if( rc==SQLITE_DONE ){ |
| 1619 | fossil_print("+++ end of timeline +++\n"); |
| 1620 | } |
| 1621 | if( fchngQueryInit ) db_finalize(&fchngQuery); |
| 1622 | } |
| 1623 | |
| 1624 | /* |
| 1625 | ** Return a pointer to a static string that forms the basis for |
| 1626 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1521,19 +1521,18 @@ | |
| 1521 | int nEntry = 0; |
| 1522 | char zPrevDate[20]; |
| 1523 | const char *zCurrentUuid = 0; |
| 1524 | int fchngQueryInit = 0; /* True if fchngQuery is initialized */ |
| 1525 | Stmt fchngQuery; /* Query for file changes on check-ins */ |
| 1526 | |
| 1527 | zPrevDate[0] = 0; |
| 1528 | if( g.localOpen ){ |
| 1529 | int rid = db_lget_int("checkout", 0); |
| 1530 | zCurrentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid); |
| 1531 | } |
| 1532 | |
| 1533 | while( db_step(q)==SQLITE_ROW ){ |
| 1534 | int rid = db_column_int(q, 0); |
| 1535 | const char *zId = db_column_text(q, 1); |
| 1536 | const char *zDate = db_column_text(q, 2); |
| 1537 | const char *zCom = db_column_text(q, 3); |
| 1538 | int nChild = db_column_int(q, 4); |
| @@ -1613,13 +1612,10 @@ | |
| 1612 | } |
| 1613 | db_reset(&fchngQuery); |
| 1614 | } |
| 1615 | nEntry++; /* record another complete entry */ |
| 1616 | } |
| 1617 | if( fchngQueryInit ) db_finalize(&fchngQuery); |
| 1618 | } |
| 1619 | |
| 1620 | /* |
| 1621 | ** Return a pointer to a static string that forms the basis for |
| 1622 |
+2
-3
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -23,13 +23,12 @@ | ||
| 23 | 23 | * Add option -W|--width to the "[/help?cmd=timeline | fossil timeline]" |
| 24 | 24 | and "[/help?cmd=finfo | fossil finfo]" commands. |
| 25 | 25 | * Option -n|--limit of "[/help?cmd=timeline | fossil timeline]" now |
| 26 | 26 | specifies the number of entries, just like all other commands which |
| 27 | 27 | have the -n|--limit option. The various timeline-related functions |
| 28 | - now output "+++ end of timeline reached +++" whenever appropriate. | |
| 29 | - Use "-n 0" if no limit is desired, the end of timeline marker will | |
| 30 | - not be printed then. | |
| 28 | + now output "--- ?? limit (??) reached ---" at the end whenever | |
| 29 | + appropriate. Use "-n 0" if no limit is desired. | |
| 31 | 30 | * Fix handling of password embedded in Fossil URL. |
| 32 | 31 | * New --once option to [/help?cmd=clone | fossil clone] command which does |
| 33 | 32 | not store the URL or password when cloning. |
| 34 | 33 | * Modify [/help?cmd=ui | fossil ui] to respect "default user" in open repository. |
| 35 | 34 | |
| 36 | 35 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -23,13 +23,12 @@ | |
| 23 | * Add option -W|--width to the "[/help?cmd=timeline | fossil timeline]" |
| 24 | and "[/help?cmd=finfo | fossil finfo]" commands. |
| 25 | * Option -n|--limit of "[/help?cmd=timeline | fossil timeline]" now |
| 26 | specifies the number of entries, just like all other commands which |
| 27 | have the -n|--limit option. The various timeline-related functions |
| 28 | now output "+++ end of timeline reached +++" whenever appropriate. |
| 29 | Use "-n 0" if no limit is desired, the end of timeline marker will |
| 30 | not be printed then. |
| 31 | * Fix handling of password embedded in Fossil URL. |
| 32 | * New --once option to [/help?cmd=clone | fossil clone] command which does |
| 33 | not store the URL or password when cloning. |
| 34 | * Modify [/help?cmd=ui | fossil ui] to respect "default user" in open repository. |
| 35 | |
| 36 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -23,13 +23,12 @@ | |
| 23 | * Add option -W|--width to the "[/help?cmd=timeline | fossil timeline]" |
| 24 | and "[/help?cmd=finfo | fossil finfo]" commands. |
| 25 | * Option -n|--limit of "[/help?cmd=timeline | fossil timeline]" now |
| 26 | specifies the number of entries, just like all other commands which |
| 27 | have the -n|--limit option. The various timeline-related functions |
| 28 | now output "--- ?? limit (??) reached ---" at the end whenever |
| 29 | appropriate. Use "-n 0" if no limit is desired. |
| 30 | * Fix handling of password embedded in Fossil URL. |
| 31 | * New --once option to [/help?cmd=clone | fossil clone] command which does |
| 32 | not store the URL or password when cloning. |
| 33 | * Modify [/help?cmd=ui | fossil ui] to respect "default user" in open repository. |
| 34 | |
| 35 |