Fossil

Timeline
Login

Timeline

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

113 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)
2017-03-03
19:33
Improve stash diff commands when using external diff tool to make it behave a little bit more like the "fossil gdiff" command. ... (check-in: 2a47673a user: mgagnon tags: trunk)
19:29
merge trunk ... (Closed-Leaf check-in: 5e19d731 user: mgagnon tags: stash-gdiff-improvement)
14:31
Add gshow and gcat command to allow to use gdiff-command when diffing the stash against baseline. When using gdiff, call external tool directly with the file from the checkout, it's usefull when merging change manually using the external tool. ... (check-in: 06b16752 user: mgagnon tags: stash-gdiff-improvement)
2017-02-08
18:28
On /dir page, add a link named "[history]" that point to the timeline affecting only the files inside the current directory. Use the "chng=dirname/*" query parameter of the /timeline page)
TODO: Implement the same in Tree-View mode (could add the link beside each directory)
... (check-in: c458c3f6 user: mgagnon tags: dir_history_link)
2017-02-03
15:13
On diff/gdiff command, override "diff-binary" setting when argument "--diff-binary off" command line option is specified, not only with "--diff-binary on". ... (check-in: f62c2470 user: mgagnon tags: trunk)
2016-12-21
17:50
When calling gdiff (or stash gdiff) command between 2 versions, use the filename to prefix the temporary random filename so once inside the external diff program we know what file is being compared.

(pending-review) ... (Closed-Leaf check-in: 856ca01b user: mgagnon tags: gdiff-tmpfilename-prefix)

2016-10-28
22:51
merge fork. ... (check-in: cf2adc71 user: mgagnon tags: trunk)
22:45
Fix a C99-ism. ... (check-in: 61ec7124 user: mgagnon tags: trunk)
2016-06-07
01:26
Fix typo in test_markdown_render function name. (no functional change since the command name was okay). ... (check-in: c94b49ad user: mgagnon tags: trunk)
2016-06-06
21:06
Add test-markdown-render. Does the same as test-wiki-render, but for markdown syntax. ... (check-in: 67f5df3b user: mgagnon tags: trunk)
2015-10-24
14:10
Fix "json timeline" to don't show duplicate files in some chek-ins with merge. Same way CLI timeline was fix on [3c34db8d]. ... (check-in: 26d903de user: mgagnon tags: trunk)
2015-10-21
12:04
Backout changes from timeline_showfiles_fix branch which was attempting to fix discrepancy between CLI and web when listing modified files in checkins.

Make "fossil timeline -v" command behave like the web interface so the CLI timeline command get fixed instead of breaking the web interface. ... (check-in: 3c34db8d user: mgagnon tags: trunk)

2015-10-08
01:37
revert accidental line addition in comment header. ... (Closed-Leaf check-in: f8dbed8e user: mgagnon tags: timeline_showfiles_fix)
01:34
Fix /timeline?v=1 and /info page that were not showing all affected files for check-ins with 2 ancestors or more.

pending-review ... (check-in: 9f7a681d user: mgagnon tags: timeline_showfiles_fix)

2015-08-29
15:24
Merge fix from svn-import branch relative to svndump format version 3 handling. ... (check-in: 7febc318 user: mgagnon tags: trunk)
2015-05-12
10:42
Make addremove command to fail if unprocessed arguments (other than options) are specified. To avoid mis-use where a user could think he can specify a list of directory like with many other commands. ... (check-in: 975600dd user: mgagnon tags: trunk)
2015-03-20
04:35
Add a menu entry on /fdiff, /ci and /vdiff page to control the diff context (dc=<n>) query parameter.

(pending review) ... (Closed-Leaf check-in: eae6f32f user: mgagnon tags: diff-context-menu-entry)

2015-03-03
17:16
Use timelineDate class for the date div on finfo page, just like on timeline page to ensure the date doesn't wrap. (problem reported on ml) ... (check-in: 3dbe76fc user: mgagnon tags: trunk)
2015-02-25
17:19
Usage text only modifications: - Mention about --force. - Show that --git is optional (?--git?) - Add short option (-f for --force and -i for --incremental)

(No change to the code) ... (check-in: c2cdd0e3 user: mgagnon tags: svn-import)

14:51
Change import command to use --git and --svn options instead of "svn" and "git" sub-sub-command to stay compatible with before.

Make sure verify_all_options() fail with specifiying svn only option with --git. ... (check-in: 4d3bb24b user: mgagnon tags: svn-import)

