Fossil SCM
Minor formatting changes in the UV sync logic. No logical changes to code.
Commit
ac15e6d14a34b0ae67fee0a8ba6715564d639e1e43a048568356355694177662
Parent
7f4393dab497e12…
1 file changed
+2
-2
+2
-2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1266,11 +1266,11 @@ | ||
| 1266 | 1266 | ** Accept an unversioned file from the client. |
| 1267 | 1267 | */ |
| 1268 | 1268 | if( blob_eq(&xfer.aToken[0], "uvfile") ){ |
| 1269 | 1269 | xfer_accept_unversioned_file(&xfer, g.perm.WrUnver); |
| 1270 | 1270 | if( blob_size(&xfer.err) ){ |
| 1271 | - cgi_reset_content(); | |
| 1271 | + cgi_reset_content(); | |
| 1272 | 1272 | @ error %T(blob_str(&xfer.err)) |
| 1273 | 1273 | nErr++; |
| 1274 | 1274 | break; |
| 1275 | 1275 | } |
| 1276 | 1276 | }else |
| @@ -2080,11 +2080,11 @@ | ||
| 2080 | 2080 | nArtifactRcvd++; |
| 2081 | 2081 | }else |
| 2082 | 2082 | |
| 2083 | 2083 | /* uvfile NAME MTIME HASH SIZE FLAGS \n CONTENT |
| 2084 | 2084 | ** |
| 2085 | - ** Accept an unversioned file from the client. | |
| 2085 | + ** Accept an unversioned file from the server. | |
| 2086 | 2086 | */ |
| 2087 | 2087 | if( blob_eq(&xfer.aToken[0], "uvfile") ){ |
| 2088 | 2088 | xfer_accept_unversioned_file(&xfer, 1); |
| 2089 | 2089 | nArtifactRcvd++; |
| 2090 | 2090 | nUvFileRcvd++; |
| 2091 | 2091 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1266,11 +1266,11 @@ | |
| 1266 | ** Accept an unversioned file from the client. |
| 1267 | */ |
| 1268 | if( blob_eq(&xfer.aToken[0], "uvfile") ){ |
| 1269 | xfer_accept_unversioned_file(&xfer, g.perm.WrUnver); |
| 1270 | if( blob_size(&xfer.err) ){ |
| 1271 | cgi_reset_content(); |
| 1272 | @ error %T(blob_str(&xfer.err)) |
| 1273 | nErr++; |
| 1274 | break; |
| 1275 | } |
| 1276 | }else |
| @@ -2080,11 +2080,11 @@ | |
| 2080 | nArtifactRcvd++; |
| 2081 | }else |
| 2082 | |
| 2083 | /* uvfile NAME MTIME HASH SIZE FLAGS \n CONTENT |
| 2084 | ** |
| 2085 | ** Accept an unversioned file from the client. |
| 2086 | */ |
| 2087 | if( blob_eq(&xfer.aToken[0], "uvfile") ){ |
| 2088 | xfer_accept_unversioned_file(&xfer, 1); |
| 2089 | nArtifactRcvd++; |
| 2090 | nUvFileRcvd++; |
| 2091 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1266,11 +1266,11 @@ | |
| 1266 | ** Accept an unversioned file from the client. |
| 1267 | */ |
| 1268 | if( blob_eq(&xfer.aToken[0], "uvfile") ){ |
| 1269 | xfer_accept_unversioned_file(&xfer, g.perm.WrUnver); |
| 1270 | if( blob_size(&xfer.err) ){ |
| 1271 | cgi_reset_content(); |
| 1272 | @ error %T(blob_str(&xfer.err)) |
| 1273 | nErr++; |
| 1274 | break; |
| 1275 | } |
| 1276 | }else |
| @@ -2080,11 +2080,11 @@ | |
| 2080 | nArtifactRcvd++; |
| 2081 | }else |
| 2082 | |
| 2083 | /* uvfile NAME MTIME HASH SIZE FLAGS \n CONTENT |
| 2084 | ** |
| 2085 | ** Accept an unversioned file from the server. |
| 2086 | */ |
| 2087 | if( blob_eq(&xfer.aToken[0], "uvfile") ){ |
| 2088 | xfer_accept_unversioned_file(&xfer, 1); |
| 2089 | nArtifactRcvd++; |
| 2090 | nUvFileRcvd++; |
| 2091 |