Fossil SCM
Do not print extraneous text about project-id and admin-user at the end of an incremental import.
Commit
691fccbaf7afee97c74daa7e1d2653fd608d2614
Parent
59ef7cb40c8e335…
1 file changed
+6
-4
+6
-4
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -749,10 +749,12 @@ | ||
| 749 | 749 | verify_cancel(); |
| 750 | 750 | db_end_transaction(0); |
| 751 | 751 | printf("Vacuuming..."); fflush(stdout); |
| 752 | 752 | db_multi_exec("VACUUM"); |
| 753 | 753 | printf(" ok\n"); |
| 754 | - printf("project-id: %s\n", db_get("project-code", 0)); | |
| 755 | - printf("server-id: %s\n", db_get("server-code", 0)); | |
| 756 | - zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); | |
| 757 | - printf("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword); | |
| 754 | + if( !incrFlag ){ | |
| 755 | + printf("project-id: %s\n", db_get("project-code", 0)); | |
| 756 | + printf("server-id: %s\n", db_get("server-code", 0)); | |
| 757 | + zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); | |
| 758 | + printf("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword); | |
| 759 | + } | |
| 758 | 760 | } |
| 759 | 761 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -749,10 +749,12 @@ | |
| 749 | verify_cancel(); |
| 750 | db_end_transaction(0); |
| 751 | printf("Vacuuming..."); fflush(stdout); |
| 752 | db_multi_exec("VACUUM"); |
| 753 | printf(" ok\n"); |
| 754 | printf("project-id: %s\n", db_get("project-code", 0)); |
| 755 | printf("server-id: %s\n", db_get("server-code", 0)); |
| 756 | zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); |
| 757 | printf("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword); |
| 758 | } |
| 759 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -749,10 +749,12 @@ | |
| 749 | verify_cancel(); |
| 750 | db_end_transaction(0); |
| 751 | printf("Vacuuming..."); fflush(stdout); |
| 752 | db_multi_exec("VACUUM"); |
| 753 | printf(" ok\n"); |
| 754 | if( !incrFlag ){ |
| 755 | printf("project-id: %s\n", db_get("project-code", 0)); |
| 756 | printf("server-id: %s\n", db_get("server-code", 0)); |
| 757 | zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); |
| 758 | printf("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword); |
| 759 | } |
| 760 | } |
| 761 |