13:54
Merge trunk.. ... (check-in: 7d0ce2b0 user: mgagnon tags: svn-import)
13:52
Integrate svn-import_no-svn-rev branch.. ... (check-in: 16923b5c user: mgagnon tags: svn-import)
2015-02-22
15:59
merge compiler fix for msvc.. ... (Closed-Leaf check-in: 44686ca1 user: mgagnon tags: svn-import_no-svn-rev)
15:31
Safer version of previous compiler warning fix.. ... (check-in: 936ebe67 user: mgagnon tags: svn-import_no-svn-rev)
15:17
Fix compiler warning... ... (check-in: 44011cd2 user: mgagnon tags: svn-import_no-svn-rev)
2015-02-16
13:50
Stay in sync with svn-import... ... (check-in: 04308c21 user: mgagnon tags: svn-import_no-svn-rev)
2015-02-15
19:34
Add the --no-svn-rev command line option to the "import svn" command that will skip the automatic tagging of every checkins with "svn-rev-nnn" tags.

Proposition for the svn-import branch.. ... (check-in: 3c24fede user: mgagnon tags: svn-import_no-svn-rev)

2014-12-06
14:24
In Makefile.mingw: Don't compile some zlib optimized assembler sources when compiled with FOSSIL_ENABLE_MINIZ. ... (check-in: 8a5c394b user: mgagnon tags: trunk)
2014-10-20
21:37
Now use a switch to specify the file/directory to the timeline command.

- Use -p|--path PATH since "-f" is already used as a deprecated options.

- Restore command line arguments parsing of the timeline command as before the cmdline-timeline-enhancement branch so the previous behavior and argument priority stay compatible as before.

(We were not able to specify a checkin prefix or tagname without specifying the ?WHEN? argument anymore.)
... (check-in: 1e870e1e user: mgagnon tags: cmdline-timeline-enhancement)
2014-10-17
21:57
When specifying a path and type (-t) is not specified on the timeline command, force the type to "ci". If someone specify a path, we can assume he want to see only file checkins. ... (check-in: 9cbafad6 user: mgagnon tags: cmdline-timeline-enhancement)
21:12
Honor case-sensitive setting when specifying path to the timeline command. ... (check-in: 5eeb870d user: mgagnon tags: cmdline-timeline-enhancement)
20:44
Fix the special case when path refer to the root of the repository, in that case, just ignore the path argument. ... (check-in: 3706dcb6 user: mgagnon tags: cmdline-timeline-enhancement)
19:20
Add DISTINCT keyword to the main timeline_cmd query to avoid duplicates when specifying file or directory on the timeline command.

(to be checked by someone more experienced in SQL) ... (check-in: dc8a5742 user: mgagnon tags: cmdline-timeline-enhancement)

2014-07-30
15:40
Call verify_all_options() on most of fossil CLI commands.
- Skip all the test-* commands for now (may be unnecessary)
- Skip sha1sum, md5sum and artifact because they can take "-" as argument and verify_all_options() would call fatal. Need to handle those differently...
- Command with subcommands that have their options are remaining: branch, bisect, cache, configuration, json, sql, stash, tag, ticket, user, wiki. (not sure how to handle those yet..)
... (Closed-Leaf check-in: a426154b user: mgagnon tags: verify-all-options)
2014-04-02
03:30
Call fossil_fatal() when fossil_fopen fail on commit_warning(). This fix SIGSEGV when converting CR/NL where files are read-only. (reported on ML) ... (check-in: c3d09540 user: mgagnon tags: trunk)
2014-03-31
18:57
Merge trunk..

including use of the urlData object the global "g" variable which fix byte alignment problem.. ... (Closed-Leaf check-in: 7cb29889 user: mgagnon tags: fix-cat-dash-R)

2014-03-26
21:54
Fix problem when using "fossil cat" when specifying repository via command line argument (with -R) (reported on ML)

Problem was the use of file_tree_name() which call db_must_be_within_tree().

