Fossil SCM

Fix a copy of minor display problems out the output of "fossil push".

drh 2011-04-19 20:30 trunk
Commit 085b6a1bbba91bbdd07c030935191d95a06fe10b
--- src/http_transport.c
+++ src/http_transport.c
@@ -432,10 +432,11 @@
432432
transport.pBuf = pNew;
433433
}
434434
if( N>0 ){
435435
i = transport_fetch(&transport.pBuf[transport.nUsed], N);
436436
if( i>0 ){
437
+ transport.nRcvd += i;
437438
transport.nUsed += i;
438439
}
439440
}
440441
}
441442
442443
--- src/http_transport.c
+++ src/http_transport.c
@@ -432,10 +432,11 @@
432 transport.pBuf = pNew;
433 }
434 if( N>0 ){
435 i = transport_fetch(&transport.pBuf[transport.nUsed], N);
436 if( i>0 ){
 
437 transport.nUsed += i;
438 }
439 }
440 }
441
442
--- src/http_transport.c
+++ src/http_transport.c
@@ -432,10 +432,11 @@
432 transport.pBuf = pNew;
433 }
434 if( N>0 ){
435 i = transport_fetch(&transport.pBuf[transport.nUsed], N);
436 if( i>0 ){
437 transport.nRcvd += i;
438 transport.nUsed += i;
439 }
440 }
441 }
442
443
+1
--- src/xfer.c
+++ src/xfer.c
@@ -1441,10 +1441,11 @@
14411441
fossil_warning("*** time skew *** server is slow by %s",
14421442
db_timespan_name(-rDiff));
14431443
g.clockSkewSeen = 1;
14441444
}
14451445
}
1446
+ nCardRcvd++;
14461447
continue;
14471448
}
14481449
xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
14491450
nCardRcvd++;
14501451
if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
14511452
--- src/xfer.c
+++ src/xfer.c
@@ -1441,10 +1441,11 @@
1441 fossil_warning("*** time skew *** server is slow by %s",
1442 db_timespan_name(-rDiff));
1443 g.clockSkewSeen = 1;
1444 }
1445 }
 
1446 continue;
1447 }
1448 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
1449 nCardRcvd++;
1450 if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
1451
--- src/xfer.c
+++ src/xfer.c
@@ -1441,10 +1441,11 @@
1441 fossil_warning("*** time skew *** server is slow by %s",
1442 db_timespan_name(-rDiff));
1443 g.clockSkewSeen = 1;
1444 }
1445 }
1446 nCardRcvd++;
1447 continue;
1448 }
1449 xfer.nToken = blob_tokenize(&xfer.line, xfer.aToken, count(xfer.aToken));
1450 nCardRcvd++;
1451 if( !g.cgiOutput && !g.fQuiet && recv.nUsed>0 ){
1452

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button