Check-in [7646ee13e3]
Not logged in

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

Overview
Comment:Fix an issue with "clone" on the client side: the client was requesting multiple copies of artifacts for which it held a delta with a phantom source.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7646ee13e34f6aad3dec3787968b1c29d87ea6e5
User & Date: drh 2009-08-12 14:27:24.000
Context
2009-08-12
14:41
Keep track of total network traffic for a sync and report the totals at the end of the sync. check-in: 79be9028eb user: drh tags: trunk
14:27
Fix an issue with "clone" on the client side: the client was requesting multiple copies of artifacts for which it held a delta with a phantom source. check-in: 7646ee13e3 user: drh tags: trunk
2009-08-11
15:14
Change the date markers in file info pages to use the same CSS tags as the timeline. check-in: 53f04b180c user: drh tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/xfer.c.
123
124
125
126
127
128
129
130
131
132
133

134
135
136
137
138
139
140
    /* Ignore files that have been shunned */
    return;
  }
  if( pXfer->nToken==4 ){
    Blob src;
    srcid = rid_from_uuid(&pXfer->aToken[2], 1);
    if( content_get(srcid, &src)==0 ){
      content_put(&content, blob_str(&pXfer->aToken[1]), srcid);
      blob_appendf(pXfer->pOut, "gimme %b\n", &pXfer->aToken[2]);
      pXfer->nGimmeSent++;
      pXfer->nDanglingFile++;

      return;
    }
    pXfer->nDeltaRcvd++;
    blob_delta_apply(&src, &content, &content);
    blob_reset(&src);
  }else{
    pXfer->nFileRcvd++;







|
<
<

>







123
124
125
126
127
128
129
130


131
132
133
134
135
136
137
138
139
    /* Ignore files that have been shunned */
    return;
  }
  if( pXfer->nToken==4 ){
    Blob src;
    srcid = rid_from_uuid(&pXfer->aToken[2], 1);
    if( content_get(srcid, &src)==0 ){
      rid = content_put(&content, blob_str(&pXfer->aToken[1]), srcid);


      pXfer->nDanglingFile++;
      db_multi_exec("DELETE FROM phantom WHERE rid=%d", rid);
      return;
    }
    pXfer->nDeltaRcvd++;
    blob_delta_apply(&src, &content, &content);
    blob_reset(&src);
  }else{
    pXfer->nFileRcvd++;