Fossil

Diff
Login

Diff

Differences From Artifact [f45e35a3fa]:

To Artifact [1aba6fb0ec]:


1736
1737
1738
1739
1740
1741
1742


1743
1744
1745

1746

1747
1748
1749
1750
1751
1752
1753


1754
1755
1756
1757
1758
1759
1760
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746

1747
1748
1749
1750
1751
1752




1753
1754
1755
1756
1757
1758
1759
1760
1761







+
+


-
+

+



-
-
-
-
+
+







      ** subsequent messages should be OK.  Nevertheless, we need to ignore
      ** the error card on the first message of a clone.
      */        
      if( blob_eq(&xfer.aToken[0],"error") && xfer.nToken==2 ){
        if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){
          char *zMsg = blob_terminate(&xfer.aToken[1]);
          defossilize(zMsg);
          fossil_force_newline();
          fossil_print("Error: %s\n", zMsg);
          if( fossil_strcmp(zMsg, "login failed")==0 ){
            if( nCycle<2 ){
              if( !g.dontKeepUrl ) db_unset("last-sync-pw", 0);
              g.urlPasswd = 0;
              go = 1;
              if( g.cgiOutput==0 ) url_prompt_for_password();
            }
          }else{
            blob_appendf(&xfer.err, "server says: %s\n", zMsg);
          }
          fossil_force_newline();
          fossil_warning("Error: %s", zMsg);
          nErr++;
            nErr++;
          }
          break;
        }
      }else

      /* Unknown message */
      if( xfer.nToken>0 ){
        if( blob_str(&xfer.aToken[0])[0]=='<' ){