Fossil

Timeline
Login

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

2013-03-14
14:48
Merging from trunk to get the annotate fixes. Trivial conflict solved.    Update: the new branch viric_flavour ([b31afcc2ca]) includes most of these changes in a more recent fossil. Closed-Leaf check-in: f14798e0 user: viriketo tags: annotate_links
14:18
Update the "annotate" command and webpage to prefer to take changes from direct ancestors of the version being analyzed, rather than more recent changes on branches. check-in: e320f0cd user: drh tags: trunk
2013-02-15
14:37
Fixing annotate. It was hanging. check-in: 96c31335 user: viriketo tags: annotate_links
2013-02-12
20:17
Picking recent trunk fixes on tickets. check-in: 7a8ed6d7 user: viriketo tags: annotate_links
19:23
Revised ticket processing to align with coding style guide, and for clarity of presentation. check-in: 67f787dc user: drh tags: trunk
2013-02-11
20:36
Fixed the auto-width diff display. check-in: 1b07b3d9 user: viriketo tags: annotate_links
19:46
Making it build; diff doesn't work well, about with calculation, yet. check-in: facd98ce user: viriketo tags: annotate_links
19:30
Merging from trunk. I still have merge conflicts since my previous merge. check-in: bdeb633a user: viriketo tags: annotate_links
2013-02-08
09:37
Eliminate use of starts_with_utf16(be|le)_bom functions, starts_with_utf16_bom should be enough. External code will typically call "starts_with_utf16_bom" first, and if it returns true call "blob_to_utf8_no_bom" converting it to utf-8. There is no reason any more then for external code to know wheter the BOM was le or be. check-in: fab09a17 user: jan.nijtmans tags: trunk
2013-01-03
13:38
regexp.c (re_next_char): 3 off-by-one errors, and disallow characters > 0x10ffff unicode.c/diff.c: fix some gcc warnings check-in: a13e0a20 user: jan.nijtmans tags: trunk
10:31
Updating from trunk. I've left some merge conflicts to solve (annotate, diff) check-in: b5b8448e user: viriketo tags: annotate_links
09:27
Patched re_space_char() to conform to its docs (now recognizes \r as a space). check-in: c77995e6 user: stephan tags: trunk
2012-10-17
14:05
Picking the latest fix in trunk check-in: 39a59de8 user: viriketo tags: annotate_links
14:04
I think I fix the previous commit, that should avoid committing a ticket manifest if it has no changes. It was ignoring the ticket appends.    In the case of only appending, the user was not notified not properly redirected, and the ticket chagnes were not committed.    Still, there should be some kind of warning to the user, if it ends up in such situation, I think. check-in: f02946aa user: viriketo tags: trunk
2012-10-16
12:19
Updating from trunk. check-in: 3cdf9480 user: viriketo tags: annotate_links
12:18
Fixing buffer overflows in the width calculation of sbsDiff. check-in: 314a2943 user: viriketo tags: annotate_links
01:11
unused variable includeDotFiles struct utimbuf -> struct _utimbuf (compiler warning with mingw-w64) a few "const" additions (lower memory footprint, allows C-compiler to optimize better) check-in: 6032dd51 user: jan.nijtmans tags: trunk
2012-10-09
14:19
Adding mime types for some openoffice documents check-in: 770cf7fc user: viriketo tags: annotate_links
14:01
Fixing the vdiff submenus, so they behave as usual (for this branch) check-in: 4cf8c3d3 user: viriketo tags: annotate_links
13:53
Adding back the branch telling at checkin info for vdiff. check-in: e29d3822 user: viriketo tags: annotate_links
13:48
Updating from trunk. I solved some merge conflicts: 1) the checkin info in the vdiff page, taking that from trunk, and 2) the vdiff menu options, which I tried to get similar to what I had in the branch. check-in: f4b082d4 user: viriketo tags: annotate_links
13:30
Making the raw page download guess the mime type based on filename also for attachments, not only repository files. check-in: 5f3916ac user: viriketo tags: trunk
2012-08-20
13:20
Fixing the automatic calculation of sbs line length, for the case of TABs and UTF8 sequences. I also set the tab size to 4 spaces. check-in: 36cdc17c user: viriketo tags: annotate_links
2012-08-08
13:46
Updating from trunk. I solved three merge conflicts about hyperlinks. check-in: 08db3204 user: viriketo tags: annotate_links
13:22
When using /zip or /tarball without a UUID, use "trunk" instead of "tip" as the default. Ticket [300fc543b24250e256] check-in: eb0933ca user: drh tags: trunk
2012-04-22
10:09
Merging from trunk.    I solved some conflicts on the report for merges (cherrypick/...), adding some comments, and adopted the trunk solution to unchanged checkin messages. check-in: 40debe47 user: viriketo tags: annotate_links
09:56
Fix a comment in my previous commit. check-in: 515e7fa0 user: viriketo tags: annotate_links
09:50
I change the branch colour algorithm, for another one I can understand better. No HSV magic; simply few combinations of RGB values based on hash. This algorithm should give either different or equal colours, and not similar colours.    This way I think the hash differences are more likely to give different colours.    I had the feeling that we were getting too often too similar colours for our branches, but I can't prove that mathematically. check-in: 243d99d1 user: viriketo tags: annotate_links
2012-04-21
18:06
Enhance to #ifdef lines to enable Fossil to build and run on haiku. check-in: b2cc8710 user: drh tags: trunk
2012-04-05
14:31
Made 'fossil commit' detect if the editor changed the file. If the editor did not change the file, ask confirmation, as if it was an empty comment.    I think svn behaves this way. check-in: d2a733be user: viriketo tags: annotate_links
14:19
Allowing partial commit for merges not adding a parent to the checkin. check-in: a610b256 user: viriketo tags: annotate_links
14:05
I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick. check-in: ba402f33 user: viriketo tags: annotate_links
2012-04-04
16:20
Updating from trunk to get the latest trunk fixes. check-in: b7f3a32d user: viriketo tags: annotate_links
16:19
Fixing a jump on uninitialized data on web sbs diff. Noticed after having seen text file corruption in the web SBS, and traced by valgrind. check-in: 92b2a5c3 user: viriketo tags: annotate_links
2012-04-02
01:19
Fix a bug in the previous check-in. check-in: b65ed0b1 user: drh tags: trunk
2012-03-18
19:46
Fixing an unnecessary heap accumulation. check-in: 801a7595 user: viriketo tags: annotate_links
14:53
Making the side-by-side diffs autocalculate the width, by default. check-in: 16397d86 user: viriketo tags: annotate_links
14:03
Adding a link to vpatch in vdiff. check-in: e926e0b4 user: viriketo tags: annotate_links
13:54
Add a link for a non-detail view in vdiff. check-in: dc313b15 user: viriketo tags: annotate_links
2012-03-01
22:30
Merging from trunk. I manually solved the conflict widening the user name on annotate. check-in: f201fbae user: viriketo tags: annotate_links
22:28
Fixing 'patch' on the fdiff page. check-in: 675b49ef user: viriketo tags: annotate_links
13:40
Leave the -original, -baseline, and -merge files around when an update or merge conflicts due to binary files. check-in: 471044f6 user: drh tags: trunk
2012-02-18
10:37
Show the branch of the checkin in the vdiff page. check-in: a50a28bb user: viriketo tags: annotate_links
2012-02-17
23:16
Fix on the get_parent_branch_rid - wrong variable. check-in: 75b4676c user: viriketo tags: annotate_links
22:57
Adding a vdiff link to the info page, "vdiff to the parent branch". check-in: 9f208c68 user: viriketo tags: annotate_links
22:52
Adding a kind of symbolic name that returns the last checkin of the parent branch merged into the requested branch. For example, if annotate_links forked from trunk, "pbranch:annotate_links" returns the rid of the last time trunk was merged into annotate_links. check-in: d560953c user: viriketo tags: annotate_links
21:47
Removing the 'd' link on the annotate page for lines introduced in a checkin with the parent don't having that file. check-in: 4036b5df user: viriketo tags: annotate_links
21:36
Merging what I had at [61523cbe67] over trunk related to href targets. check-in: d5129ae1 user: viriketo tags: annotate_links
21:29
Merging from trunk, to get the branch up to date. check-in: 6b7ddfef user: viriketo tags: annotate_links
21:06
copy/paste doc correction. check-in: 365fe4af user: stephan tags: trunk
2011-10-18
21:20
Adding a space I forgot in in the html output. Closed-Leaf check-in: 61523cbe user: viriketo tags: targets_setting
19:49
Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. check-in: ef5d2176 user: viriketo tags: annotate_links
2011-10-17
23:12
Fix typo in warning message. check-in: c80ee413 user: drh tags: trunk
2011-10-15
00:10
The link p in the annotate page was totally bad implemented. As I don't see an easy way to implement it, I take it out. There is only d left. check-in: 4bae75a0 user: viriketo tags: annotate_links
00:06
The plink is not needed at all in the annotate query check-in: 40cbb69c user: viriketo tags: annotate_links
2011-10-14
23:38
Starting a branch to add more information into the annotate web page.    I added a link p to the annotation of the version previous to that line change, and a link d to the checkin file diff that introduced the given line.    I'd want also the links to bring the users to the concerning line of annotate; we should have something like line numbering and line anchors, like the artifact page. check-in: 9e3b6ad0 user: viriketo tags: annotate_links
22:20
Making 'fossil merge' also report a conflict for extra files overwritten. Like [60c6197c8a], but for the merge operation. Related to ticket [953031915f]. check-in: bb49278a user: viriketo tags: declined