Differences From Artifact [939cb75e4b]:

• File src/sync.c — part of check-in [83ffea65ca] at 2022-04-28 14:25:27 on branch fix_remote_url_overwrite_with_proxy — attempt to fix issue where the remote-url saved is overwritten by the proxy url. (issue introduced by checkin [c129f29566439e5c]) (user: mgagnon size: 25544)

To Artifact [01a44496b2]:

• File src/sync.c — part of check-in [78a5195392] at 2022-05-03 04:02:40 on branch fix_remote_url_overwrite_with_proxy — Simplification by omitting g.url.user and g.url.password backup copy since they are only swapped during short time and are restored right away. Also rename url.canonical backup copy to "proxyUrlCanonical" following name convention of already existing "proxyUrlPath" field. (user: mgagnon size: 25548) [more...]

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

/*
** Explain what type of sync operation is about to occur
*/
static void sync_explain(unsigned syncFlags){
  if( g.url.isAlias ){
    const char *url;
    if( g.url.useProxy ){
      url = g.url.canonicalCopy;
    }else{
      url = g.url.canonical;
    }
    if( (syncFlags & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
      fossil_print("Sync with %s\n", url);
    }else if( syncFlags & SYNC_PUSH ){
      fossil_print("Push to %s\n", url);

|

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

/*
** Explain what type of sync operation is about to occur
*/
static void sync_explain(unsigned syncFlags){
  if( g.url.isAlias ){
    const char *url;
    if( g.url.useProxy ){
      url = g.url.proxyUrlCanonical;
    }else{
      url = g.url.canonical;
    }
    if( (syncFlags & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
      fossil_print("Sync with %s\n", url);
    }else if( syncFlags & SYNC_PUSH ){
      fossil_print("Push to %s\n", url);