Fossil

Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

50 most recent check-ins by user mgagnon

2024-02-04
22:12
Add missing "#include <errno.h>" that was needed on previous commit. ... (check-in: a66a14b0 user: mgagnon tags: trunk)
2023-12-14
16:29
Improve "whatis" output when in "filename" mode and parse supported whatis options when using "fossil all whatis". ... (check-in: e1e9da26 user: mgagnon tags: trunk)
2023-09-19
22:03
Correction of simple typos in patch usage text. ... (check-in: 9b10bf45 user: mgagnon tags: trunk)
2023-05-09
21:44
Fix sub-command parsing in order to have the "gdiff" subcommand of the "patch" command working. ... (check-in: ec782260 user: mgagnon tags: trunk)
2023-04-19
01:46
Produce merge conflict mark during merge when file exist in current version and in version to be merged, but not in common ancestor. ... (check-in: 7c75e47b user: mgagnon tags: trunk)
2023-04-17
21:50
Merge latest changes from trunk. ... (Closed-Leaf check-in: 88a76afc user: mgagnon tags: merge-conflict-when-no-file-on-pivot)
2023-03-16
02:08
Produce merge conflict mark during merge when file exist in current version and in version to be merged, but not in common ancestor.

Related forum discussion including test script: f035bbc8461da6d2. ... (check-in: 04e1674c user: mgagnon tags: merge-conflict-when-no-file-on-pivot)

