Fossil SCM
Remove side effect produced when calling with no flags. This permits removal of work around in sync.c.
Commit
912ca195104e7dab99ac0fd8d7b5ebdcb271ce33
Parent
ad34c07c451b6dd…
2 files changed
-2
+1
-1
-2
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -121,13 +121,11 @@ | ||
| 121 | 121 | url_remember(); |
| 122 | 122 | if( g.urlProtocol==0 ){ |
| 123 | 123 | if( urlOptional ) fossil_exit(0); |
| 124 | 124 | usage("URL"); |
| 125 | 125 | } |
| 126 | - urlFlags = g.urlFlags; | |
| 127 | 126 | user_select(); |
| 128 | - g.urlFlags = urlFlags; | |
| 129 | 127 | if( g.argc==2 ){ |
| 130 | 128 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){ |
| 131 | 129 | fossil_print("Sync with %s\n", g.urlCanonical); |
| 132 | 130 | }else if( (*pSyncFlags) & SYNC_PUSH ){ |
| 133 | 131 | fossil_print("Push to %s\n", g.urlCanonical); |
| 134 | 132 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -121,13 +121,11 @@ | |
| 121 | url_remember(); |
| 122 | if( g.urlProtocol==0 ){ |
| 123 | if( urlOptional ) fossil_exit(0); |
| 124 | usage("URL"); |
| 125 | } |
| 126 | urlFlags = g.urlFlags; |
| 127 | user_select(); |
| 128 | g.urlFlags = urlFlags; |
| 129 | if( g.argc==2 ){ |
| 130 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){ |
| 131 | fossil_print("Sync with %s\n", g.urlCanonical); |
| 132 | }else if( (*pSyncFlags) & SYNC_PUSH ){ |
| 133 | fossil_print("Push to %s\n", g.urlCanonical); |
| 134 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -121,13 +121,11 @@ | |
| 121 | url_remember(); |
| 122 | if( g.urlProtocol==0 ){ |
| 123 | if( urlOptional ) fossil_exit(0); |
| 124 | usage("URL"); |
| 125 | } |
| 126 | user_select(); |
| 127 | if( g.argc==2 ){ |
| 128 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){ |
| 129 | fossil_print("Sync with %s\n", g.urlCanonical); |
| 130 | }else if( (*pSyncFlags) & SYNC_PUSH ){ |
| 131 | fossil_print("Push to %s\n", g.urlCanonical); |
| 132 |
+1
-1
| --- src/url.c | ||
| +++ src/url.c | ||
| @@ -211,11 +211,11 @@ | ||
| 211 | 211 | fossil_fatal("unknown repository: %s", zUrl); |
| 212 | 212 | } |
| 213 | 213 | }else{ |
| 214 | 214 | fossil_fatal("unknown repository: %s", zUrl); |
| 215 | 215 | } |
| 216 | - g.urlFlags = urlFlags; | |
| 216 | + if( urlFlags ) g.urlFlags = urlFlags; | |
| 217 | 217 | if( g.urlIsFile ){ |
| 218 | 218 | Blob cfile; |
| 219 | 219 | dehttpize(zFile); |
| 220 | 220 | file_canonical_name(zFile, &cfile, 0); |
| 221 | 221 | free(zFile); |
| 222 | 222 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -211,11 +211,11 @@ | |
| 211 | fossil_fatal("unknown repository: %s", zUrl); |
| 212 | } |
| 213 | }else{ |
| 214 | fossil_fatal("unknown repository: %s", zUrl); |
| 215 | } |
| 216 | g.urlFlags = urlFlags; |
| 217 | if( g.urlIsFile ){ |
| 218 | Blob cfile; |
| 219 | dehttpize(zFile); |
| 220 | file_canonical_name(zFile, &cfile, 0); |
| 221 | free(zFile); |
| 222 |
| --- src/url.c | |
| +++ src/url.c | |
| @@ -211,11 +211,11 @@ | |
| 211 | fossil_fatal("unknown repository: %s", zUrl); |
| 212 | } |
| 213 | }else{ |
| 214 | fossil_fatal("unknown repository: %s", zUrl); |
| 215 | } |
| 216 | if( urlFlags ) g.urlFlags = urlFlags; |
| 217 | if( g.urlIsFile ){ |
| 218 | Blob cfile; |
| 219 | dehttpize(zFile); |
| 220 | file_canonical_name(zFile, &cfile, 0); |
| 221 | free(zFile); |
| 222 |