Fossil SCM
Use C-card in stead of T-card to put comment on timeline for "merge --integrate" Control artifact
Commit
12c30d33d477c81248285f45797fcf1a21313147
Parent
2979c0827104e62…
1 file changed
+5
-4
+5
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1706,10 +1706,13 @@ | ||
| 1706 | 1706 | if( nvid==0 ){ |
| 1707 | 1707 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 1708 | 1708 | } |
| 1709 | 1709 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1710 | 1710 | manifest_crosslink(nvid, &manifest); |
| 1711 | + assert( blob_is_reset(&manifest) ); | |
| 1712 | + content_deltify(vid, nvid, 0); | |
| 1713 | + zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); | |
| 1711 | 1714 | |
| 1712 | 1715 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1713 | 1716 | " WHERE id=-4"); |
| 1714 | 1717 | while( db_step(&q)==SQLITE_ROW ){ |
| 1715 | 1718 | const char *zIntegrateUuid = db_column_text(&q, 0); |
| @@ -1726,12 +1729,13 @@ | ||
| 1726 | 1729 | char *zDate; |
| 1727 | 1730 | int nrid; |
| 1728 | 1731 | |
| 1729 | 1732 | blob_zero(&ctrl); |
| 1730 | 1733 | zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); |
| 1734 | + blob_appendf(&ctrl, "C Merge\\s--integrate\\sinto\\s[%S]\n", zUuid); | |
| 1731 | 1735 | blob_appendf(&ctrl, "D %s\n", zDate); |
| 1732 | - blob_appendf(&ctrl, "T +closed %s by\\smerge\\s--integrate\n", zIntegrateUuid); | |
| 1736 | + blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid); | |
| 1733 | 1737 | blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); |
| 1734 | 1738 | md5sum_blob(&ctrl, &cksum); |
| 1735 | 1739 | blob_appendf(&ctrl, "Z %b\n", &cksum); |
| 1736 | 1740 | nrid = content_put(&ctrl); |
| 1737 | 1741 | manifest_crosslink(nrid, &ctrl); |
| @@ -1740,13 +1744,10 @@ | ||
| 1740 | 1744 | fossil_print("Closed: %s\n", zIntegrateUuid); |
| 1741 | 1745 | } |
| 1742 | 1746 | } |
| 1743 | 1747 | db_finalize(&q); |
| 1744 | 1748 | |
| 1745 | - assert( blob_is_reset(&manifest) ); | |
| 1746 | - content_deltify(vid, nvid, 0); | |
| 1747 | - zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); | |
| 1748 | 1749 | fossil_print("New_Version: %s\n", zUuid); |
| 1749 | 1750 | if( outputManifest ){ |
| 1750 | 1751 | zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 1751 | 1752 | blob_zero(&muuid); |
| 1752 | 1753 | blob_appendf(&muuid, "%s\n", zUuid); |
| 1753 | 1754 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1706,10 +1706,13 @@ | |
| 1706 | if( nvid==0 ){ |
| 1707 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 1708 | } |
| 1709 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1710 | manifest_crosslink(nvid, &manifest); |
| 1711 | |
| 1712 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1713 | " WHERE id=-4"); |
| 1714 | while( db_step(&q)==SQLITE_ROW ){ |
| 1715 | const char *zIntegrateUuid = db_column_text(&q, 0); |
| @@ -1726,12 +1729,13 @@ | |
| 1726 | char *zDate; |
| 1727 | int nrid; |
| 1728 | |
| 1729 | blob_zero(&ctrl); |
| 1730 | zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); |
| 1731 | blob_appendf(&ctrl, "D %s\n", zDate); |
| 1732 | blob_appendf(&ctrl, "T +closed %s by\\smerge\\s--integrate\n", zIntegrateUuid); |
| 1733 | blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); |
| 1734 | md5sum_blob(&ctrl, &cksum); |
| 1735 | blob_appendf(&ctrl, "Z %b\n", &cksum); |
| 1736 | nrid = content_put(&ctrl); |
| 1737 | manifest_crosslink(nrid, &ctrl); |
| @@ -1740,13 +1744,10 @@ | |
| 1740 | fossil_print("Closed: %s\n", zIntegrateUuid); |
| 1741 | } |
| 1742 | } |
| 1743 | db_finalize(&q); |
| 1744 | |
| 1745 | assert( blob_is_reset(&manifest) ); |
| 1746 | content_deltify(vid, nvid, 0); |
| 1747 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 1748 | fossil_print("New_Version: %s\n", zUuid); |
| 1749 | if( outputManifest ){ |
| 1750 | zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 1751 | blob_zero(&muuid); |
| 1752 | blob_appendf(&muuid, "%s\n", zUuid); |
| 1753 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1706,10 +1706,13 @@ | |
| 1706 | if( nvid==0 ){ |
| 1707 | fossil_panic("trouble committing manifest: %s", g.zErrMsg); |
| 1708 | } |
| 1709 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nvid); |
| 1710 | manifest_crosslink(nvid, &manifest); |
| 1711 | assert( blob_is_reset(&manifest) ); |
| 1712 | content_deltify(vid, nvid, 0); |
| 1713 | zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
| 1714 | |
| 1715 | db_prepare(&q, "SELECT uuid,merge FROM vmerge JOIN blob ON merge=rid" |
| 1716 | " WHERE id=-4"); |
| 1717 | while( db_step(&q)==SQLITE_ROW ){ |
| 1718 | const char *zIntegrateUuid = db_column_text(&q, 0); |
| @@ -1726,12 +1729,13 @@ | |
| 1729 | char *zDate; |
| 1730 | int nrid; |
| 1731 | |
| 1732 | blob_zero(&ctrl); |
| 1733 | zDate = date_in_standard_format(sCiInfo.zDateOvrd ? sCiInfo.zDateOvrd : "now"); |
| 1734 | blob_appendf(&ctrl, "C Merge\\s--integrate\\sinto\\s[%S]\n", zUuid); |
| 1735 | blob_appendf(&ctrl, "D %s\n", zDate); |
| 1736 | blob_appendf(&ctrl, "T +closed %s\n", zIntegrateUuid); |
| 1737 | blob_appendf(&ctrl, "U %F\n", sCiInfo.zUserOvrd ? sCiInfo.zUserOvrd : g.zLogin); |
| 1738 | md5sum_blob(&ctrl, &cksum); |
| 1739 | blob_appendf(&ctrl, "Z %b\n", &cksum); |
| 1740 | nrid = content_put(&ctrl); |
| 1741 | manifest_crosslink(nrid, &ctrl); |
| @@ -1740,13 +1744,10 @@ | |
| 1744 | fossil_print("Closed: %s\n", zIntegrateUuid); |
| 1745 | } |
| 1746 | } |
| 1747 | db_finalize(&q); |
| 1748 | |
| 1749 | fossil_print("New_Version: %s\n", zUuid); |
| 1750 | if( outputManifest ){ |
| 1751 | zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 1752 | blob_zero(&muuid); |
| 1753 | blob_appendf(&muuid, "%s\n", zUuid); |
| 1754 |