Fossil SCM
The "uv-sync" flag was not working for the "fossil sync" command. Fixed by this check-in.
Commit
d9ec49abcf4bec7297072198c71194c445a79e9b
Parent
b9fd5947effbda6…
1 file changed
+5
-5
+5
-5
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -128,15 +128,10 @@ | ||
| 128 | 128 | const char *zUrl = 0; |
| 129 | 129 | const char *zHttpAuth = 0; |
| 130 | 130 | unsigned configSync = 0; |
| 131 | 131 | unsigned urlFlags = URL_REMEMBER | URL_PROMPT_PW; |
| 132 | 132 | int urlOptional = 0; |
| 133 | - if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) | |
| 134 | - && db_get_boolean("uv-sync",0) | |
| 135 | - ){ | |
| 136 | - *pSyncFlags |= SYNC_UNVERSIONED; | |
| 137 | - } | |
| 138 | 133 | if( find_option("autourl",0,0)!=0 ){ |
| 139 | 134 | urlOptional = 1; |
| 140 | 135 | urlFlags = 0; |
| 141 | 136 | } |
| 142 | 137 | zHttpAuth = find_option("httpauth","B",1); |
| @@ -165,10 +160,15 @@ | ||
| 165 | 160 | db_open_config(0, 0); |
| 166 | 161 | if( g.argc==2 ){ |
| 167 | 162 | if( db_get_boolean("auto-shun",1) ) configSync = CONFIGSET_SHUN; |
| 168 | 163 | }else if( g.argc==3 ){ |
| 169 | 164 | zUrl = g.argv[2]; |
| 165 | + } | |
| 166 | + if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) | |
| 167 | + && db_get_boolean("uv-sync",0) | |
| 168 | + ){ | |
| 169 | + *pSyncFlags |= SYNC_UNVERSIONED; | |
| 170 | 170 | } |
| 171 | 171 | if( urlFlags & URL_REMEMBER ){ |
| 172 | 172 | clone_ssh_db_set_options(); |
| 173 | 173 | } |
| 174 | 174 | url_parse(zUrl, urlFlags); |
| 175 | 175 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -128,15 +128,10 @@ | |
| 128 | const char *zUrl = 0; |
| 129 | const char *zHttpAuth = 0; |
| 130 | unsigned configSync = 0; |
| 131 | unsigned urlFlags = URL_REMEMBER | URL_PROMPT_PW; |
| 132 | int urlOptional = 0; |
| 133 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) |
| 134 | && db_get_boolean("uv-sync",0) |
| 135 | ){ |
| 136 | *pSyncFlags |= SYNC_UNVERSIONED; |
| 137 | } |
| 138 | if( find_option("autourl",0,0)!=0 ){ |
| 139 | urlOptional = 1; |
| 140 | urlFlags = 0; |
| 141 | } |
| 142 | zHttpAuth = find_option("httpauth","B",1); |
| @@ -165,10 +160,15 @@ | |
| 165 | db_open_config(0, 0); |
| 166 | if( g.argc==2 ){ |
| 167 | if( db_get_boolean("auto-shun",1) ) configSync = CONFIGSET_SHUN; |
| 168 | }else if( g.argc==3 ){ |
| 169 | zUrl = g.argv[2]; |
| 170 | } |
| 171 | if( urlFlags & URL_REMEMBER ){ |
| 172 | clone_ssh_db_set_options(); |
| 173 | } |
| 174 | url_parse(zUrl, urlFlags); |
| 175 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -128,15 +128,10 @@ | |
| 128 | const char *zUrl = 0; |
| 129 | const char *zHttpAuth = 0; |
| 130 | unsigned configSync = 0; |
| 131 | unsigned urlFlags = URL_REMEMBER | URL_PROMPT_PW; |
| 132 | int urlOptional = 0; |
| 133 | if( find_option("autourl",0,0)!=0 ){ |
| 134 | urlOptional = 1; |
| 135 | urlFlags = 0; |
| 136 | } |
| 137 | zHttpAuth = find_option("httpauth","B",1); |
| @@ -165,10 +160,15 @@ | |
| 160 | db_open_config(0, 0); |
| 161 | if( g.argc==2 ){ |
| 162 | if( db_get_boolean("auto-shun",1) ) configSync = CONFIGSET_SHUN; |
| 163 | }else if( g.argc==3 ){ |
| 164 | zUrl = g.argv[2]; |
| 165 | } |
| 166 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) |
| 167 | && db_get_boolean("uv-sync",0) |
| 168 | ){ |
| 169 | *pSyncFlags |= SYNC_UNVERSIONED; |
| 170 | } |
| 171 | if( urlFlags & URL_REMEMBER ){ |
| 172 | clone_ssh_db_set_options(); |
| 173 | } |
| 174 | url_parse(zUrl, urlFlags); |
| 175 |