Fossil SCM
Don't omit explanation of a sync operation if a proxy is being used. Because information about the proxy without information about the remote looks kinda awkward. <br> Note: A global variable <var>g.url.isAlias</var> (introduced at <code>src/url.c</code> by [f11c863d91]) is barely used; maybe it's worth to remove it.
Commit
6c9d32ae6fa47f290cc822173071c632d3433285f9d45ca4a4bca0b0dcedca7d
Parent
31ce0d31c4d0cbe…
1 file changed
+1
-1
+1
-1
| --- src/sync.c | ||
| +++ src/sync.c | ||
| @@ -23,11 +23,11 @@ | ||
| 23 | 23 | |
| 24 | 24 | /* |
| 25 | 25 | ** Explain what type of sync operation is about to occur |
| 26 | 26 | */ |
| 27 | 27 | static void sync_explain(unsigned syncFlags){ |
| 28 | - if( g.url.isAlias && (syncFlags & SYNC_QUIET)==0 ){ | |
| 28 | + if( (g.url.isAlias || g.url.useProxy) && (syncFlags & SYNC_QUIET)==0 ){ | |
| 29 | 29 | const char *url; |
| 30 | 30 | if( g.url.useProxy ){ |
| 31 | 31 | url = g.url.proxyUrlCanonical; |
| 32 | 32 | }else{ |
| 33 | 33 | url = g.url.canonical; |
| 34 | 34 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -23,11 +23,11 @@ | |
| 23 | |
| 24 | /* |
| 25 | ** Explain what type of sync operation is about to occur |
| 26 | */ |
| 27 | static void sync_explain(unsigned syncFlags){ |
| 28 | if( g.url.isAlias && (syncFlags & SYNC_QUIET)==0 ){ |
| 29 | const char *url; |
| 30 | if( g.url.useProxy ){ |
| 31 | url = g.url.proxyUrlCanonical; |
| 32 | }else{ |
| 33 | url = g.url.canonical; |
| 34 |
| --- src/sync.c | |
| +++ src/sync.c | |
| @@ -23,11 +23,11 @@ | |
| 23 | |
| 24 | /* |
| 25 | ** Explain what type of sync operation is about to occur |
| 26 | */ |
| 27 | static void sync_explain(unsigned syncFlags){ |
| 28 | if( (g.url.isAlias || g.url.useProxy) && (syncFlags & SYNC_QUIET)==0 ){ |
| 29 | const char *url; |
| 30 | if( g.url.useProxy ){ |
| 31 | url = g.url.proxyUrlCanonical; |
| 32 | }else{ |
| 33 | url = g.url.canonical; |
| 34 |