Check-in [4d67ad13ca]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Print the Fossil user if different from URL user.
Timelines: family | ancestors | descendants | both | ssh-shared-account
Files: files | file ages | folders
SHA1:4d67ad13caf2df5228dc81617ea6604d8bf5ab39
User & Date: amb 2013-07-20 09:38:45
Context
2013-07-20
09:41
Need to retrain vi. Leaf check-in: f38f76cf01 user: amb tags: ssh-shared-account
09:38
Print the Fossil user if different from URL user. check-in: 4d67ad13ca user: amb tags: ssh-shared-account
08:48
Perhaps avoid confusion with other similarly named short options. check-in: 9dd4a935e8 user: amb tags: ssh-shared-account
Changes

Changes to src/sync.c.

63
64
65
66
67
68
69


70
71
72
73
74
75
76
77
...
109
110
111
112
113
114
115


116
117


118
119


120
121
122
123
124
125
126
127
    ** Maybe the shunning list should only be pulled on every 10th
    ** autosync, or something?
    */
    configSync = CONFIGSET_SHUN;
  }
#endif
  if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE;


  fossil_print("Autosync:  %s\n", g.urlCanonical);
  url_enable_proxy("via proxy: ");
  rc = client_sync(flags, configSync, 0);
  if( rc ) fossil_warning("Autosync failed");
  return rc;
}

/*
................................................................................
  if( g.urlProtocol==0 ){
    if( urlOptional ) fossil_exit(0);
    usage("URL");
  }
  user_select();
  if( g.argc==2 ){
    if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){


      fossil_print("Sync with %s\n", g.urlCanonical);
    }else if( (*pSyncFlags) & SYNC_PUSH ){


      fossil_print("Push to %s\n", g.urlCanonical);
    }else if( (*pSyncFlags) & SYNC_PULL ){


      fossil_print("Pull from %s\n", g.urlCanonical);
    }
  }
  url_enable_proxy("via proxy: ");
  *pConfigFlags |= configSync;
}

/*







>
>
|







 







>
>
|

>
>
|

>
>
|







63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
...
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
    ** Maybe the shunning list should only be pulled on every 10th
    ** autosync, or something?
    */
    configSync = CONFIGSET_SHUN;
  }
#endif
  if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE;
  ( g.zFossilUser && g.zFossilUser[0] ) ?
    fossil_print("Autosync: (%s) %s\n", g.zFossilUser, g.urlCanonical) :
    fossil_print("Autosync:  %s\n", g.urlCanonical);
  url_enable_proxy("via proxy: ");
  rc = client_sync(flags, configSync, 0);
  if( rc ) fossil_warning("Autosync failed");
  return rc;
}

/*
................................................................................
  if( g.urlProtocol==0 ){
    if( urlOptional ) fossil_exit(0);
    usage("URL");
  }
  user_select();
  if( g.argc==2 ){
    if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){
      ( g.zFossilUser && g.zFossilUser[0] ) ? 
	fossil_print("Sync with (%s) %s\n", g.zFossilUser, g.urlCanonical) :
	fossil_print("Sync with %s\n", g.urlCanonical);
    }else if( (*pSyncFlags) & SYNC_PUSH ){
      ( g.zFossilUser && g.zFossilUser[0] ) ? 
	fossil_print("Push to (%s) %s\n", g.zFossilUser, g.urlCanonical) :
	fossil_print("Push to %s\n", g.urlCanonical);
    }else if( (*pSyncFlags) & SYNC_PULL ){
      ( g.zFossilUser && g.zFossilUser[0] ) ? 
	fossil_print("Pull from (%s) %s\n", g.zFossilUser, g.urlCanonical) :
	fossil_print("Pull from %s\n", g.urlCanonical);
    }
  }
  url_enable_proxy("via proxy: ");
  *pConfigFlags |= configSync;
}

/*