Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Disable automatic pull of shun records for the time being. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
3c2500c7650ab33798f76689a058b45b |
| User & Date: | drh 2010-11-13 23:29:57.000 |
Context
|
2010-11-13
| ||
| 23:45 | Change the "branch list" command to provide output more like Git. check-in: 761a6a9dcf user: drh tags: trunk | |
| 23:29 | Disable automatic pull of shun records for the time being. check-in: 3c2500c765 user: drh tags: trunk | |
| 23:23 | Move the "updated-to:" text to the end of the display for the "update" command, and separately from the changed files by "---------". This at the request of the emacs integration effort. check-in: 3af6cf0993 user: drh tags: trunk | |
Changes
Changes to src/sync.c.
| ︙ | ︙ | |||
59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
return; /* No default server */
}
zPw = unobscure(db_get("last-sync-pw", 0));
url_parse(zUrl);
if( g.urlUser!=0 && g.urlPasswd==0 ){
g.urlPasswd = mprintf("%s", zPw);
}
if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
/* When doing an automatic pull, also automatically pull shuns from
** the server if pull_shuns is enabled.
**
** TODO: What happens if the shun list gets really big?
** Maybe the shunning list should only be pulled on every 10th
** autosync, or something?
*/
configSync = CONFIGSET_SHUN;
}
printf("Autosync: %s\n", g.urlCanonical);
url_enable_proxy("via proxy: ");
client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0, configSync, 0);
}
/*
** This routine processes the command-line argument for push, pull,
| > > | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
return; /* No default server */
}
zPw = unobscure(db_get("last-sync-pw", 0));
url_parse(zUrl);
if( g.urlUser!=0 && g.urlPasswd==0 ){
g.urlPasswd = mprintf("%s", zPw);
}
#if 0 /* Disabled for now */
if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
/* When doing an automatic pull, also automatically pull shuns from
** the server if pull_shuns is enabled.
**
** TODO: What happens if the shun list gets really big?
** Maybe the shunning list should only be pulled on every 10th
** autosync, or something?
*/
configSync = CONFIGSET_SHUN;
}
#endif
printf("Autosync: %s\n", g.urlCanonical);
url_enable_proxy("via proxy: ");
client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0, configSync, 0);
}
/*
** This routine processes the command-line argument for push, pull,
|
| ︙ | ︙ |