Fossil SCM
Further enhance the --extpage option so that it works with "fossil ui remote:path".
Commit
48eea5e3306bd2a363a07b8cdd8d44310bf5b5917119cef0fc82afbfba66a81d
Parent
36c798413cba759…
1 file changed
+8
-1
+8
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -3509,11 +3509,18 @@ | ||
| 3509 | 3509 | } |
| 3510 | 3510 | blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort); |
| 3511 | 3511 | if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound); |
| 3512 | 3512 | if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob); |
| 3513 | 3513 | if( g.zCkoutAlias ) blob_appendf(&ssh," --ckout-alias %!$",g.zCkoutAlias); |
| 3514 | - if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot); | |
| 3514 | + if( zExtPage ){ | |
| 3515 | + if( !file_is_absolute_path(zExtPage) ){ | |
| 3516 | + zExtPage = mprintf("%s/%s", g.argv[2], zExtPage); | |
| 3517 | + } | |
| 3518 | + blob_appendf(&ssh, " --extpage %$", zExtPage); | |
| 3519 | + }else if( g.zExtRoot ){ | |
| 3520 | + blob_appendf(&ssh, " --extroot %$", g.zExtRoot); | |
| 3521 | + } | |
| 3515 | 3522 | if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use()); |
| 3516 | 3523 | if( zJsMode ) blob_appendf(&ssh, " --jsmode %s", zJsMode); |
| 3517 | 3524 | if( fCreate ) blob_appendf(&ssh, " --create"); |
| 3518 | 3525 | blob_appendf(&ssh, " %$", g.argv[2]); |
| 3519 | 3526 | if( isRetry ){ |
| 3520 | 3527 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3509,11 +3509,18 @@ | |
| 3509 | } |
| 3510 | blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort); |
| 3511 | if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound); |
| 3512 | if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob); |
| 3513 | if( g.zCkoutAlias ) blob_appendf(&ssh," --ckout-alias %!$",g.zCkoutAlias); |
| 3514 | if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot); |
| 3515 | if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use()); |
| 3516 | if( zJsMode ) blob_appendf(&ssh, " --jsmode %s", zJsMode); |
| 3517 | if( fCreate ) blob_appendf(&ssh, " --create"); |
| 3518 | blob_appendf(&ssh, " %$", g.argv[2]); |
| 3519 | if( isRetry ){ |
| 3520 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3509,11 +3509,18 @@ | |
| 3509 | } |
| 3510 | blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort); |
| 3511 | if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound); |
| 3512 | if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob); |
| 3513 | if( g.zCkoutAlias ) blob_appendf(&ssh," --ckout-alias %!$",g.zCkoutAlias); |
| 3514 | if( zExtPage ){ |
| 3515 | if( !file_is_absolute_path(zExtPage) ){ |
| 3516 | zExtPage = mprintf("%s/%s", g.argv[2], zExtPage); |
| 3517 | } |
| 3518 | blob_appendf(&ssh, " --extpage %$", zExtPage); |
| 3519 | }else if( g.zExtRoot ){ |
| 3520 | blob_appendf(&ssh, " --extroot %$", g.zExtRoot); |
| 3521 | } |
| 3522 | if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use()); |
| 3523 | if( zJsMode ) blob_appendf(&ssh, " --jsmode %s", zJsMode); |
| 3524 | if( fCreate ) blob_appendf(&ssh, " --create"); |
| 3525 | blob_appendf(&ssh, " %$", g.argv[2]); |
| 3526 | if( isRetry ){ |
| 3527 |