Fossil SCM
If the login fails during a clone or sync, fail the command immediately rather than reprompting for a new password, as the sync is going to eventually fail anyhow.
Commit
e4ca60cd4920133f00c7454b98150fef5ba76669cece9650d5c8998ad191a419
Parent
8a4ad5cb547518d…
1 file changed
+2
-17
+2
-17
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -2288,27 +2288,12 @@ | ||
| 2288 | 2288 | if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){ |
| 2289 | 2289 | char *zMsg = blob_terminate(&xfer.aToken[1]); |
| 2290 | 2290 | defossilize(zMsg); |
| 2291 | 2291 | fossil_force_newline(); |
| 2292 | 2292 | fossil_print("Error: %s\n", zMsg); |
| 2293 | - if( fossil_strcmp(zMsg, "login failed")==0 ){ | |
| 2294 | - if( nCycle<2 ){ | |
| 2295 | - g.url.passwd = 0; | |
| 2296 | - go = 1; | |
| 2297 | - if( g.cgiOutput==0 ){ | |
| 2298 | - g.url.flags |= URL_PROMPT_PW; | |
| 2299 | - g.url.flags &= ~URL_PROMPTED; | |
| 2300 | - url_prompt_for_password(); | |
| 2301 | - url_remember(); | |
| 2302 | - } | |
| 2303 | - }else{ | |
| 2304 | - nErr++; | |
| 2305 | - } | |
| 2306 | - }else{ | |
| 2307 | - blob_appendf(&xfer.err, "server says: %s\n", zMsg); | |
| 2308 | - nErr++; | |
| 2309 | - } | |
| 2293 | + blob_appendf(&xfer.err, "server says: %s\n", zMsg); | |
| 2294 | + nErr++; | |
| 2310 | 2295 | break; |
| 2311 | 2296 | } |
| 2312 | 2297 | }else |
| 2313 | 2298 | |
| 2314 | 2299 | /* Unknown message */ |
| 2315 | 2300 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2288,27 +2288,12 @@ | |
| 2288 | if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){ |
| 2289 | char *zMsg = blob_terminate(&xfer.aToken[1]); |
| 2290 | defossilize(zMsg); |
| 2291 | fossil_force_newline(); |
| 2292 | fossil_print("Error: %s\n", zMsg); |
| 2293 | if( fossil_strcmp(zMsg, "login failed")==0 ){ |
| 2294 | if( nCycle<2 ){ |
| 2295 | g.url.passwd = 0; |
| 2296 | go = 1; |
| 2297 | if( g.cgiOutput==0 ){ |
| 2298 | g.url.flags |= URL_PROMPT_PW; |
| 2299 | g.url.flags &= ~URL_PROMPTED; |
| 2300 | url_prompt_for_password(); |
| 2301 | url_remember(); |
| 2302 | } |
| 2303 | }else{ |
| 2304 | nErr++; |
| 2305 | } |
| 2306 | }else{ |
| 2307 | blob_appendf(&xfer.err, "server says: %s\n", zMsg); |
| 2308 | nErr++; |
| 2309 | } |
| 2310 | break; |
| 2311 | } |
| 2312 | }else |
| 2313 | |
| 2314 | /* Unknown message */ |
| 2315 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2288,27 +2288,12 @@ | |
| 2288 | if( (syncFlags & SYNC_CLONE)==0 || nCycle>0 ){ |
| 2289 | char *zMsg = blob_terminate(&xfer.aToken[1]); |
| 2290 | defossilize(zMsg); |
| 2291 | fossil_force_newline(); |
| 2292 | fossil_print("Error: %s\n", zMsg); |
| 2293 | blob_appendf(&xfer.err, "server says: %s\n", zMsg); |
| 2294 | nErr++; |
| 2295 | break; |
| 2296 | } |
| 2297 | }else |
| 2298 | |
| 2299 | /* Unknown message */ |
| 2300 |