Fossil SCM
Always report full UUID for checkin and branch commands since they actually alter the repository and should report a complete, unambiguous UUID.
Commit
153e17c5ebc169888e3b9a19e9f94db16f9e396b
Parent
259e3a0fd6c7ac6…
2 files changed
+1
-1
+3
-3
+1
-1
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -159,11 +159,11 @@ | ||
| 159 | 159 | fossil_fatal("%s\n", g.zErrMsg); |
| 160 | 160 | } |
| 161 | 161 | assert( blob_is_reset(&branch) ); |
| 162 | 162 | content_deltify(rootid, brid, 0); |
| 163 | 163 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid); |
| 164 | - fossil_print("New branch: %S\n", zUuid); | |
| 164 | + fossil_print("New branch: %s\n", zUuid); | |
| 165 | 165 | if( g.argc==3 ){ |
| 166 | 166 | fossil_print( |
| 167 | 167 | "\n" |
| 168 | 168 | "Note: the local check-out has not been updated to the new\n" |
| 169 | 169 | " branch. To begin working on the new branch, do this:\n" |
| 170 | 170 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -159,11 +159,11 @@ | |
| 159 | fossil_fatal("%s\n", g.zErrMsg); |
| 160 | } |
| 161 | assert( blob_is_reset(&branch) ); |
| 162 | content_deltify(rootid, brid, 0); |
| 163 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid); |
| 164 | fossil_print("New branch: %S\n", zUuid); |
| 165 | if( g.argc==3 ){ |
| 166 | fossil_print( |
| 167 | "\n" |
| 168 | "Note: the local check-out has not been updated to the new\n" |
| 169 | " branch. To begin working on the new branch, do this:\n" |
| 170 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -159,11 +159,11 @@ | |
| 159 | fossil_fatal("%s\n", g.zErrMsg); |
| 160 | } |
| 161 | assert( blob_is_reset(&branch) ); |
| 162 | content_deltify(rootid, brid, 0); |
| 163 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", brid); |
| 164 | fossil_print("New branch: %s\n", zUuid); |
| 165 | if( g.argc==3 ){ |
| 166 | fossil_print( |
| 167 | "\n" |
| 168 | "Note: the local check-out has not been updated to the new\n" |
| 169 | " branch. To begin working on the new branch, do this:\n" |
| 170 |
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1936,18 +1936,18 @@ | ||
| 1936 | 1936 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1937 | 1937 | " WHERE id=-4"); |
| 1938 | 1938 | while( db_step(&q)==SQLITE_ROW ){ |
| 1939 | 1939 | const char *zIntegrateUuid = db_column_text(&q, 0); |
| 1940 | 1940 | if( is_a_leaf(db_column_int(&q, 1)) ){ |
| 1941 | - fossil_print("Closed: %S\n", zIntegrateUuid); | |
| 1941 | + fossil_print("Closed: %s\n", zIntegrateUuid); | |
| 1942 | 1942 | }else{ |
| 1943 | - fossil_print("Not_Closed: %S (not a leaf any more)\n", zIntegrateUuid); | |
| 1943 | + fossil_print("Not_Closed: %s (not a leaf any more)\n", zIntegrateUuid); | |
| 1944 | 1944 | } |
| 1945 | 1945 | } |
| 1946 | 1946 | db_finalize(&q); |
| 1947 | 1947 | |
| 1948 | - fossil_print("New_Version: %S\n", zUuid); | |
| 1948 | + fossil_print("New_Version: %s\n", zUuid); | |
| 1949 | 1949 | if( outputManifest ){ |
| 1950 | 1950 | zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 1951 | 1951 | blob_zero(&muuid); |
| 1952 | 1952 | blob_appendf(&muuid, "%s\n", zUuid); |
| 1953 | 1953 | blob_write_to_file(&muuid, zManifestFile); |
| 1954 | 1954 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1936,18 +1936,18 @@ | |
| 1936 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1937 | " WHERE id=-4"); |
| 1938 | while( db_step(&q)==SQLITE_ROW ){ |
| 1939 | const char *zIntegrateUuid = db_column_text(&q, 0); |
| 1940 | if( is_a_leaf(db_column_int(&q, 1)) ){ |
| 1941 | fossil_print("Closed: %S\n", zIntegrateUuid); |
| 1942 | }else{ |
| 1943 | fossil_print("Not_Closed: %S (not a leaf any more)\n", zIntegrateUuid); |
| 1944 | } |
| 1945 | } |
| 1946 | db_finalize(&q); |
| 1947 | |
| 1948 | fossil_print("New_Version: %S\n", zUuid); |
| 1949 | if( outputManifest ){ |
| 1950 | zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 1951 | blob_zero(&muuid); |
| 1952 | blob_appendf(&muuid, "%s\n", zUuid); |
| 1953 | blob_write_to_file(&muuid, zManifestFile); |
| 1954 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1936,18 +1936,18 @@ | |
| 1936 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1937 | " WHERE id=-4"); |
| 1938 | while( db_step(&q)==SQLITE_ROW ){ |
| 1939 | const char *zIntegrateUuid = db_column_text(&q, 0); |
| 1940 | if( is_a_leaf(db_column_int(&q, 1)) ){ |
| 1941 | fossil_print("Closed: %s\n", zIntegrateUuid); |
| 1942 | }else{ |
| 1943 | fossil_print("Not_Closed: %s (not a leaf any more)\n", zIntegrateUuid); |
| 1944 | } |
| 1945 | } |
| 1946 | db_finalize(&q); |
| 1947 | |
| 1948 | fossil_print("New_Version: %s\n", zUuid); |
| 1949 | if( outputManifest ){ |
| 1950 | zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 1951 | blob_zero(&muuid); |
| 1952 | blob_appendf(&muuid, "%s\n", zUuid); |
| 1953 | blob_write_to_file(&muuid, zManifestFile); |
| 1954 |