Fossil

Check-in [a36ec9f9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Enable function to know if sync is clone.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | sync-forkwarn
Files: files | file ages | folders
SHA1: a36ec9f9d911a8c18bf55c001b4183ef3cb9b356
User & Date: andybradford 2015-04-11 01:54:58.213
Original Comment: Don't worry about forks during cloning.
Context
2015-04-11
01:56
Pull in latest from trunk. ... (check-in: 4f734aa2 user: andybradford tags: sync-forkwarn)
01:54
Enable function to know if sync is clone. ... (check-in: a36ec9f9 user: andybradford tags: sync-forkwarn)
2015-04-10
00:30
Add warnings to clients which receive content that creates a fork. Defer warnings as much as possible. ... (check-in: 9d453193 user: andybradford tags: sync-forkwarn)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/xfer.c.
︙︙
234
235
236
237
238
239
240

241
242
243
244
245
246
247

** be initialized to an empty string.
**
** Any artifact successfully received by this routine is considered to
** be public and is therefore removed from the "private" table.
*/
static void xfer_accept_compressed_file(
  Xfer *pXfer,

  char **pzUuidList,
  int *pnUuidList
){
  int szC;   /* CSIZE */
  int szU;   /* USIZE */
  int rid;
  int srcid = 0;








>








234
235
236
237
238
239
240
241
242
243
244
245
246
247
248

** be initialized to an empty string.
**
** Any artifact successfully received by this routine is considered to
** be public and is therefore removed from the "private" table.
*/
static void xfer_accept_compressed_file(
  Xfer *pXfer,
  int cloneFlag,
  char **pzUuidList,
  int *pnUuidList
){
  int szC;   /* CSIZE */
  int szU;   /* USIZE */
  int rid;
  int srcid = 0;
︙︙
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038

    if( blob_eq(&xfer.aToken[0], "cfile") ){
      if( !isPush ){
        cgi_reset_content();
        @ error not\sauthorized\sto\swrite
        nErr++;
        break;
      }
      xfer_accept_compressed_file(&xfer, pzUuidList, pnUuidList);
      if( xfer.fHasFork ){
        fForkSeen = 1;
      }
      if( blob_size(&xfer.err) ){
        cgi_reset_content();
        @ error %T(blob_str(&xfer.err))
        nErr++;








|








1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039

    if( blob_eq(&xfer.aToken[0], "cfile") ){
      if( !isPush ){
        cgi_reset_content();
        @ error not\sauthorized\sto\swrite
        nErr++;
        break;
      }
      xfer_accept_compressed_file(&xfer, 0, pzUuidList, pnUuidList);
      if( xfer.fHasFork ){
        fForkSeen = 1;
      }
      if( blob_size(&xfer.err) ){
        cgi_reset_content();
        @ error %T(blob_str(&xfer.err))
        nErr++;
︙︙
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711


      /*   cfile UUID USIZE CSIZE \n CONTENT
      **   cfile UUID DELTASRC USIZE CSIZE \n CONTENT
      **
      ** Receive a compressed file transmitted from the server.
      */
      if( blob_eq(&xfer.aToken[0],"cfile") ){
        xfer_accept_compressed_file(&xfer, 0, 0);
        if( (syncFlags & SYNC_PULL) && xfer.fHasFork ){
          fForkSeen = 1;
        }
        nArtifactRcvd++;
      }else

      /*   gimme UUID








|








1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712


      /*   cfile UUID USIZE CSIZE \n CONTENT
      **   cfile UUID DELTASRC USIZE CSIZE \n CONTENT
      **
      ** Receive a compressed file transmitted from the server.
      */
      if( blob_eq(&xfer.aToken[0],"cfile") ){
        xfer_accept_compressed_file(&xfer, (syncFlags & SYNC_CLONE)!=0, 0, 0);
        if( (syncFlags & SYNC_PULL) && xfer.fHasFork ){
          fForkSeen = 1;
        }
        nArtifactRcvd++;
      }else

      /*   gimme UUID
︙︙