Fossil SCM
Print the Fossil user if different from URL user.
Commit
4d67ad13caf2df5228dc81617ea6604d8bf5ab39
Parent
9dd4a935e81da0f…
1 file changed
+12
-4
+12
-4
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -65,11 +65,13 @@ | ||
| 65 | 65 | */ |
| 66 | 66 | configSync = CONFIGSET_SHUN; |
| 67 | 67 | } |
| 68 | 68 | #endif |
| 69 | 69 | if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE; |
| 70 | - fossil_print("Autosync: %s\n", g.urlCanonical); | |
| 70 | + ( g.zFossilUser && g.zFossilUser[0] ) ? | |
| 71 | + fossil_print("Autosync: (%s) %s\n", g.zFossilUser, g.urlCanonical) : | |
| 72 | + fossil_print("Autosync: %s\n", g.urlCanonical); | |
| 71 | 73 | url_enable_proxy("via proxy: "); |
| 72 | 74 | rc = client_sync(flags, configSync, 0); |
| 73 | 75 | if( rc ) fossil_warning("Autosync failed"); |
| 74 | 76 | return rc; |
| 75 | 77 | } |
| @@ -111,15 +113,21 @@ | ||
| 111 | 113 | usage("URL"); |
| 112 | 114 | } |
| 113 | 115 | user_select(); |
| 114 | 116 | if( g.argc==2 ){ |
| 115 | 117 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){ |
| 116 | - fossil_print("Sync with %s\n", g.urlCanonical); | |
| 118 | + ( g.zFossilUser && g.zFossilUser[0] ) ? | |
| 119 | + fossil_print("Sync with (%s) %s\n", g.zFossilUser, g.urlCanonical) : | |
| 120 | + fossil_print("Sync with %s\n", g.urlCanonical); | |
| 117 | 121 | }else if( (*pSyncFlags) & SYNC_PUSH ){ |
| 118 | - fossil_print("Push to %s\n", g.urlCanonical); | |
| 122 | + ( g.zFossilUser && g.zFossilUser[0] ) ? | |
| 123 | + fossil_print("Push to (%s) %s\n", g.zFossilUser, g.urlCanonical) : | |
| 124 | + fossil_print("Push to %s\n", g.urlCanonical); | |
| 119 | 125 | }else if( (*pSyncFlags) & SYNC_PULL ){ |
| 120 | - fossil_print("Pull from %s\n", g.urlCanonical); | |
| 126 | + ( g.zFossilUser && g.zFossilUser[0] ) ? | |
| 127 | + fossil_print("Pull from (%s) %s\n", g.zFossilUser, g.urlCanonical) : | |
| 128 | + fossil_print("Pull from %s\n", g.urlCanonical); | |
| 121 | 129 | } |
| 122 | 130 | } |
| 123 | 131 | url_enable_proxy("via proxy: "); |
| 124 | 132 | *pConfigFlags |= configSync; |
| 125 | 133 | } |
| 126 | 134 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -65,11 +65,13 @@ | |
| 65 | */ |
| 66 | configSync = CONFIGSET_SHUN; |
| 67 | } |
| 68 | #endif |
| 69 | if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE; |
| 70 | fossil_print("Autosync: %s\n", g.urlCanonical); |
| 71 | url_enable_proxy("via proxy: "); |
| 72 | rc = client_sync(flags, configSync, 0); |
| 73 | if( rc ) fossil_warning("Autosync failed"); |
| 74 | return rc; |
| 75 | } |
| @@ -111,15 +113,21 @@ | |
| 111 | usage("URL"); |
| 112 | } |
| 113 | user_select(); |
| 114 | if( g.argc==2 ){ |
| 115 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){ |
| 116 | fossil_print("Sync with %s\n", g.urlCanonical); |
| 117 | }else if( (*pSyncFlags) & SYNC_PUSH ){ |
| 118 | fossil_print("Push to %s\n", g.urlCanonical); |
| 119 | }else if( (*pSyncFlags) & SYNC_PULL ){ |
| 120 | fossil_print("Pull from %s\n", g.urlCanonical); |
| 121 | } |
| 122 | } |
| 123 | url_enable_proxy("via proxy: "); |
| 124 | *pConfigFlags |= configSync; |
| 125 | } |
| 126 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -65,11 +65,13 @@ | |
| 65 | */ |
| 66 | configSync = CONFIGSET_SHUN; |
| 67 | } |
| 68 | #endif |
| 69 | if( find_option("verbose","v",0)!=0 ) flags |= SYNC_VERBOSE; |
| 70 | ( g.zFossilUser && g.zFossilUser[0] ) ? |
| 71 | fossil_print("Autosync: (%s) %s\n", g.zFossilUser, g.urlCanonical) : |
| 72 | fossil_print("Autosync: %s\n", g.urlCanonical); |
| 73 | url_enable_proxy("via proxy: "); |
| 74 | rc = client_sync(flags, configSync, 0); |
| 75 | if( rc ) fossil_warning("Autosync failed"); |
| 76 | return rc; |
| 77 | } |
| @@ -111,15 +113,21 @@ | |
| 113 | usage("URL"); |
| 114 | } |
| 115 | user_select(); |
| 116 | if( g.argc==2 ){ |
| 117 | if( ((*pSyncFlags) & (SYNC_PUSH|SYNC_PULL))==(SYNC_PUSH|SYNC_PULL) ){ |
| 118 | ( g.zFossilUser && g.zFossilUser[0] ) ? |
| 119 | fossil_print("Sync with (%s) %s\n", g.zFossilUser, g.urlCanonical) : |
| 120 | fossil_print("Sync with %s\n", g.urlCanonical); |
| 121 | }else if( (*pSyncFlags) & SYNC_PUSH ){ |
| 122 | ( g.zFossilUser && g.zFossilUser[0] ) ? |
| 123 | fossil_print("Push to (%s) %s\n", g.zFossilUser, g.urlCanonical) : |
| 124 | fossil_print("Push to %s\n", g.urlCanonical); |
| 125 | }else if( (*pSyncFlags) & SYNC_PULL ){ |
| 126 | ( g.zFossilUser && g.zFossilUser[0] ) ? |
| 127 | fossil_print("Pull from (%s) %s\n", g.zFossilUser, g.urlCanonical) : |
| 128 | fossil_print("Pull from %s\n", g.urlCanonical); |
| 129 | } |
| 130 | } |
| 131 | url_enable_proxy("via proxy: "); |
| 132 | *pConfigFlags |= configSync; |
| 133 | } |
| 134 |