Fossil SCM
Avoid intermingling error message with status output during a sync. Error messages should appear on a line by themselves.
Commit
2981ac51ffba45fb45794f76286976de78a09f1e
Parent
5dfbf7e5b65be7a…
1 file changed
+9
-5
+9
-5
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1708,12 +1708,14 @@ | ||
| 1708 | 1708 | defossilize(zMsg); |
| 1709 | 1709 | if( (syncFlags & SYNC_PUSH) && zMsg && strglob("pull only *", zMsg) ){ |
| 1710 | 1710 | syncFlags &= ~SYNC_PUSH; |
| 1711 | 1711 | zMsg = 0; |
| 1712 | 1712 | } |
| 1713 | - fossil_force_newline(); | |
| 1714 | - fossil_print("Server says: %s\n", zMsg); | |
| 1713 | + if( zMsg && zMsg[0] ){ | |
| 1714 | + fossil_force_newline(); | |
| 1715 | + fossil_print("Server says: %s\n", zMsg); | |
| 1716 | + } | |
| 1715 | 1717 | }else |
| 1716 | 1718 | |
| 1717 | 1719 | /* pragma NAME VALUE... |
| 1718 | 1720 | ** |
| 1719 | 1721 | ** The server can send pragmas to try to convey meta-information to |
| @@ -1742,13 +1744,14 @@ | ||
| 1742 | 1744 | if( nCycle<2 ){ |
| 1743 | 1745 | if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0); |
| 1744 | 1746 | go = 1; |
| 1745 | 1747 | } |
| 1746 | 1748 | }else{ |
| 1747 | - blob_appendf(&xfer.err, "\rserver says: %s", zMsg); | |
| 1749 | + blob_appendf(&xfer.err, "server says: %s\n", zMsg); | |
| 1748 | 1750 | } |
| 1749 | - fossil_warning("\rError: %s", zMsg); | |
| 1751 | + fossil_force_newline(); | |
| 1752 | + fossil_warning("Error: %s", zMsg); | |
| 1750 | 1753 | nErr++; |
| 1751 | 1754 | break; |
| 1752 | 1755 | } |
| 1753 | 1756 | }else |
| 1754 | 1757 | |
| @@ -1760,14 +1763,15 @@ | ||
| 1760 | 1763 | &recv |
| 1761 | 1764 | ); |
| 1762 | 1765 | nErr++; |
| 1763 | 1766 | break; |
| 1764 | 1767 | } |
| 1765 | - blob_appendf(&xfer.err, "unknown command: [%b]", &xfer.aToken[0]); | |
| 1768 | + blob_appendf(&xfer.err, "unknown command: [%b]\n", &xfer.aToken[0]); | |
| 1766 | 1769 | } |
| 1767 | 1770 | |
| 1768 | 1771 | if( blob_size(&xfer.err) ){ |
| 1772 | + fossil_force_newline(); | |
| 1769 | 1773 | fossil_warning("%b", &xfer.err); |
| 1770 | 1774 | nErr++; |
| 1771 | 1775 | break; |
| 1772 | 1776 | } |
| 1773 | 1777 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 1774 | 1778 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1708,12 +1708,14 @@ | |
| 1708 | defossilize(zMsg); |
| 1709 | if( (syncFlags & SYNC_PUSH) && zMsg && strglob("pull only *", zMsg) ){ |
| 1710 | syncFlags &= ~SYNC_PUSH; |
| 1711 | zMsg = 0; |
| 1712 | } |
| 1713 | fossil_force_newline(); |
| 1714 | fossil_print("Server says: %s\n", zMsg); |
| 1715 | }else |
| 1716 | |
| 1717 | /* pragma NAME VALUE... |
| 1718 | ** |
| 1719 | ** The server can send pragmas to try to convey meta-information to |
| @@ -1742,13 +1744,14 @@ | |
| 1742 | if( nCycle<2 ){ |
| 1743 | if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0); |
| 1744 | go = 1; |
| 1745 | } |
| 1746 | }else{ |
| 1747 | blob_appendf(&xfer.err, "\rserver says: %s", zMsg); |
| 1748 | } |
| 1749 | fossil_warning("\rError: %s", zMsg); |
| 1750 | nErr++; |
| 1751 | break; |
| 1752 | } |
| 1753 | }else |
| 1754 | |
| @@ -1760,14 +1763,15 @@ | |
| 1760 | &recv |
| 1761 | ); |
| 1762 | nErr++; |
| 1763 | break; |
| 1764 | } |
| 1765 | blob_appendf(&xfer.err, "unknown command: [%b]", &xfer.aToken[0]); |
| 1766 | } |
| 1767 | |
| 1768 | if( blob_size(&xfer.err) ){ |
| 1769 | fossil_warning("%b", &xfer.err); |
| 1770 | nErr++; |
| 1771 | break; |
| 1772 | } |
| 1773 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 1774 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1708,12 +1708,14 @@ | |
| 1708 | defossilize(zMsg); |
| 1709 | if( (syncFlags & SYNC_PUSH) && zMsg && strglob("pull only *", zMsg) ){ |
| 1710 | syncFlags &= ~SYNC_PUSH; |
| 1711 | zMsg = 0; |
| 1712 | } |
| 1713 | if( zMsg && zMsg[0] ){ |
| 1714 | fossil_force_newline(); |
| 1715 | fossil_print("Server says: %s\n", zMsg); |
| 1716 | } |
| 1717 | }else |
| 1718 | |
| 1719 | /* pragma NAME VALUE... |
| 1720 | ** |
| 1721 | ** The server can send pragmas to try to convey meta-information to |
| @@ -1742,13 +1744,14 @@ | |
| 1744 | if( nCycle<2 ){ |
| 1745 | if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0); |
| 1746 | go = 1; |
| 1747 | } |
| 1748 | }else{ |
| 1749 | blob_appendf(&xfer.err, "server says: %s\n", zMsg); |
| 1750 | } |
| 1751 | fossil_force_newline(); |
| 1752 | fossil_warning("Error: %s", zMsg); |
| 1753 | nErr++; |
| 1754 | break; |
| 1755 | } |
| 1756 | }else |
| 1757 | |
| @@ -1760,14 +1763,15 @@ | |
| 1763 | &recv |
| 1764 | ); |
| 1765 | nErr++; |
| 1766 | break; |
| 1767 | } |
| 1768 | blob_appendf(&xfer.err, "unknown command: [%b]\n", &xfer.aToken[0]); |
| 1769 | } |
| 1770 | |
| 1771 | if( blob_size(&xfer.err) ){ |
| 1772 | fossil_force_newline(); |
| 1773 | fossil_warning("%b", &xfer.err); |
| 1774 | nErr++; |
| 1775 | break; |
| 1776 | } |
| 1777 | blobarray_reset(xfer.aToken, xfer.nToken); |
| 1778 |