Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add help text for the new setting. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | exec-rel-paths |
| Files: | files | file ages | folders |
| SHA1: |
2369a92fb6bd7a181c3ae72b52d60806 |
| User & Date: | mistachkin 2015-06-10 04:04:49.584 |
Context
|
2015-06-11
| ||
| 08:33 | Make option --exec-rel-paths actually work, in stead of just giving: "unrecognized command-line option, or missing argument: --exec-rel-paths" check-in: c8a8827309 user: jan.nijtmans tags: exec-rel-paths | |
|
2015-06-10
| ||
| 04:04 | Add help text for the new setting. check-in: 2369a92fb6 user: mistachkin tags: exec-rel-paths | |
| 03:22 | Revise the changes on this branch to favor the current default behavior. Also, make it possible to override the new setting with a command line option. check-in: 2036eef767 user: mistachkin tags: exec-rel-paths | |
Changes
Changes to src/db.c.
| ︙ | ︙ | |||
2377 2378 2379 2380 2381 2382 2383 |
{ "diff-binary", 0, 0, 0, 0, "on" },
{ "diff-command", 0, 40, 0, 0, "" },
{ "dont-push", 0, 0, 0, 0, "off" },
{ "dotfiles", 0, 0, 1, 0, "off" },
{ "editor", 0, 32, 0, 0, "" },
{ "empty-dirs", 0, 40, 1, 0, "" },
{ "encoding-glob", 0, 40, 1, 0, "" },
| | | 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 |
{ "diff-binary", 0, 0, 0, 0, "on" },
{ "diff-command", 0, 40, 0, 0, "" },
{ "dont-push", 0, 0, 0, 0, "off" },
{ "dotfiles", 0, 0, 1, 0, "off" },
{ "editor", 0, 32, 0, 0, "" },
{ "empty-dirs", 0, 40, 1, 0, "" },
{ "encoding-glob", 0, 40, 1, 0, "" },
{ "exec-rel-paths", 0, 0, 0, 0, "off" },
{ "gdiff-command", 0, 40, 0, 0, "gdiff" },
{ "gmerge-command", 0, 40, 0, 0, "" },
{ "hash-digits", 0, 5, 0, 0, "10" },
{ "http-port", 0, 16, 0, 0, "8080" },
{ "https-login", 0, 0, 0, 0, "off" },
{ "ignore-glob", 0, 40, 1, 0, "" },
{ "keep-glob", 0, 40, 1, 0, "" },
|
| ︙ | ︙ | |||
2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 | ** created. ** ** encoding-glob The VALUE is a comma or newline-separated list of GLOB ** (versionable) patterns specifying files that the "commit" command will ** ignore when issuing warnings about text files that may ** use another encoding than ASCII or UTF-8. Set to "*" ** to disable encoding checking. ** ** gdiff-command External command to run when performing a graphical ** diff. If undefined, text diff will be used. ** ** gmerge-command A graphical merge conflict resolver command operating ** on four files. ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" | > > > | 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 | ** created. ** ** encoding-glob The VALUE is a comma or newline-separated list of GLOB ** (versionable) patterns specifying files that the "commit" command will ** ignore when issuing warnings about text files that may ** use another encoding than ASCII or UTF-8. Set to "*" ** to disable encoding checking. ** ** exec-rel-paths When executing certain external commands (e.g. diff and ** gdiff), use relative paths. ** ** gdiff-command External command to run when performing a graphical ** diff. If undefined, text diff will be used. ** ** gmerge-command A graphical merge conflict resolver command operating ** on four files. ** Ex: kdiff3 "%baseline" "%original" "%merge" -o "%output" |
| ︙ | ︙ |
Changes to src/diffcmd.c.
| ︙ | ︙ | |||
32 33 34 35 36 37 38 | /* ** Used when the name for the diff is unknown. */ #define DIFF_NO_NAME "(unknown)" /* | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 |
/*
** Used when the name for the diff is unknown.
*/
#define DIFF_NO_NAME "(unknown)"
/*
** Use the "exec-rel-paths" setting and the --exec-abs-paths and
** --exec-rel-paths command line options to determine whether
** certain external commands are executed using relative paths.
*/
static int determine_exec_relative_option()
{
int relativePaths = db_get_boolean("exec-rel-paths", 0);
int relPathOption = find_option("exec-rel-paths", 0, 0)!=0;
int absPathOption = find_option("exec-abs-paths", 0, 0)!=0;
if( relPathOption ){ relativePaths = 1; }
if( absPathOption ){ relativePaths = 0; }
return relativePaths;
}
|
| ︙ | ︙ |