Fossil SCM

Only remember the last-sync-url after a successful sync. Do not remember the argument if the sync failed.

drh 2021-11-11 23:01 trunk
Commit c129f29566439e5c2e75d7907bc6923417ff0052d8925ba6febf068e8b45f908
1 file changed +1 -1
+1 -1
--- src/sync.c
+++ src/sync.c
@@ -54,10 +54,11 @@
5454
int i;
5555
Stmt q;
5656
5757
sync_explain(syncFlags);
5858
nErr = client_sync(syncFlags, configRcvMask, configSendMask, zAltPCode);
59
+ if( nErr==0 ) url_remember();
5960
if( (syncFlags & SYNC_ALLURL)==0 ) return nErr;
6061
nOther = 0;
6162
azOther = 0;
6263
db_prepare(&q,
6364
"SELECT substr(name,10) FROM config"
@@ -255,11 +256,10 @@
255256
if( urlFlags & URL_REMEMBER ){
256257
clone_ssh_db_set_options();
257258
}
258259
url_parse(zUrl, urlFlags);
259260
remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, zUrl);
260
- url_remember();
261261
if( g.url.protocol==0 ){
262262
if( urlOptional ) fossil_exit(0);
263263
usage("URL");
264264
}
265265
user_select();
266266
--- src/sync.c
+++ src/sync.c
@@ -54,10 +54,11 @@
54 int i;
55 Stmt q;
56
57 sync_explain(syncFlags);
58 nErr = client_sync(syncFlags, configRcvMask, configSendMask, zAltPCode);
 
59 if( (syncFlags & SYNC_ALLURL)==0 ) return nErr;
60 nOther = 0;
61 azOther = 0;
62 db_prepare(&q,
63 "SELECT substr(name,10) FROM config"
@@ -255,11 +256,10 @@
255 if( urlFlags & URL_REMEMBER ){
256 clone_ssh_db_set_options();
257 }
258 url_parse(zUrl, urlFlags);
259 remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, zUrl);
260 url_remember();
261 if( g.url.protocol==0 ){
262 if( urlOptional ) fossil_exit(0);
263 usage("URL");
264 }
265 user_select();
266
--- src/sync.c
+++ src/sync.c
@@ -54,10 +54,11 @@
54 int i;
55 Stmt q;
56
57 sync_explain(syncFlags);
58 nErr = client_sync(syncFlags, configRcvMask, configSendMask, zAltPCode);
59 if( nErr==0 ) url_remember();
60 if( (syncFlags & SYNC_ALLURL)==0 ) return nErr;
61 nOther = 0;
62 azOther = 0;
63 db_prepare(&q,
64 "SELECT substr(name,10) FROM config"
@@ -255,11 +256,10 @@
256 if( urlFlags & URL_REMEMBER ){
257 clone_ssh_db_set_options();
258 }
259 url_parse(zUrl, urlFlags);
260 remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, zUrl);
 
261 if( g.url.protocol==0 ){
262 if( urlOptional ) fossil_exit(0);
263 usage("URL");
264 }
265 user_select();
266

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button