Fossil

Timeline
Login

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

23 check-ins related to "ui-local-diff"

2023-01-24
16:34
Make all variable declarations C89 compliant. ... (Leaf check-in: 462eb0cca0 user: drh tags: ui-local-diff)
03:59
Wrapping a few calls to vfile_check_signature() from the new local diff code in unprotect/pop call pairs to squish a DB protection error. ... (check-in: 1b3ef05ef9 user: wyoung tags: ui-local-diff)
03:29
Brought the ui-local-diff branch up to date relative to trunk. It isn't a simple merge, primarily due to all the changes to /vdiff and /fdiff made over the past 2 years. It seems to work as well as it originally did, but it isn't ready to merge down to trunk as-is. ... (check-in: 76fa165763 user: wyoung tags: ui-local-diff)
03:18
Replaced a standalone "diffFlags" variable in the /fdiff handler with use of the new DiffConfig.diffFlags member. No functional change, just a code cleanup found while working on another branch. Making it on trunk to keep that branch's diffs minimal. ... (check-in: 65d97f23f6 user: wyoung tags: trunk)
2023-01-23
00:12
Add /json/settings/get and set APIs, per discussion in [forum:04b7159d63d4abe4|forum post 04b7159d63d4abe4]. ... (check-in: a80f27485a user: stephan tags: trunk)
2021-03-13
18:13
Squished a warning about */ within a C block comment. ... (check-in: e7be14afa7 user: wyoung tags: ui-local-diff)
2021-02-15
22:45
[WIP] Removed the conditional code around some options: up to five "extras" WILL be shown by default; single-line difference reports WILL be shown first (ahead of those with "diff blocks") and "diff blocks" WILL have dividers. Removed a number of my "place holder" comments. ... (check-in: 996a056f9d user: graham tags: ui-local-diff)
15:35
Restored a call to "mimetype_from_name()" in local-diff mode. ... (check-in: e494b97954 user: graham tags: ui-local-diff)
2021-02-14
21:28
Brought graham's ui-local-diff branch up to date with respect to trunk. This is not a simple merge, because it had to accommodate several conflicting changes, so it needs to be re-checked for sanity before being merged down to trunk. Also, some of the changes I made simply reduce the size of the resulting diff relative to trunk and need to be reverted; these are primarily 2-line splits of "else/if" so the branch-specific change doesn't repeat the following "if" condition, which is now the "else if" condition. I think this sort of thing aids understanding of the diff, even though it breaks the style guidelines. ... (check-in: 0516f4d3c8 user: wyoung tags: ui-local-diff)
02:16
Update the built-in "pikchr" to a version that supports the "this" objectname. ... (check-in: f260b75fb9 user: drh tags: trunk)
2020-06-02
16:20
Added a "no changes" messages if no local files are different; report trying to view a non-existent local file. Tidy-up and added config-options and "what I did" block near top of info.c. ... (check-in: a955c80b43 user: graham tags: ui-local-diff)
13:52
Merge in Markdown changes from trunk. ... (check-in: bf5a21e036 user: graham tags: ui-local-diff)
12:35
Change the callback function names in markdown_html.c so that they match the pointer names in markdown.c. No functional changes. ... (check-in: 485fda60c3 user: drh tags: trunk)
2020-06-01
22:12
Added ability for "/local" to display files present in the checkout but not managed by Fossil (cf. "fossil extras"). ... (check-in: 07829f371b user: graham tags: ui-local-diff)
2020-05-31
11:22
Fixed diff of an individual checked-out file (/localdiff) so it compares against the correct artifact when on a branch. ... (check-in: 5cbb78b486 user: graham tags: ui-local-diff)
2020-05-30
22:22
Distinguish local-changes from changes from a merge. ... (check-in: db758a3454 user: graham tags: ui-local-diff)
19:32
Merged in UUID-renaming changes from trunk. ... (check-in: 1fd9acb97c user: graham tags: ui-local-diff)
16:51
Added "& server" to the "native" row in the characterization table at the top of fossil-v-git.wiki. ... (check-in: 6c04e42f76 user: wyoung tags: trunk)
16:15
Make two passes through list of local changes so all "one-line" entries are listed first. ... (check-in: bc56945ea4 user: graham tags: ui-local-diff)
2020-05-28
21:39
Initial implementation to show "local (uncommitted) changes" in Fossil's UI. Not yet tested to destruction, but fails no more errors in the test-suite than trunk. Currently there are no links to the new page: manually navigate to "/local" (a variant of the "/ci" page). ... (check-in: ccebe22576 user: graham tags: ui-local-diff)
12:01
Fix on Check-in pages to preserve the current "diffType" setting (side-by-side or unified) when toggling the show/ignore whitespace option. ... (check-in: e6ab947e1e user: graham tags: ui-local-diff)
11:42
Cosmetic fix for "/file?name=xxxx" where ci defaults to "tip". Title used to be "xxxx at []"; now it is "xxxx at tip" which matches the behaviour of "/file?name=xxxx&ci=tip". ... (check-in: 551676bc28 user: graham tags: ui-local-diff)
09:47
Added /fileedit to changes.wiki. ... (check-in: 2c9aa1b939 user: stephan tags: trunk)