Fossil SCM
Disable automatic pull of shun records for the time being.
Commit
3c2500c7650ab33798f76689a058b45b5c55f4c7
Parent
3af6cf099301ba7…
1 file changed
+2
+2
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -61,10 +61,11 @@ | ||
| 61 | 61 | zPw = unobscure(db_get("last-sync-pw", 0)); |
| 62 | 62 | url_parse(zUrl); |
| 63 | 63 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 64 | 64 | g.urlPasswd = mprintf("%s", zPw); |
| 65 | 65 | } |
| 66 | +#if 0 /* Disabled for now */ | |
| 66 | 67 | if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){ |
| 67 | 68 | /* When doing an automatic pull, also automatically pull shuns from |
| 68 | 69 | ** the server if pull_shuns is enabled. |
| 69 | 70 | ** |
| 70 | 71 | ** TODO: What happens if the shun list gets really big? |
| @@ -71,10 +72,11 @@ | ||
| 71 | 72 | ** Maybe the shunning list should only be pulled on every 10th |
| 72 | 73 | ** autosync, or something? |
| 73 | 74 | */ |
| 74 | 75 | configSync = CONFIGSET_SHUN; |
| 75 | 76 | } |
| 77 | +#endif | |
| 76 | 78 | printf("Autosync: %s\n", g.urlCanonical); |
| 77 | 79 | url_enable_proxy("via proxy: "); |
| 78 | 80 | client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0, configSync, 0); |
| 79 | 81 | } |
| 80 | 82 | |
| 81 | 83 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -61,10 +61,11 @@ | |
| 61 | zPw = unobscure(db_get("last-sync-pw", 0)); |
| 62 | url_parse(zUrl); |
| 63 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 64 | g.urlPasswd = mprintf("%s", zPw); |
| 65 | } |
| 66 | if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){ |
| 67 | /* When doing an automatic pull, also automatically pull shuns from |
| 68 | ** the server if pull_shuns is enabled. |
| 69 | ** |
| 70 | ** TODO: What happens if the shun list gets really big? |
| @@ -71,10 +72,11 @@ | |
| 71 | ** Maybe the shunning list should only be pulled on every 10th |
| 72 | ** autosync, or something? |
| 73 | */ |
| 74 | configSync = CONFIGSET_SHUN; |
| 75 | } |
| 76 | printf("Autosync: %s\n", g.urlCanonical); |
| 77 | url_enable_proxy("via proxy: "); |
| 78 | client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0, configSync, 0); |
| 79 | } |
| 80 | |
| 81 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -61,10 +61,11 @@ | |
| 61 | zPw = unobscure(db_get("last-sync-pw", 0)); |
| 62 | url_parse(zUrl); |
| 63 | if( g.urlUser!=0 && g.urlPasswd==0 ){ |
| 64 | g.urlPasswd = mprintf("%s", zPw); |
| 65 | } |
| 66 | #if 0 /* Disabled for now */ |
| 67 | if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){ |
| 68 | /* When doing an automatic pull, also automatically pull shuns from |
| 69 | ** the server if pull_shuns is enabled. |
| 70 | ** |
| 71 | ** TODO: What happens if the shun list gets really big? |
| @@ -71,10 +72,11 @@ | |
| 72 | ** Maybe the shunning list should only be pulled on every 10th |
| 73 | ** autosync, or something? |
| 74 | */ |
| 75 | configSync = CONFIGSET_SHUN; |
| 76 | } |
| 77 | #endif |
| 78 | printf("Autosync: %s\n", g.urlCanonical); |
| 79 | url_enable_proxy("via proxy: "); |
| 80 | client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0, configSync, 0); |
| 81 | } |
| 82 | |
| 83 |