Fossil SCM
Improve some comments. No changes to code.
Commit
5a12e8c3b68fc9073157c4c83d88f9dcde4083a8
Parent
15e669399f29eac…
1 file changed
+9
-2
+9
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1873,15 +1873,22 @@ | ||
| 1873 | 1873 | db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); |
| 1874 | 1874 | db_end_transaction(0); |
| 1875 | 1875 | db_begin_transaction(); |
| 1876 | 1876 | } |
| 1877 | 1877 | |
| 1878 | - /* Step 1: Insert records for all modified files into the blob | |
| 1878 | + /* | |
| 1879 | + ** Step 1: Compute an aggregate MD5 checksum over the disk image | |
| 1880 | + ** of every file in vid. The file names are part of the checksum. | |
| 1881 | + ** The resulting checksum is the same as is expected on the R-card | |
| 1882 | + ** of a manifest. | |
| 1883 | + */ | |
| 1884 | + if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1); | |
| 1885 | + | |
| 1886 | + /* Step 2: Insert records for all modified files into the blob | |
| 1879 | 1887 | ** table. If there were arguments passed to this command, only |
| 1880 | 1888 | ** the identified files are inserted (if they have been modified). |
| 1881 | 1889 | */ |
| 1882 | - if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1); | |
| 1883 | 1890 | db_prepare(&q, |
| 1884 | 1891 | "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile " |
| 1885 | 1892 | "WHERE chnged==1 AND NOT deleted AND is_selected(id)", |
| 1886 | 1893 | g.zLocalRoot, |
| 1887 | 1894 | glob_expr("pathname", db_get("crnl-glob","")), |
| 1888 | 1895 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1873,15 +1873,22 @@ | |
| 1873 | db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); |
| 1874 | db_end_transaction(0); |
| 1875 | db_begin_transaction(); |
| 1876 | } |
| 1877 | |
| 1878 | /* Step 1: Insert records for all modified files into the blob |
| 1879 | ** table. If there were arguments passed to this command, only |
| 1880 | ** the identified files are inserted (if they have been modified). |
| 1881 | */ |
| 1882 | if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1); |
| 1883 | db_prepare(&q, |
| 1884 | "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile " |
| 1885 | "WHERE chnged==1 AND NOT deleted AND is_selected(id)", |
| 1886 | g.zLocalRoot, |
| 1887 | glob_expr("pathname", db_get("crnl-glob","")), |
| 1888 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1873,15 +1873,22 @@ | |
| 1873 | db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment); |
| 1874 | db_end_transaction(0); |
| 1875 | db_begin_transaction(); |
| 1876 | } |
| 1877 | |
| 1878 | /* |
| 1879 | ** Step 1: Compute an aggregate MD5 checksum over the disk image |
| 1880 | ** of every file in vid. The file names are part of the checksum. |
| 1881 | ** The resulting checksum is the same as is expected on the R-card |
| 1882 | ** of a manifest. |
| 1883 | */ |
| 1884 | if( useCksum ) vfile_aggregate_checksum_disk(vid, &cksum1); |
| 1885 | |
| 1886 | /* Step 2: Insert records for all modified files into the blob |
| 1887 | ** table. If there were arguments passed to this command, only |
| 1888 | ** the identified files are inserted (if they have been modified). |
| 1889 | */ |
| 1890 | db_prepare(&q, |
| 1891 | "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile " |
| 1892 | "WHERE chnged==1 AND NOT deleted AND is_selected(id)", |
| 1893 | g.zLocalRoot, |
| 1894 | glob_expr("pathname", db_get("crnl-glob","")), |
| 1895 |