Fossil SCM
Don't worry about forks during cloning.
Commit
a36ec9f9d911a8c18bf55c001b4183ef3cb9b356
Parent
9d45319345b5fa7…
1 file changed
+3
-2
+3
-2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -236,10 +236,11 @@ | ||
| 236 | 236 | ** Any artifact successfully received by this routine is considered to |
| 237 | 237 | ** be public and is therefore removed from the "private" table. |
| 238 | 238 | */ |
| 239 | 239 | static void xfer_accept_compressed_file( |
| 240 | 240 | Xfer *pXfer, |
| 241 | + int cloneFlag, | |
| 241 | 242 | char **pzUuidList, |
| 242 | 243 | int *pnUuidList |
| 243 | 244 | ){ |
| 244 | 245 | int szC; /* CSIZE */ |
| 245 | 246 | int szU; /* USIZE */ |
| @@ -1026,11 +1027,11 @@ | ||
| 1026 | 1027 | cgi_reset_content(); |
| 1027 | 1028 | @ error not\sauthorized\sto\swrite |
| 1028 | 1029 | nErr++; |
| 1029 | 1030 | break; |
| 1030 | 1031 | } |
| 1031 | - xfer_accept_compressed_file(&xfer, pzUuidList, pnUuidList); | |
| 1032 | + xfer_accept_compressed_file(&xfer, 0, pzUuidList, pnUuidList); | |
| 1032 | 1033 | if( xfer.fHasFork ){ |
| 1033 | 1034 | fForkSeen = 1; |
| 1034 | 1035 | } |
| 1035 | 1036 | if( blob_size(&xfer.err) ){ |
| 1036 | 1037 | cgi_reset_content(); |
| @@ -1699,11 +1700,11 @@ | ||
| 1699 | 1700 | ** cfile UUID DELTASRC USIZE CSIZE \n CONTENT |
| 1700 | 1701 | ** |
| 1701 | 1702 | ** Receive a compressed file transmitted from the server. |
| 1702 | 1703 | */ |
| 1703 | 1704 | if( blob_eq(&xfer.aToken[0],"cfile") ){ |
| 1704 | - xfer_accept_compressed_file(&xfer, 0, 0); | |
| 1705 | + xfer_accept_compressed_file(&xfer, (syncFlags & SYNC_CLONE)!=0, 0, 0); | |
| 1705 | 1706 | if( (syncFlags & SYNC_PULL) && xfer.fHasFork ){ |
| 1706 | 1707 | fForkSeen = 1; |
| 1707 | 1708 | } |
| 1708 | 1709 | nArtifactRcvd++; |
| 1709 | 1710 | }else |
| 1710 | 1711 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -236,10 +236,11 @@ | |
| 236 | ** Any artifact successfully received by this routine is considered to |
| 237 | ** be public and is therefore removed from the "private" table. |
| 238 | */ |
| 239 | static void xfer_accept_compressed_file( |
| 240 | Xfer *pXfer, |
| 241 | char **pzUuidList, |
| 242 | int *pnUuidList |
| 243 | ){ |
| 244 | int szC; /* CSIZE */ |
| 245 | int szU; /* USIZE */ |
| @@ -1026,11 +1027,11 @@ | |
| 1026 | cgi_reset_content(); |
| 1027 | @ error not\sauthorized\sto\swrite |
| 1028 | nErr++; |
| 1029 | break; |
| 1030 | } |
| 1031 | xfer_accept_compressed_file(&xfer, pzUuidList, pnUuidList); |
| 1032 | if( xfer.fHasFork ){ |
| 1033 | fForkSeen = 1; |
| 1034 | } |
| 1035 | if( blob_size(&xfer.err) ){ |
| 1036 | cgi_reset_content(); |
| @@ -1699,11 +1700,11 @@ | |
| 1699 | ** cfile UUID DELTASRC USIZE CSIZE \n CONTENT |
| 1700 | ** |
| 1701 | ** Receive a compressed file transmitted from the server. |
| 1702 | */ |
| 1703 | if( blob_eq(&xfer.aToken[0],"cfile") ){ |
| 1704 | xfer_accept_compressed_file(&xfer, 0, 0); |
| 1705 | if( (syncFlags & SYNC_PULL) && xfer.fHasFork ){ |
| 1706 | fForkSeen = 1; |
| 1707 | } |
| 1708 | nArtifactRcvd++; |
| 1709 | }else |
| 1710 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -236,10 +236,11 @@ | |
| 236 | ** Any artifact successfully received by this routine is considered to |
| 237 | ** be public and is therefore removed from the "private" table. |
| 238 | */ |
| 239 | static void xfer_accept_compressed_file( |
| 240 | Xfer *pXfer, |
| 241 | int cloneFlag, |
| 242 | char **pzUuidList, |
| 243 | int *pnUuidList |
| 244 | ){ |
| 245 | int szC; /* CSIZE */ |
| 246 | int szU; /* USIZE */ |
| @@ -1026,11 +1027,11 @@ | |
| 1027 | cgi_reset_content(); |
| 1028 | @ error not\sauthorized\sto\swrite |
| 1029 | nErr++; |
| 1030 | break; |
| 1031 | } |
| 1032 | xfer_accept_compressed_file(&xfer, 0, pzUuidList, pnUuidList); |
| 1033 | if( xfer.fHasFork ){ |
| 1034 | fForkSeen = 1; |
| 1035 | } |
| 1036 | if( blob_size(&xfer.err) ){ |
| 1037 | cgi_reset_content(); |
| @@ -1699,11 +1700,11 @@ | |
| 1700 | ** cfile UUID DELTASRC USIZE CSIZE \n CONTENT |
| 1701 | ** |
| 1702 | ** Receive a compressed file transmitted from the server. |
| 1703 | */ |
| 1704 | if( blob_eq(&xfer.aToken[0],"cfile") ){ |
| 1705 | xfer_accept_compressed_file(&xfer, (syncFlags & SYNC_CLONE)!=0, 0, 0); |
| 1706 | if( (syncFlags & SYNC_PULL) && xfer.fHasFork ){ |
| 1707 | fForkSeen = 1; |
| 1708 | } |
| 1709 | nArtifactRcvd++; |
| 1710 | }else |
| 1711 |