Fossil

Check-in [6e10a4b1]
Login

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

Overview
Comment:Now don't issue warnings during cloning.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sync-forkwarn
Files: files | file ages | folders
SHA1:6e10a4b102fd151747c71b548279a600823e6553
User & Date: andybradford 2015-04-11 02:23:22
Context
2015-04-13
03:31
Bring in needed changes from related branch. check-in: ebce6863 user: andybradford tags: sync-forkwarn
2015-04-11
02:23
Now don't issue warnings during cloning. check-in: 6e10a4b1 user: andybradford tags: sync-forkwarn
01:56
Pull in latest from trunk. check-in: 4f734aa2 user: andybradford tags: sync-forkwarn
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/xfer.c.

201
202
203
204
205
206
207

208
209
210
211
212
213
214
215
...
280
281
282
283
284
285
286

287
288
289
290
291
292
293
294
  blob_reset(&hash);
  if( rid==0 ){
    blob_appendf(&pXfer->err, "%s", g.zErrMsg);
    blob_reset(&content);
  }else{
    if( !isPriv ) content_make_public(rid);
    manifest_crosslink(rid, &content, MC_NO_ERRORS);

    if( count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){
      pXfer->fHasFork = 1;
    }
  }
  assert( blob_is_reset(&content) );
  remote_has(rid);
}

................................................................................
    srcid = 0;
    pXfer->nFileRcvd++;
  }
  rid = content_put_ex(&content, blob_str(&pXfer->aToken[1]), srcid,
                       szC, isPriv);
  Th_AppendToList(pzUuidList, pnUuidList, blob_str(&pXfer->aToken[1]),
                  blob_size(&pXfer->aToken[1]));

  if( count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){
    pXfer->fHasFork = 1;
  }
  remote_has(rid);
  blob_reset(&content);
}

/*







>
|







 







>
|







201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
...
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
  blob_reset(&hash);
  if( rid==0 ){
    blob_appendf(&pXfer->err, "%s", g.zErrMsg);
    blob_reset(&content);
  }else{
    if( !isPriv ) content_make_public(rid);
    manifest_crosslink(rid, &content, MC_NO_ERRORS);
    if( cloneFlag==0 &&
        count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){
      pXfer->fHasFork = 1;
    }
  }
  assert( blob_is_reset(&content) );
  remote_has(rid);
}

................................................................................
    srcid = 0;
    pXfer->nFileRcvd++;
  }
  rid = content_put_ex(&content, blob_str(&pXfer->aToken[1]), srcid,
                       szC, isPriv);
  Th_AppendToList(pzUuidList, pnUuidList, blob_str(&pXfer->aToken[1]),
                  blob_size(&pXfer->aToken[1]));
  if( cloneFlag==0 &&
      count_nonbranch_children(primary_parent_pid_from_rid(rid))>1 ){
    pXfer->fHasFork = 1;
  }
  remote_has(rid);
  blob_reset(&content);
}

/*