Fossil SCM
Always print the "project-name" using the command-line "info" command. Avoid an extra "/" character when constructing files for check-in.
Commit
bbd758ecc30352dd3d50936c6dfda1d82a155748
Parent
129edda98e4b962…
2 files changed
+1
-1
+2
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -585,11 +585,11 @@ | ||
| 585 | 585 | "SELECT pathname, uuid, origname, blob.rid" |
| 586 | 586 | " FROM vfile JOIN blob ON vfile.mrid=blob.rid" |
| 587 | 587 | " WHERE NOT deleted AND vfile.vid=%d" |
| 588 | 588 | " ORDER BY 1", vid); |
| 589 | 589 | blob_zero(&filename); |
| 590 | - blob_appendf(&filename, "%s/", g.zLocalRoot); | |
| 590 | + blob_appendf(&filename, "%s", g.zLocalRoot); | |
| 591 | 591 | nBasename = blob_size(&filename); |
| 592 | 592 | while( db_step(&q)==SQLITE_ROW ){ |
| 593 | 593 | const char *zName = db_column_text(&q, 0); |
| 594 | 594 | const char *zUuid = db_column_text(&q, 1); |
| 595 | 595 | const char *zOrig = db_column_text(&q, 2); |
| 596 | 596 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -585,11 +585,11 @@ | |
| 585 | "SELECT pathname, uuid, origname, blob.rid" |
| 586 | " FROM vfile JOIN blob ON vfile.mrid=blob.rid" |
| 587 | " WHERE NOT deleted AND vfile.vid=%d" |
| 588 | " ORDER BY 1", vid); |
| 589 | blob_zero(&filename); |
| 590 | blob_appendf(&filename, "%s/", g.zLocalRoot); |
| 591 | nBasename = blob_size(&filename); |
| 592 | while( db_step(&q)==SQLITE_ROW ){ |
| 593 | const char *zName = db_column_text(&q, 0); |
| 594 | const char *zUuid = db_column_text(&q, 1); |
| 595 | const char *zOrig = db_column_text(&q, 2); |
| 596 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -585,11 +585,11 @@ | |
| 585 | "SELECT pathname, uuid, origname, blob.rid" |
| 586 | " FROM vfile JOIN blob ON vfile.mrid=blob.rid" |
| 587 | " WHERE NOT deleted AND vfile.vid=%d" |
| 588 | " ORDER BY 1", vid); |
| 589 | blob_zero(&filename); |
| 590 | blob_appendf(&filename, "%s", g.zLocalRoot); |
| 591 | nBasename = blob_size(&filename); |
| 592 | while( db_step(&q)==SQLITE_ROW ){ |
| 593 | const char *zName = db_column_text(&q, 0); |
| 594 | const char *zUuid = db_column_text(&q, 1); |
| 595 | const char *zOrig = db_column_text(&q, 2); |
| 596 |
+2
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -114,20 +114,21 @@ | ||
| 114 | 114 | } |
| 115 | 115 | if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){ |
| 116 | 116 | db_open_config(0); |
| 117 | 117 | db_record_repository_filename(g.argv[2]); |
| 118 | 118 | db_open_repository(g.argv[2]); |
| 119 | - printf("project-code: %s\n", db_get("project-code", "<none>")); | |
| 120 | 119 | printf("project-name: %s\n", db_get("project-name", "<unnamed>")); |
| 120 | + printf("project-code: %s\n", db_get("project-code", "<none>")); | |
| 121 | 121 | printf("server-code: %s\n", db_get("server-code", "<none>")); |
| 122 | 122 | return; |
| 123 | 123 | } |
| 124 | 124 | db_must_be_within_tree(); |
| 125 | 125 | if( g.argc==2 ){ |
| 126 | 126 | int vid; |
| 127 | 127 | /* 012345678901234 */ |
| 128 | 128 | db_record_repository_filename(0); |
| 129 | + printf("project-name: %s\n", db_get("project-name", "<unnamed>")); | |
| 129 | 130 | printf("repository: %s\n", db_lget("repository", "")); |
| 130 | 131 | printf("local-root: %s\n", g.zLocalRoot); |
| 131 | 132 | printf("project-code: %s\n", db_get("project-code", "")); |
| 132 | 133 | printf("server-code: %s\n", db_get("server-code", "")); |
| 133 | 134 | vid = db_lget_int("checkout", 0); |
| 134 | 135 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -114,20 +114,21 @@ | |
| 114 | } |
| 115 | if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){ |
| 116 | db_open_config(0); |
| 117 | db_record_repository_filename(g.argv[2]); |
| 118 | db_open_repository(g.argv[2]); |
| 119 | printf("project-code: %s\n", db_get("project-code", "<none>")); |
| 120 | printf("project-name: %s\n", db_get("project-name", "<unnamed>")); |
| 121 | printf("server-code: %s\n", db_get("server-code", "<none>")); |
| 122 | return; |
| 123 | } |
| 124 | db_must_be_within_tree(); |
| 125 | if( g.argc==2 ){ |
| 126 | int vid; |
| 127 | /* 012345678901234 */ |
| 128 | db_record_repository_filename(0); |
| 129 | printf("repository: %s\n", db_lget("repository", "")); |
| 130 | printf("local-root: %s\n", g.zLocalRoot); |
| 131 | printf("project-code: %s\n", db_get("project-code", "")); |
| 132 | printf("server-code: %s\n", db_get("server-code", "")); |
| 133 | vid = db_lget_int("checkout", 0); |
| 134 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -114,20 +114,21 @@ | |
| 114 | } |
| 115 | if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){ |
| 116 | db_open_config(0); |
| 117 | db_record_repository_filename(g.argv[2]); |
| 118 | db_open_repository(g.argv[2]); |
| 119 | printf("project-name: %s\n", db_get("project-name", "<unnamed>")); |
| 120 | printf("project-code: %s\n", db_get("project-code", "<none>")); |
| 121 | printf("server-code: %s\n", db_get("server-code", "<none>")); |
| 122 | return; |
| 123 | } |
| 124 | db_must_be_within_tree(); |
| 125 | if( g.argc==2 ){ |
| 126 | int vid; |
| 127 | /* 012345678901234 */ |
| 128 | db_record_repository_filename(0); |
| 129 | printf("project-name: %s\n", db_get("project-name", "<unnamed>")); |
| 130 | printf("repository: %s\n", db_lget("repository", "")); |
| 131 | printf("local-root: %s\n", g.zLocalRoot); |
| 132 | printf("project-code: %s\n", db_get("project-code", "")); |
| 133 | printf("server-code: %s\n", db_get("server-code", "")); |
| 134 | vid = db_lget_int("checkout", 0); |
| 135 |