Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Omit the PATH= argument to SSH for "fossil patch push/pull" and "fossil ui" when the --fossilcmd option is used. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a35522f8a425c9689c68b7aa1b8df8b8 |
| User & Date: | drh 2023-06-18 19:58:33.925 |
Context
|
2023-06-18
| ||
| 23:20 | Update documentation to "fossil patch" and "fossil ui" to talk about the algorithm used for locating the fossil executable on the remote host. ... (check-in: d22e2b3817 user: drh tags: trunk) | |
| 19:58 | Omit the PATH= argument to SSH for "fossil patch push/pull" and "fossil ui" when the --fossilcmd option is used. ... (check-in: a35522f8a4 user: drh tags: trunk) | |
| 03:12 | fix import handling of git repositories with renamed files Reported by James Cook in [forum:2b857ded1b]: renamed files were shown as a deletion and an addition. This was because the optional 3rd and 4th field in the manifest's F card to indicate renames were omitted, despite having parsed these data from the git fast-export marks. ... (check-in: 7ab1e11850 user: mark tags: trunk) | |
Changes
Changes to src/main.c.
| ︙ | ︙ | |||
3338 3339 3340 3341 3342 3343 3344 |
** tunnel from the local machine to the remote. */
FILE *sshIn;
Blob ssh;
char zLine[1000];
blob_init(&ssh, 0, 0);
transport_ssh_command(&ssh);
db_close_config();
| < | < | > > > > > > > | 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 |
** tunnel from the local machine to the remote. */
FILE *sshIn;
Blob ssh;
char zLine[1000];
blob_init(&ssh, 0, 0);
transport_ssh_command(&ssh);
db_close_config();
blob_appendf(&ssh,
" -t -L 127.0.0.1:%d:127.0.0.1:%d %!$",
iPort, iPort, zRemote
);
if( zFossilCmd==0 ){
blob_appendf(&ssh, " %$ fossil", "PATH=$HOME/bin:$PATH");
}else{
blob_appendf(&ssh, " %$", zFossilCmd);
}
blob_appendf(&ssh, " ui --nobrowser --localauth --port %d", iPort);
if( zNotFound ) blob_appendf(&ssh, " --notfound %!$", zNotFound);
if( zFileGlob ) blob_appendf(&ssh, " --files-urlenc %T", zFileGlob);
if( g.zCkoutAlias ) blob_appendf(&ssh, " --ckout-alias %!$",g.zCkoutAlias);
if( g.zExtRoot ) blob_appendf(&ssh, " --extroot %$", g.zExtRoot);
if( skin_in_use() ) blob_appendf(&ssh, " --skin %s", skin_in_use());
if( zJsMode ) blob_appendf(&ssh, " --jsmode %s", zJsMode);
if( fCreate ) blob_appendf(&ssh, " --create");
|
| ︙ | ︙ |
Changes to src/patch.c.
| ︙ | ︙ | |||
690 691 692 693 694 695 696 |
blob_appendf(&cmd, " patch %s%s %$ -", zRemoteCmd, zForce, zDir);
}else{
Blob remote;
*(char*)(zDir-1) = 0;
transport_ssh_command(&cmd);
blob_appendf(&cmd, " -T");
blob_append_escaped_arg(&cmd, zRemote, 0);
| < | > > > | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 |
blob_appendf(&cmd, " patch %s%s %$ -", zRemoteCmd, zForce, zDir);
}else{
Blob remote;
*(char*)(zDir-1) = 0;
transport_ssh_command(&cmd);
blob_appendf(&cmd, " -T");
blob_append_escaped_arg(&cmd, zRemote, 0);
blob_init(&remote, 0, 0);
if( zFossilCmd==0 ){
blob_append_escaped_arg(&cmd, "PATH=$HOME/bin:$PATH", 0);
zFossilCmd = "fossil";
}
blob_appendf(&remote, "%$ patch %s%s --dir64 %z -",
zFossilCmd, zRemoteCmd, zForce, encode64(zDir, -1));
blob_append_escaped_arg(&cmd, blob_str(&remote), 0);
blob_reset(&remote);
}
fossil_print("%s\n", blob_str(&cmd));
fflush(stdout);
|
| ︙ | ︙ |