Fossil

Timeline
Login

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

92 check-ins by user viriketo

2016-04-08
13:03
Updating from trunk. ... (Leaf check-in: a1b09559 user: viriketo tags: viric_flavour)
2015-02-09
11:00
viric's flavour of fossil, which includes the cherry-picked changes out of trunk: [d0b1b1114] [39e165afb] [dad37196f] [f309130a8]. This outdates the branch annotate_links ([f14798e0e3]), which has some extra changes, some hard to port.

This lets the browser pick the right program to open them straight. ... (check-in: b31afcc2 user: viriketo tags: viric_flavour)

10:56
Add a link in the checkin page to show the changes in the branch in respect to the parent branch. It finds the last merge from parent to the current branch for the comparison. ... (check-in: f309130a user: viriketo tags: viric_pbranch)
10:39
Fixing parentheses closing in the finfo page. ... (check-in: 042ec2b9 user: viriketo tags: trunk)
10:37
Show the branch in the checkin description (artifact and file diff pages). ... (Closed-Leaf check-in: dad37196 user: viriketo tags: viric_showbranch)
10:30
New way to calculate the automatic branch colours.

It's a matter of taste, but I prefer this way; the colours often become more different. ... (Closed-Leaf check-in: 39e165af user: viriketo tags: viric_newcolours)

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)

2013-03-01
11:45
In the finfo page, also print the comment parsed with %w, like in the timeline. Links or wiki syntax was not resolved. ... (check-in: 380485de user: viriketo 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:09
Fixing the rebuild of the ticket databases, so they get properly the comments included by manifests' "+comment".

drh says not to be able to reproduce this issue, but here is a fix that makes all work for me.

Feel free to rewrite this patch to match your taste. ... (check-in: 9cca9398 user: viriketo 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-01-03
10:31
Updating from trunk. I've left some merge conflicts to solve (annotate, diff) ... (check-in: b5b8448e user: viriketo tags: annotate_links)
2012-10-24
13:43
Removing superfluous parenthesis in html output. ... (check-in: ad9cf1ca user: viriketo 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)
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)
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-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-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)
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)
2011-11-03
08:06
Correct fix in [d084043f79827]. This attempt at fixing the problem is closed. ... (Closed-Leaf check-in: a7caf198 user: viriketo tags: fix_mlink)
2011-11-02
21:53
Trying to fix some cases where the mlink table is bad build due to delta manifests.

In this checkin, I fix the case when the child delta manifest changed back the file from some contents to those of its baseline manifest. The 'info' page was not showing these kind of changes.

Should close the ticket [2ce64a315f]. ... (check-in: cf5f2c4e user: viriketo tags: fix_mlink)

2011-10-19
20:28
Bringing back the fixes for the 'make test' from [bf480a29a6], [e46be99ff4], [129605856a], for an eventual merge to trunk. ... (check-in: 5692702d user: viriketo tags: maketest_fixes)
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)
20:55
Adding a boolean setting to choose the use of 'targets' in the anchors href. Default enabled.

Related to the thread starting at http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06588.html ... (check-in: d29df2f0 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)
19:45
Should fix ticket [f0f9aff371f2].

Until now, the annotate_cmd was taking the last (or any?) checkin that had the artifact to be annotated, totally unrelated to what version is checked out.

I made annotate_cmd respect the checkout, and annotate only from the past until the checked out version. This makes the command slower, but at least does what I'd like it to do. Maybe someone else can come up with a faster or simpler implementation.

I changed the compute_direct_ancestors code so I could call it twice in a single run. ... (Closed-Leaf check-in: c7c4279f user: viriketo tags: annotatecmd_fix)

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)
22:16
Reporting the number of merge conflicts at the end of merge, as with update. I think the information is of value to the user.

I think that had to be introduced in [070ce24d838a6], from its comment, but that change made the opposite of commented. ... (check-in: e1a7a1d9 user: viriketo tags: declined)

20:25
Making fossil warn about a conflict, if an update operation overwrites an extra file. This should close ticket [953031915f]. ... (check-in: 60c6197c user: viriketo tags: declined)
19:53
Same trouble as [bf480a29a6] but for the merge5 test. ... (check-in: 12960585 user: viriketo tags: declined)
19:46
Fixing the merge5 test, for it to run when out of a checkout. The same kind of fix as [0a7ab3ccb0]. ... (check-in: e46be99f user: viriketo tags: declined)
19:01
Fixing the merge_renames test; fossil was using $HOME somehow. I noticed it running the test in an environment without a valid $HOME path (the nix package building). fossil refused to run the 'fossil new' inside the merge_renames test. ... (check-in: bf480a29 user: viriketo tags: declined)
16:12
Merging the extended_ci_names branch, that introduces more ways of naming checkins in diff and update operations. ... (check-in: 107e605f user: viriketo tags: declined)
16:11
Merging the annotate_noleak changes, about removing an important memory leak in the annotate operation.

It also fixes some blob behaviour in blob.c and content.c.

Update: Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] ... (check-in: 409f370a user: viriketo tags: declined)

2011-10-13
12:56
Fixing the usage() calls in stash.c, as it duplicated the word stash; it was giving messags like "Usage: fossil stash stash pop". ... (check-in: 399c0dda user: viriketo tags: trunk)
2011-10-12
17:41
Adding a more options at naming commits for diff and update commands.

I wrote a new function that allows more kind of specifications for a checkin uuid: checkout, parent and pivot:id1:id2.

If there was a way to discover the 'parent branch' of the current checkout, there could be a 'parentbranch' naming too.

