Fossil

Timeline
Login

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

43 check-ins using file src/main.c version 08d5ebebb2

2011-10-20
02:03
Sorry, wrong branch! started changelog for 1.20 release. Closed-Leaf check-in: a942086390 user: stephan tags: declined
2011-10-15
14:33
Updated comments. Slightly more centralization of sbsdiff table generation. check-in: c5ac4f800e user: jan tags: jan-sbsdiff
12:49
Fix bug which disabled patch file generation. check-in: dc27e13460 user: jan tags: jan-sbsdiff
12:22
Make sure sbsdiff lines are escaped properly. Started adding side-by-side diff support to fdiff. check-in: ff41d4be8a user: jan tags: jan-sbsdiff
10:40
Update the built-in SQLite and the SQL command-line shell to the latest code from the SQLite trunk: version 3.7.9 alpha. This fixes some warnings that started appearing after upgrading to gcc 4.6.1. check-in: 3dd0c15583 user: drh tags: trunk
10:17
A very simple fix to the annotate memory leak problem. check-in: 9929bab702 user: drh tags: trunk
00:26
Code documentation. check-in: 9b7955b5a4 user: jan tags: jan-sbsdiff
00:10
The link <strong>p</strong> 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 <strong>d</strong> left. check-in: 4bae75a08e user: viriketo tags: annotate_links
00:06
The plink is not needed at all in the annotate query check-in: 40cbb69c4f 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 <strong>p</strong> to the annotation of the version previous to that line change, and a link <strong>d</strong> 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: 9e3b6ad052 user: viriketo tags: annotate_links
22:21
Added two (local) options to sbsdiff (allow expansion and max columns limit), though they can't be changed in runtime yet. Added some missing error handling. check-in: 47cdbbf2fb user: jan tags: jan-sbsdiff
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: bb49278a8a user: viriketo tags: declined
22:17
Minor diff view change for the black'n'white skin. check-in: 07714601de user: jan tags: jan-sbsdiff
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: e1a7a1d9e2 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: 60c6197c8a user: viriketo tags: declined
19:53
Same trouble as [bf480a29a6] but for the merge5 test. check-in: 129605856a 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: e46be99ff4 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: bf480a29a6 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: 107e605f41 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. <b>Update:</b> Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] check-in: 409f370a6d user: viriketo tags: declined
15:41
Updated the built-in skins for sbsdiff. check-in: bb76b57aa2 user: jan tags: jan-sbsdiff
00:06
Add /*sort*/ marks to some SQL queries to disable warnings about sorting without an index. check-in: fff43ebb5b user: drh tags: trunk
2011-10-13
23:48
Started adding support for showing side-by-side diffs in the web ui. check-in: a6a8e89413 user: jan tags: jan-sbsdiff
23:47
Provide an option to enable the /test_env URL for all users. Optionally display cookie values in the /test_env URL. check-in: 4d32db8ef8 user: drh tags: trunk
16:39
Update the SQLite command-line shell to the latest from the SQLite source tree. check-in: 862d7dbf59 user: drh tags: trunk
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: 399c0ddae4 user: viriketo tags: trunk
02:47
Create new branch named "ashish-ipv6" check-in: 10e1071461 user: ashish tags: ashish-ipv6
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: 9fe787ec03 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: 0a7ab3ccb0 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: 79c31f9b73 user: viriketo tags: trunk
2011-10-11
20:46
Update the build-in SQLite and the SQLite-shell to the latest code from the trunk of the SQLite source tree - version 3.7.9 alpha. check-in: 55fb082ae5 user: drh tags: trunk
2011-10-10
20:02
Fix some compiler warnings. check-in: 496edc2176 user: drh tags: trunk
19:33
Fix a C++ comment in sha1.c. Fix a help text typo. check-in: a6f3dd1ce7 user: drh tags: trunk
13:19
Update the "scrub" command to drop the accesslog table when the --verily option is used. check-in: 16a6dfefd1 user: drh tags: trunk
13:05
Additional formatting fixes: shorten lines to 80 characters or less. check-in: c1d78e0556 user: drh tags: trunk
12:59
Adjust SSL trust fix to skip prompting for certificates that already have an explicitly negative trust setting. check-in: 636804745b user: mistachkin tags: trunk
12:55
Fix indentation and formatting in http_ssl.c. Limit line length to 80 characters per the coding style spec. check-in: 5eb8f0157a user: drh tags: trunk
11:38
Merge the ssl-trust-fix branch into trunk. check-in: 0554dbd04a user: drh tags: trunk
08:56
Fix constant prompting on already saved SSL certificates that are not trusted for some reason (e.g. host mismatch, etc). Closed-Leaf check-in: 25169506b7 user: mistachkin tags: ssl-trust-fix
2011-10-07
19:55
Documentation update. check-in: c0b6c28d29 user: drh tags: trunk
18:38
Update the built-in SQLite to the latest 3.7.9 alpha. check-in: f678a7b948 user: drh tags: trunk
2011-10-05
16:58
fixed [fc825dcf52] check-in: 4b0f813b8c user: ron tags: trunk
08:00
Added (--args -) to read from stdin. Theoretically now also strips windows newlines, but i do not have a broken editor to test that with ;). check-in: 080d27a6b2 user: stephan tags: trunk