Fossil

Check-in [085b6a1bbb]
Login

Check-in [085b6a1bbb]

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

Overview
Comment:Fix a copy of minor display problems out the output of "fossil push".
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 085b6a1bbba91bbdd07c030935191d95a06fe10b
User & Date: drh 2011-04-19 20:30:31.128
References
2011-04-21
15:12 Closed ticket [b587c4fac3]: 'fossil ui' does not login as admin in the release 20110413 plus 2 other changes ... (artifact: 4fcef66fbb user: viriketo)
Context
2011-04-22
13:49
Fix the is_a_leaf() function so that it correctly identifies nodes as leaves if they have no non-merge children in the same branch. ... (check-in: 0a89d03cf6 user: drh tags: trunk)
2011-04-19
20:30
Fix a copy of minor display problems out the output of "fossil push". ... (check-in: 085b6a1bbb user: drh tags: trunk)
2011-04-18
23:46
Enhance the merge-conflict notation to show both the two recent versions and also the common ancestor version. ... (check-in: 792a3bc94a user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/http_transport.c.
430
431
432
433
434
435
436

437
438
439
440
441
442
443
    transport.nAlloc = transport.nUsed + N;
    pNew = fossil_realloc(transport.pBuf, transport.nAlloc);
    transport.pBuf = pNew;
  }
  if( N>0 ){
    i = transport_fetch(&transport.pBuf[transport.nUsed], N);
    if( i>0 ){

      transport.nUsed += i;
    }
  }
}

/*
** Fetch a single line of input where a line is all text up to the next







>







430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
    transport.nAlloc = transport.nUsed + N;
    pNew = fossil_realloc(transport.pBuf, transport.nAlloc);
    transport.pBuf = pNew;
  }
  if( N>0 ){
    i = transport_fetch(&transport.pBuf[transport.nUsed], N);
    if( i>0 ){
      transport.nRcvd += i;
      transport.nUsed += i;
    }
  }
}

/*
** Fetch a single line of input where a line is all text up to the next
Changes to src/xfer.c.
1439
1440
1441
1442
1443
1444
1445

1446
1447
1448
1449
1450
1451
1452
             g.clockSkewSeen = 1;
          }else if( rDiff*24.0*3600.0 < -(blob_size(&recv)/5000.0 + 20.0) ){
             fossil_warning("*** time skew *** server is slow by %s",
                            db_timespan_name(-rDiff));
             g.clockSkewSeen = 1;
          }
        }

        continue;
      }
      xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
      nCardRcvd++;
      if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
        pctDone = (recv.iCursor*100)/recv.nUsed;
        if( pctDone!=lastPctDone ){







>







1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
             g.clockSkewSeen = 1;
          }else if( rDiff*24.0*3600.0 < -(blob_size(&recv)/5000.0 + 20.0) ){
             fossil_warning("*** time skew *** server is slow by %s",
                            db_timespan_name(-rDiff));
             g.clockSkewSeen = 1;
          }
        }
        nCardRcvd++;
        continue;
      }
      xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
      nCardRcvd++;
      if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
        pctDone = (recv.iCursor*100)/recv.nUsed;
        if( pctDone!=lastPctDone ){