Add a variable in the Global structure 'g' to remember if -R|--repository argument was specified and don't call file_tree_name() if it's the case (since user expect file relative to repository.

(Pending review...) ... (check-in: dc10f8d7 user: mgagnon tags: fix-cat-dash-R)

2014-01-09
11:24
Merge again checkout_on_root_fix.

Fix more cases when working from '/', should not affect when working normally. ... (check-in: af194dbb user: mgagnon tags: trunk)

2014-01-08
17:40
Fix some remaining corner cases when having a checkout on '/'..

Update command:

  • Was asserting when localroot is '/'

file_cannonical_name():

  • Return '/' instead of '.' when refering to '/'.
  • Avoid the double '/' on beginning.
  • Refactoring to avoid some duplicated code.

file_relative_name():

  • Handle properly relative path when working on '/'.
... (Closed-Leaf check-in: 89ad123f user: mgagnon tags: checkout_on_root_fix)
04:59
Remove traces.

Waiting approval to merge on trunk.. ... (check-in: 84abd455 user: mgagnon tags: checkout_on_root_fix)

04:42
Fix db_open_local() fonction so it find the local checkout database on "/". It was working inconsistently depending what was the current directory.

** Even if fossil is not the right tool to version files on the root of the system, I found it very usefull to track what file change on my system

Tested on Linux and MinGW (Windows 8.1) ... (check-in: be993c47 user: mgagnon tags: checkout_on_root_fix)

2013-11-22
01:14
Merge in hide-diff-on-vdiff_page...

Which now give possibility to hide or show full detailed diff on vdiff page. (when clicking on 2 nodes on timeline) Just like the /info page. ... (check-in: 74a4db25 user: mgagnon tags: trunk)

01:09
merge in latest trunk ... (Closed-Leaf check-in: 8af8232f user: mgagnon tags: hide-diff-on-vdiff_page)
2013-11-13
03:51
Merge latest trunk. ... (check-in: 17f6b655 user: mgagnon tags: hide-diff-on-vdiff_page)
2013-10-26
19:17
Merge latest change from trunk. ... (check-in: eb1b310f user: mgagnon tags: hide-diff-on-vdiff_page)
2013-10-19
06:47
Change /vdiff page (used when clicking on 2 nodes on /timeline), so it honor the show-version-diffs settings. Just like the /ci page. Also add the "Hide diff" button to hide the diffs manually.

The /vdiff page can have a lot of files to diff depending on which version are selected, so the capability to show only list of files that change is very convenient to spot interesting files. ... (check-in: d7dc4158 user: mgagnon tags: hide-diff-on-vdiff_page)

2013-10-16
04:09
Fix behavior of "--limit | -n" argument of the timeline command to fit description from usage, which is also the behavior of the "n=" parameter of the /timeline webpage.

Now -n <n> define the number of entries while before, it was limiting the number of lines.

(pending review...) ... (check-in: 453a060c user: mgagnon tags: timeline_cmd_dash_n_fix)

2013-08-25
03:25
Move some posix only includes so they are not used on _WIN32. Can compile again on MinGW. ... (check-in: 8278a03f user: mgagnon tags: ssh-test-http)
2013-08-15
12:14
Add details about the URL argument on the clone command help text and refer to the clone command usage on other commands that have a URL argument. (sync, push, pull, remote-url)

Pending review. ... (Closed-Leaf check-in: b1dd871c user: mgagnon tags: clone_help_text_improvement)

2013-07-10
21:33
another patch version for ssh improvement from Andy Bradford. ... (Closed-Leaf check-in: a8c37c2c user: mgagnon tags: andy_bradford_ssh_imporvement_patch_2)
21:31
save first version of patch for ssh from Andy Bradford (from list) ... (Closed-Leaf check-in: 979a75de user: mgagnon tags: andy_bradford_ssh_imporvement_patch_1)
2012-09-12
16:24
Need this "-e none" options to ssh.. if not, ssh can process the escape caracter to process command from data that's goes to fossil proces.. ... (Closed-Leaf check-in: 297cb3e5 user: mgagnon tags: mg_sshfix)
15:27
Now, just call /bin/sh as command argument.. I don't have problem with mail checking and motd and modification is very simple..

- Have to check if it work in all conditions and all systems.

- Might not work for settups where server use a restricted shell.. ... (check-in: 531a58fd user: mgagnon tags: mg_sshfix)

12:59
Seems to fix it.. will try on the real conditions.. ... (check-in: e8fac25a user: mgagnon tags: mg_sshfix)
02:19
work time to time.. *** rely on a delay, which is not good don't work all the time... need to build more solid logic.. ... (check-in: 5d00d241 user: mgagnon tags: mg_sshfix)
00:35
attemp to fix ssh problem on debian linux host when non interactive shell still print some message (motd and mail checking stuff).
*** not really working yet..
... (check-in: 66a45382 user: mgagnon tags: mg_sshfix)
2012-06-11
17:33
merge trunk again... (previous merge was not from latest trunk from fossil-scm.org) ... (Closed-Leaf check-in: 7a57ab64 user: mgagnon tags: mgagnon_fix)
17:23
Merge in Trunk... ... (check-in: c109e66d user: mgagnon tags: mgagnon_fix)
2012-03-29
14:54
Add vim modline everywhere ... (check-in: a496d8e8 user: mgagnon tags: mgagnon_fix)
14:48
merge in trunk ... (check-in: 150074d1 user: mgagnon tags: mgagnon_fix)
2012-01-22
22:02
merge with trunk ... (check-in: e1c424cb user: mgagnon tags: mgagnon_fix)
2011-12-08
02:05
merge with latest trunk ... (check-in: 4d392366 user: mgagnon tags: mgagnon_fix)
2011-11-11
12:13
Start a branch with fix to make work consistently a local checkout directly on root ("/"). ... (check-in: 518e1f8d user: mgagnon tags: mgagnon_fix)