Fossil SCM

Restore URL flags because user_select() causes them to be altered. This allows the save password prompt to appear when required.

andybradford 2013-11-02 17:26 UTC url-password-fixes
Commit 817d795f96465dbb689de7f137275f782a727fb2
1 file changed +1
+1
--- src/sync.c
+++ src/sync.c
@@ -120,10 +120,11 @@
120120
if( g.urlProtocol==0 ){
121121
if( urlOptional ) fossil_exit(0);
122122
usage("URL");
123123
}
124124
user_select();
125
+ g.urlFlags = urlFlags;
125126
if( g.argc==2 ){
126127
if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
127128
fossil_print("Sync with %s\n", g.urlCanonical);
128129
}else if( (*pSyncFlags) & SYNC_PUSH ){
129130
fossil_print("Push to %s\n", g.urlCanonical);
130131
--- src/sync.c
+++ src/sync.c
@@ -120,10 +120,11 @@
120 if( g.urlProtocol==0 ){
121 if( urlOptional ) fossil_exit(0);
122 usage("URL");
123 }
124 user_select();
 
125 if( g.argc==2 ){
126 if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
127 fossil_print("Sync with %s\n", g.urlCanonical);
128 }else if( (*pSyncFlags) & SYNC_PUSH ){
129 fossil_print("Push to %s\n", g.urlCanonical);
130
--- src/sync.c
+++ src/sync.c
@@ -120,10 +120,11 @@
120 if( g.urlProtocol==0 ){
121 if( urlOptional ) fossil_exit(0);
122 usage("URL");
123 }
124 user_select();
125 g.urlFlags = urlFlags;
126 if( g.argc==2 ){
127 if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
128 fossil_print("Sync with %s\n", g.urlCanonical);
129 }else if( (*pSyncFlags) & SYNC_PUSH ){
130 fossil_print("Push to %s\n", g.urlCanonical);
131

Keyboard Shortcuts

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