2023-01-13
18:38
Backout change on "login-group join" command which broke the usage of it outside an opened checkout (using -R flag). Change usage text to match the command behavior properly when using the -R flag. ... (check-in: edf03559 user: mgagnon tags: trunk)
2023-01-11
03:06
merge latest change from trunk. ... (Closed-Leaf check-in: 5d5911e6 user: mgagnon tags: no_ssh_sync_ip_resolve)
02:51
Make proxy setting "system" by default to use http_proxy environment variable. Closer to old behavior and conform with most programs on Unix-like system. ... (check-in: 8f9f2cb7 user: mgagnon tags: trunk)
2023-01-06
21:33
Do not try to resolve the IP from the hostname when syncing using ssh:// protocol. Ssh may use the provided name as an alias defined in ~/.ssh/config which may not be resolvable or even resolve to an unrelated ip. This change can potentially avoid long timeout during name resolution failure. Equivalent to [52f08008e2790a81]. ... (check-in: e5c5622d user: mgagnon tags: no_ssh_sync_ip_resolve)
2023-01-05
17:21
Add the "-f|--file" flag to the "whatis" command which consist to search for any other files in the repo with the exact same content as the given file. ... (check-in: a821cbf5 user: mgagnon tags: trunk)
2022-09-21
17:14
Backup any unmamaged files that are about to be overwritten by an update or merge. Potentially avoid the loss of a local file if the overwrite warning goes unnoticed, in which case undo is useless. ... (check-in: e99e58c5 user: mgagnon tags: trunk)
16:52
Fix a typo in comment (no code change) ... (check-in: 13561519 user: mgagnon tags: trunk)
2022-06-04
16:21
Mention the remote-url url overrite by proxy bug fix in the change log. ... (check-in: 5f609331 user: mgagnon tags: trunk)
2022-05-11
15:42
Fix remote-url overwriting by proxy url bug and use the http_proxy environment variable only when explicitly requested by setting the proxy setting to "system". ... (check-in: a791d5e8 user: mgagnon tags: trunk)
15:34
Only use the "http_proxy" environment variable if it is set to "system", if unset or set to "off", always use direct http connection. ... (Closed-Leaf check-in: a242bb72 user: mgagnon tags: fix_remote_url_overwrite_with_proxy)
15:06
Merge in latest changes from trunk ... (check-in: 5605aef9 user: mgagnon tags: fix_remote_url_overwrite_with_proxy)
2022-05-03
04:02
Simplification by omitting g.url.user and g.url.password backup copy since they are only swapped during short time and are restored right away. Also rename url.canonical backup copy to "proxyUrlCanonical" following name convention of already existing "proxyUrlPath" field. ... (check-in: 78a51953 user: mgagnon tags: fix_remote_url_overwrite_with_proxy)
2022-04-28
14:25
attempt to fix issue where the remote-url saved is overwritten by the proxy url. (issue introduced by checkin [c129f29566439e5c]) ... (check-in: 83ffea65 user: mgagnon tags: fix_remote_url_overwrite_with_proxy)
2022-04-26
14:27
Fix a few **unused-but-set-variable** warnings. (reported by recent clang on MacOS at least). Also fix a **warn_unused_result** warning when calling nice() (gcc 7.5.0 on Ubuntu-18.04 and gcc 9.3.0 on Ubuntu-20.04) ... (check-in: 74250821 user: mgagnon tags: trunk)
2022-04-06
16:42
Minor consistency fix about ambiguous sub-command dispatch and error reporting, see related forum post. ... (check-in: 512905ef user: mgagnon tags: trunk)
2022-04-05
19:51
When reporting the list of matching ambiguous sub-commands, make sure settings with the same prefix are not listed. ... (Closed-Leaf check-in: bb5162fe user: mgagnon tags: ambiguous_cmd_fix)
16:49
Don't give an "ambiguous command prefix" error when reported ambiguous commands are aliases to each others. Assume alias point to same function pointer and are all consecutive in the aCommand[] list. ... (check-in: 862ce7ce user: mgagnon tags: ambiguous_cmd_fix)
2022-03-01
16:21
Fix an unused var warning in windows ... (Closed-Leaf check-in: 169a3dab user: mgagnon tags: nameofexe-appendvfs-check)
2022-02-28
20:49
Since checkin [d8c32ebdff], file_fullexename() function is supported windows, remove comment saying otherwize. (no code change) ... (check-in: 491b986d user: mgagnon tags: trunk)
2022-02-02
21:50
Fix typo in defcsp.md: DSP --> CSP ... (check-in: 9ce4dd0d user: mgagnon tags: trunk)
2022-02-01
21:24
Document the "--chdir" global option. (on "fossil help -o") ... (check-in: 4bb20904 user: mgagnon tags: trunk)
2022-01-27
04:34
Fix an off by 1 bug in "win32_http_request()" which was causing POST request to fail on windows. (e.g. wikiedit preview or upload of a file on the chat) Problem appear in checkin [7a3bf55f5489f534] ... (check-in: e4b49ce3 user: mgagnon tags: trunk)
2021-12-27
12:02
improve warning message for binary merge conflict on update. ... (Closed-Leaf check-in: d4d73989 user: mgagnon tags: binary_merge_conflict_fix)
06:16
Prevent lost of local change on binary files when having a merge conflict using the update command without the --keep-merge-files flag. ... (check-in: d2b02566 user: mgagnon tags: binary_merge_conflict_fix)
2021-11-13
17:48
Add link to "embedded doc" version the file being viewed via the /file page. ... (check-in: d7c40d45 user: mgagnon tags: trunk)
2021-10-29
18:22
When "open" warn about already existing files, also mention -k (--keep) as an alternative to -f (--force). ... (check-in: d70ea01c user: mgagnon tags: trunk)
2021-10-21
01:15
Improve help text of login-group command. Mention about the -R|--repository option and format subcommand description to follow a bit more the conventions of other commands. ... (check-in: b9107e42 user: mgagnon tags: trunk)
2021-04-30
20:44
Fix small typo in comments (no functional changes) ... (check-in: 6f9ed563 user: mgagnon tags: trunk)
2021-04-26
17:57
Automatically add "glob=<str>" to the query string of the /vdiff page when looking at subdirectory history. ... (check-in: d96982fb user: mgagnon tags: trunk)
15:37
Merge latest changes from trunk ... (check-in: 700ae107 user: mgagnon tags: vdiff-context-glob)
15:36
Use URLSearchParams API instead use custom GetQueryStringValue() function. URLSearchParams is support by most browser since 2017. ... (check-in: fab81968 user: mgagnon tags: vdiff-context-glob)
2021-04-23
20:03
Automatically add "glob=<str>" to the query string of the /vdiff page when looking at subdirectory history. ... (check-in: 3e588c82 user: mgagnon tags: vdiff-context-glob)
2020-12-23
05:28
Disable the detailed timestamp popup when browser doesn't support it. (example: Safari) ... (check-in: 5744428b user: mgagnon tags: chatroom-dev)
2020-12-07
16:12
Add support for the "--nested" option to the clone subcommand, so the new clone/open in 1 step usage can be use insde a checkout. ... (check-in: f3d115d9 user: mgagnon tags: trunk)
2018-02-16
14:39
Fix segfault when accessing the initial checkin directory on a fusefs mounted repository. This is on a branch because the Fix is on manifest_file_seek_base() function which is not only fuse-related. ... (Closed-Leaf check-in: 6831769d user: mgagnon tags: fix_fusefs_on_empty_checkin_crash)
2018-01-19
19:15
Remove call of "getuid()" added on previous commit because it is not available on windows. For the pledge() call, always allow "chown" for now, even if not running as root. ... (check-in: 6b41a7e8 user: mgagnon tags: trunk)
18:06
If running "fossil status" when pledge() is enabled, the "chown" promise needs to be added when running as root, otherwise fossil receive a SIGABRT and crash when attempting to call fchown(...) on creation of the .fossil-journal file. ... (check-in: 396513fa user: mgagnon tags: trunk)
2018-01-16
15:44
merge previous fork ... (check-in: dddad4f0 user: mgagnon tags: trunk)
15:41
Fix bad url on "Advanced"/"Basic" link of the timeline page.

The zLink argument of style_submenu_element() should be a literal "%s", otherwise, encoded url parameter value may contain "%" and get corrupt by the vmprintf() call inside.

Problem was happening when clicking on "Basic/Advanced" link on this page: http://www.fossil-scm.org/index.html/timeline?advm=1&chng=src/* ... (check-in: 3c2ef25d user: mgagnon tags: trunk)

2018-01-12
02:48
Add missing history of directory link on /dir page when "All" version is selected. ... (check-in: f77a929e user: mgagnon tags: trunk)
2017-07-10
14:37
test-markdown-render and test-wiki-render command don't require to be inside a checkout. ... (check-in: 1ba3c919 user: mgagnon tags: trunk)
2017-03-15
18:20
Merge latest trunk ... (Closed-Leaf check-in: ad9d418c user: mgagnon tags: dir_history_link)
2017-03-08
22:56
Remove a repeated "are" in hash-policy command help text. ... (check-in: 57765421 user: mgagnon tags: trunk)