Fossil SCM
Remove the "Dangling" column from the sync status display.
Commit
64c58fd64f5efa972b445e46ebe604543d368518
Parent
ba8af8731f5f249…
1 file changed
+8
-14
+8
-14
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -779,12 +779,12 @@ | ||
| 779 | 779 | } |
| 780 | 780 | |
| 781 | 781 | /* |
| 782 | 782 | ** Format strings for progress reporting. |
| 783 | 783 | */ |
| 784 | -static const char zLabel[] = "%-10s %10s %10s %10s %10s %10s\n"; | |
| 785 | -static const char zValue[] = "\r%-10s %10d %10d %10d %10d %10d\n"; | |
| 784 | +static const char zLabelFormat[] = "%-10s %10s %10s %10s %10s\n"; | |
| 785 | +static const char zValueFormat[] = "\r%-10s %10d %10d %10d %10d\n"; | |
| 786 | 786 | |
| 787 | 787 | |
| 788 | 788 | /* |
| 789 | 789 | ** Sync to the host identified in g.urlName and g.urlPath. This |
| 790 | 790 | ** routine is called by the client. |
| @@ -840,11 +840,11 @@ | ||
| 840 | 840 | } |
| 841 | 841 | if( pushFlag ){ |
| 842 | 842 | blob_appendf(&send, "push %s %s\n", zSCode, zPCode); |
| 843 | 843 | nCard++; |
| 844 | 844 | } |
| 845 | - printf(zLabel, "", "Bytes", "Cards", "Artifacts", "Deltas", "Dangling"); | |
| 845 | + printf(zLabelFormat, "", "Bytes", "Cards", "Artifacts", "Deltas"); | |
| 846 | 846 | |
| 847 | 847 | while( go ){ |
| 848 | 848 | int newPhantom = 0; |
| 849 | 849 | |
| 850 | 850 | /* Send make the most recently received cookie. Let the server |
| @@ -866,13 +866,13 @@ | ||
| 866 | 866 | nCard += send_unclustered(&xfer); |
| 867 | 867 | } |
| 868 | 868 | |
| 869 | 869 | /* Exchange messages with the server */ |
| 870 | 870 | nFileSend = xfer.nFileSent + xfer.nDeltaSent; |
| 871 | - printf(zValue, "Send:", | |
| 871 | + printf(zValueFormat, "Send:", | |
| 872 | 872 | blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent, |
| 873 | - xfer.nFileSent, xfer.nDeltaSent, 0); | |
| 873 | + xfer.nFileSent, xfer.nDeltaSent); | |
| 874 | 874 | #if 0 |
| 875 | 875 | printf("Sent: %10d bytes, %5d cards, %5d files (%d+%d)\n", |
| 876 | 876 | blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent, |
| 877 | 877 | nFileSend, xfer.nFileSent, xfer.nDeltaSent); |
| 878 | 878 | #endif |
| @@ -1027,19 +1027,13 @@ | ||
| 1027 | 1027 | fossil_fatal("%b", &xfer.err); |
| 1028 | 1028 | } |
| 1029 | 1029 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 1030 | 1030 | blob_reset(&xfer.line); |
| 1031 | 1031 | } |
| 1032 | - printf(zValue, "Received:", | |
| 1033 | - blob_size(&recv), nCard, | |
| 1034 | - xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); | |
| 1035 | -#if 0 | |
| 1036 | - printf("\rReceived: %10d bytes, %5d cards, %5d files (%d+%d+%d)\n", | |
| 1037 | - blob_size(&recv), nCard, | |
| 1038 | - xfer.nFileRcvd + xfer.nDeltaRcvd + xfer.nDanglingFile, | |
| 1039 | - xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); | |
| 1040 | -#endif | |
| 1032 | + printf(zValueFormat, "Received:", | |
| 1033 | + blob_size(&recv), nCard, | |
| 1034 | + xfer.nFileRcvd, xfer.nDeltaRcvd + xfer.nDanglingFile); | |
| 1041 | 1035 | blob_reset(&recv); |
| 1042 | 1036 | nCycle++; |
| 1043 | 1037 | go = 0; |
| 1044 | 1038 | |
| 1045 | 1039 | /* If we received one or more files on the previous exchange but |
| 1046 | 1040 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -779,12 +779,12 @@ | |
| 779 | } |
| 780 | |
| 781 | /* |
| 782 | ** Format strings for progress reporting. |
| 783 | */ |
| 784 | static const char zLabel[] = "%-10s %10s %10s %10s %10s %10s\n"; |
| 785 | static const char zValue[] = "\r%-10s %10d %10d %10d %10d %10d\n"; |
| 786 | |
| 787 | |
| 788 | /* |
| 789 | ** Sync to the host identified in g.urlName and g.urlPath. This |
| 790 | ** routine is called by the client. |
| @@ -840,11 +840,11 @@ | |
| 840 | } |
| 841 | if( pushFlag ){ |
| 842 | blob_appendf(&send, "push %s %s\n", zSCode, zPCode); |
| 843 | nCard++; |
| 844 | } |
| 845 | printf(zLabel, "", "Bytes", "Cards", "Artifacts", "Deltas", "Dangling"); |
| 846 | |
| 847 | while( go ){ |
| 848 | int newPhantom = 0; |
| 849 | |
| 850 | /* Send make the most recently received cookie. Let the server |
| @@ -866,13 +866,13 @@ | |
| 866 | nCard += send_unclustered(&xfer); |
| 867 | } |
| 868 | |
| 869 | /* Exchange messages with the server */ |
| 870 | nFileSend = xfer.nFileSent + xfer.nDeltaSent; |
| 871 | printf(zValue, "Send:", |
| 872 | blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent, |
| 873 | xfer.nFileSent, xfer.nDeltaSent, 0); |
| 874 | #if 0 |
| 875 | printf("Sent: %10d bytes, %5d cards, %5d files (%d+%d)\n", |
| 876 | blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent, |
| 877 | nFileSend, xfer.nFileSent, xfer.nDeltaSent); |
| 878 | #endif |
| @@ -1027,19 +1027,13 @@ | |
| 1027 | fossil_fatal("%b", &xfer.err); |
| 1028 | } |
| 1029 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 1030 | blob_reset(&xfer.line); |
| 1031 | } |
| 1032 | printf(zValue, "Received:", |
| 1033 | blob_size(&recv), nCard, |
| 1034 | xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); |
| 1035 | #if 0 |
| 1036 | printf("\rReceived: %10d bytes, %5d cards, %5d files (%d+%d+%d)\n", |
| 1037 | blob_size(&recv), nCard, |
| 1038 | xfer.nFileRcvd + xfer.nDeltaRcvd + xfer.nDanglingFile, |
| 1039 | xfer.nFileRcvd, xfer.nDeltaRcvd, xfer.nDanglingFile); |
| 1040 | #endif |
| 1041 | blob_reset(&recv); |
| 1042 | nCycle++; |
| 1043 | go = 0; |
| 1044 | |
| 1045 | /* If we received one or more files on the previous exchange but |
| 1046 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -779,12 +779,12 @@ | |
| 779 | } |
| 780 | |
| 781 | /* |
| 782 | ** Format strings for progress reporting. |
| 783 | */ |
| 784 | static const char zLabelFormat[] = "%-10s %10s %10s %10s %10s\n"; |
| 785 | static const char zValueFormat[] = "\r%-10s %10d %10d %10d %10d\n"; |
| 786 | |
| 787 | |
| 788 | /* |
| 789 | ** Sync to the host identified in g.urlName and g.urlPath. This |
| 790 | ** routine is called by the client. |
| @@ -840,11 +840,11 @@ | |
| 840 | } |
| 841 | if( pushFlag ){ |
| 842 | blob_appendf(&send, "push %s %s\n", zSCode, zPCode); |
| 843 | nCard++; |
| 844 | } |
| 845 | printf(zLabelFormat, "", "Bytes", "Cards", "Artifacts", "Deltas"); |
| 846 | |
| 847 | while( go ){ |
| 848 | int newPhantom = 0; |
| 849 | |
| 850 | /* Send make the most recently received cookie. Let the server |
| @@ -866,13 +866,13 @@ | |
| 866 | nCard += send_unclustered(&xfer); |
| 867 | } |
| 868 | |
| 869 | /* Exchange messages with the server */ |
| 870 | nFileSend = xfer.nFileSent + xfer.nDeltaSent; |
| 871 | printf(zValueFormat, "Send:", |
| 872 | blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent, |
| 873 | xfer.nFileSent, xfer.nDeltaSent); |
| 874 | #if 0 |
| 875 | printf("Sent: %10d bytes, %5d cards, %5d files (%d+%d)\n", |
| 876 | blob_size(&send), nCard+xfer.nGimmeSent+xfer.nIGotSent, |
| 877 | nFileSend, xfer.nFileSent, xfer.nDeltaSent); |
| 878 | #endif |
| @@ -1027,19 +1027,13 @@ | |
| 1027 | fossil_fatal("%b", &xfer.err); |
| 1028 | } |
| 1029 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 1030 | blob_reset(&xfer.line); |
| 1031 | } |
| 1032 | printf(zValueFormat, "Received:", |
| 1033 | blob_size(&recv), nCard, |
| 1034 | xfer.nFileRcvd, xfer.nDeltaRcvd + xfer.nDanglingFile); |
| 1035 | blob_reset(&recv); |
| 1036 | nCycle++; |
| 1037 | go = 0; |
| 1038 | |
| 1039 | /* If we received one or more files on the previous exchange but |
| 1040 |