Check-in [bbd758ecc3]
Not logged in
Overview

SHA1 Hash:bbd758ecc30352dd3d50936c6dfda1d82a155748
Date: 2009-09-11 18:27:55
User: drh
Comment:Always print the "project-name" using the command-line "info" command. Avoid an extra "/" character when constructing files for check-in.
Timelines: ancestors | descendants | both | trunk
Other Links: files | ZIP archive | manifest

Tags And Properties
Changes
[hide diffs]

Modified src/checkin.c from [8b03f30dd7] to [80178835f0].

@@ -585,11 +585,11 @@
     "SELECT pathname, uuid, origname, blob.rid"
     "  FROM vfile JOIN blob ON vfile.mrid=blob.rid"
     " WHERE NOT deleted AND vfile.vid=%d"
     " ORDER BY 1", vid);
   blob_zero(&filename);
-  blob_appendf(&filename, "%s/", g.zLocalRoot);
+  blob_appendf(&filename, "%s", g.zLocalRoot);
   nBasename = blob_size(&filename);
   while( db_step(&q)==SQLITE_ROW ){
     const char *zName = db_column_text(&q, 0);
     const char *zUuid = db_column_text(&q, 1);
     const char *zOrig = db_column_text(&q, 2);

Modified src/info.c from [eec9dcd76a] to [bdf1a77d15].

@@ -114,20 +114,21 @@
   }
   if( g.argc==3 && (fsize = file_size(g.argv[2]))>0 && (fsize&0x1ff)==0 ){
     db_open_config(0);
     db_record_repository_filename(g.argv[2]);
     db_open_repository(g.argv[2]);
-    printf("project-code: %s\n", db_get("project-code", "<none>"));
     printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
+    printf("project-code: %s\n", db_get("project-code", "<none>"));
     printf("server-code:  %s\n", db_get("server-code", "<none>"));
     return;
   }
   db_must_be_within_tree();
   if( g.argc==2 ){
     int vid;
          /* 012345678901234 */
     db_record_repository_filename(0);
+    printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
     printf("repository:   %s\n", db_lget("repository", ""));
     printf("local-root:   %s\n", g.zLocalRoot);
     printf("project-code: %s\n", db_get("project-code", ""));
     printf("server-code:  %s\n", db_get("server-code", ""));
     vid = db_lget_int("checkout", 0);