Fossil

Diff
Login

Diff

Differences From Artifact [a96c093589]:

To Artifact [41c9538385]:


1334
1335
1336
1337
1338
1339
1340

1341


1342
1343
1344
1345
1346
1347
1348
1334
1335
1336
1337
1338
1339
1340
1341

1342
1343
1344
1345
1346
1347
1348
1349
1350







+
-
+
+







  int nArtifactRcvd = 0;  /* Total artifacts received */
  const char *zOpType = 0;/* Push, Pull, Sync, Clone */

  if( db_get_boolean("dont-push", 0) ) syncFlags &= ~SYNC_PUSH;
  if( (syncFlags & (SYNC_PUSH|SYNC_PULL|SYNC_CLONE))==0 
     && configRcvMask==0 && configSendMask==0 ) return 0;

  if( g.urlIsSsh ){
  clone_ssh_db_options();
    clone_ssh_db_options();
  }
  transport_stats(0, 0, 1);
  socket_global_init();
  memset(&xfer, 0, sizeof(xfer));
  xfer.pIn = &recv;
  xfer.pOut = &send;
  xfer.mxSend = db_get_int("max-upload", 250000);
  xfer.maxTime = -1;
1742
1743
1744
1745
1746
1747
1748
1749






1750
1751
1752
1753
1754
1755
1756
1744
1745
1746
1747
1748
1749
1750

1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763







-
+
+
+
+
+
+







          defossilize(zMsg);
          fossil_force_newline();
          fossil_print("Error: %s\n", zMsg);
          if( fossil_strcmp(zMsg, "login failed")==0 ){
            if( nCycle<2 ){
              g.urlPasswd = 0;
              go = 1;
              if( g.cgiOutput==0 ) url_prompt_for_password();
              if( g.cgiOutput==0 ){
                if( g.urlIsSsh ){
                  g.urlFlags |= URL_PROMPT_PW;
                }
                url_prompt_for_password();
              }
            }
          }else{
            blob_appendf(&xfer.err, "server says: %s\n", zMsg);
            nErr++;
          }
          break;
        }