I think this makes the life easier, specially for the pivot:id1:id2 case, about seeing the difference between a branch and its parent branch. I find myself using often the test-find-pivot command just to get that diff or update to the pivot, to check changes between the current branch and the parent branch. ... (Closed-Leaf check-in: 9fe787ec user: viriketo tags: extended_ci_names)

16:20
Fixing the merge_renames test, so it accepts being called out of a repository. The message given by fossil when trying 'info' out of a repository had changed. ... (check-in: 0a7ab3cc user: viriketo tags: trunk)
15:21
Making the http ssl code output the verification error, in case of verification failure.

I also make the user question state the host the certificate is related to. ... (check-in: 79c31f9b user: viriketo tags: trunk)

2011-10-03
16:34
Disabling Cache-control: no-store, as it made firefox forget about form field contents on back/forward in history.

Resolution achieved by a minimal consensus at this thread on the mailing list. ... (check-in: 3fac77d7 user: viriketo tags: trunk)

2011-09-13
17:18
The Label list was not properly freed in some cases; looking at the annotate of 'win/Makefile.msc' was triggering the case. ... (Closed-Leaf check-in: 4860d9f2 user: viriketo tags: annotate_noleak)
16:43
Getting in the changes reducing the leak on annotate. In the fossil mailing list, I received only opinions in favour of getting mallocs and frees properly paired, so I think noone will refuse the change. ... (check-in: 7870a89b user: viriketo tags: annotate_noleak)
2011-09-06
20:30
Documenting the Label structure I introduced. ... (Closed-Leaf check-in: 58a02a2e user: viriketo tags: label_linkedlist)
07:33
Two fixes about localtime:
  • The ci_edit page tells the user that it asks UTC time
  • The object_description gives links to localtime (if it's set in the config). Otherwise the links were not pointing at the concerning checkin.
... (Closed-Leaf check-in: 1765c18d user: viriketo tags: localtime_fixes)
2011-09-04
22:14
Implementation of a linked list to solve the memory leak described in a TODO in [e2ebb1f5cae8].

This code is slower than having the memory leak, and at the end, it was not a big memory leak. Let's say, 10 byte per revision involved in a file annotate. If a file has 30000 revisions, it may go around 300KB then.

For this leak to be noticeable (as we have a content cache until 50MB), it would mean having above a milion revisions for the file annotated.

So, I keep this in a branch apart, as maybe the leak is worth the faster code. I have not measured the speed difference though. ... (check-in: ef8266b7 user: viriketo tags: label_linkedlist)

21:39
Reducing the leak of annotate even more.

I wrote a TODO in the file, for a leak still present and relevant for files modified by many versions, but that requires harder work to get right. ... (check-in: e2ebb1f5 user: viriketo tags: annotate_noleak)

21:02
Making annotate not segfault for the complex test case I have. There is still a little leak... but muuuch smaller than it was. ... (check-in: fa760a24 user: viriketo tags: annotate_noleak)
20:43
Updating from trunk to get the latest code. ... (check-in: 73b6ff49 user: viriketo tags: annotate_noleak)
20:41
What I did to get the 'annotate' command not leak.

Notice that I disabled again the check for blob_is_reset, as in trunk. ... (check-in: 7ad4dfbe user: viriketo tags: annotate_noleak)

2011-09-01
20:38
I think I fix a possible bug on platforms where 'char' has signed meaning, on the code about noting the 'rcvfrom' ipv4 address. ... (Closed-Leaf check-in: 9ce6771c user: viriketo tags: ssl_peer_ip)
20:33
Adding some ipv4-only code to get the ip where we took the content from for the https connections. The "rcvfrom" information was lost in the case of https connections.

I don't know how to make it work well for ipv6 too. ... (check-in: daa6a0eb user: viriketo tags: ssl_peer_ip)

17:45
Merging the unwanted two trunk leaves. ... (check-in: a22c3817 user: viriketo tags: trunk)
17:44
Fixing typo in the 'fossil configuration' command line help. ... (check-in: cd8041b1 user: viriketo tags: trunk)
2011-08-31
20:34
Adding a new test I wanted to write. I just saw this in my local copy, but I really forgot if I finished it or not. ... (Closed-Leaf check-in: 62f4a8a6 user: viriketo tags: merge_renames)
09:00
I fix the html related to the artifact description, about pairs of ul.

I also disable the [view] link in the 'fdiff' ui page, because we already provide a link to the artifact in the h2 titles stating the artifacts compared. ... (check-in: e55105e5 user: viriketo tags: artifact_description)

08:34
Fixing the display of the artifact description when the artifact appears as different filenames. ... (check-in: f8eff242 user: viriketo tags: artifact_description)
08:24
Trying to improve the ui artifact description to something easier to parse by the human eye.

I'd still like to have the branch name of every checkin, but I still don't know how to get it. ... (check-in: d34a1b9f user: viriketo tags: artifact_description)

2011-08-30
08:01
Updating from trunk to keep up working in the branch with the most recent fossil code. ... (check-in: 75aaf30a user: viriketo tags: merge_renames)
08:00
More comments about tests I'd like to write. ... (check-in: 281e5121 user: viriketo tags: merge_renames)
2011-08-05
12:43
Taking a note about a new test I should write about merges with renames.. ... (check-in: b78d9999 user: viriketo tags: merge_renames)
2011-06-17
19:09
Adding a first test for merging branches with renames. Related to ticket [554f44ee74]. ... (check-in: 8526b151 user: viriketo tags: merge_renames)