Fossil

Timeline
Login

Timeline

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

106 check-ins using file src/stash.c version 7b6b458d

2011-10-26
15:07
Update test cases to work with or without the USE_TCL_EVALOBJV compile-time option enabled. ... (check-in: 7d43a362 user: mistachkin tags: tcl-integration)
14:57
Perform lazy setup of the Tcl integration subsystem when it is actually enabled. ... (check-in: e4958150 user: mistachkin tags: tcl-integration)
2011-10-22
15:42
Added forceLogout option to json/user/save. ... (check-in: 98debcac user: stephan tags: json-multitag-test, json)
2011-10-21
21:55
Merge the side-by-side diff spacing bug fix into trunk. ... (check-in: 54e730c3 user: drh tags: trunk)
21:50
Fix a spacing bug in the display of side-by-side diffs. ... (Closed-Leaf check-in: a505abcc user: drh tags: diff-enhancements)
21:34
Merge the diff enhancements into trunk. ... (check-in: c2446058 user: drh tags: trunk)
21:31
Add support for side-by-side diff from the command-line "diff" command. ... (check-in: ac81759f user: drh tags: diff-enhancements)
20:24
Begin improvement efforts on the "diff" functions by adding the --context option to the "diff" command. ... (check-in: 3bbbbdfd user: drh tags: diff-enhancements)
15:25
Fixed a minor mem leak. Got /json/user/save mostly working. ... (check-in: 080acb91 user: stephan tags: json-multitag-test, json)
12:52
Version 1.20. ... (check-in: a75e2d25 user: drh tags: trunk, release, version-1.20)
2011-10-20
18:48
minor code simplifications. ... (check-in: 400fe340 user: stephan tags: json-multitag-test, json)
18:28
fixed a type conversion error caused by last round of refactoring. ... (check-in: f5668114 user: stephan tags: json-multitag-test, json)
17:10
minor 1.20 changelog tweak. ... (check-in: 1d12fcc4 user: stephan tags: trunk)
16:54
Cherrypick the [21af96623e6b337] change onto trunk. ... (check-in: 5abc2430 user: drh tags: trunk)
16:31
s/'%s'/%Q/ in rptshow(). ... (Closed-Leaf check-in: 21af9662 user: stephan tags: stephan-hack)
16:28
merged in trunk for clean base in code review tweaks. ... (check-in: 5a1ec007 user: stephan tags: stephan-hack)
15:39
added version numbers to the changes where i could find a specific commit. ... (check-in: f93a0823 user: stephan tags: trunk)
15:07
pulled in changelog 1.20. ... (check-in: 2e43ff6f user: stephan tags: trunk)
14:50
Change strcpy() to memcpy() inside diff.c to avoid compiler warnings on OpenBSD. ... (check-in: 06e9863c user: drh tags: trunk)
14:40
initial 1.20 changelog. ... (check-in: e0805603 user: stephan tags: stephan-hack)
14:39
pulled in trunk for clean slate on subsequent changes. ... (check-in: a37d80e8 user: stephan tags: stephan-hack)
14:01
Bug fix: Make sure the constant_time_cmp() SQL function is registered when rendering the login page. ... (check-in: 2f4a101c user: drh tags: trunk)
07:00
Moved the user-related JSON handlers into their own file. ... (check-in: 6e18fc2e user: stephan tags: json-multitag-test, json)
02:08
1.20 initial changelog, this time to the proper branch. ... (check-in: 8b3c6ebb user: stephan tags: trunk)
02:03
Sorry, wrong branch! started changelog for 1.20 release. ... (Closed-Leaf check-in: a9420863 user: stephan tags: declined)
01:20
Refactored json_stmt_to_array_of_xxx() to actually take a cson_array argument (not generic cson_value arg), now that the cson API allows that simplification. ... (check-in: 23a35ba1 user: stephan tags: json-multitag-test, json)
01:14
Merge the maketest_fixes branch into trunk. ... (check-in: 9ee57084 user: drh tags: trunk)
01:12
Additional makefile changes so the "../$CHECKOUT/configure; make test" works. ... (Closed-Leaf check-in: 6f285b5f user: drh tags: maketest_fixes)
01:04
added a TODO. ... (check-in: 23d69df6 user: stephan tags: json-multitag-test, json)
01:04
Fix the makefile so that "make test" works from a sibling build directory. ... (check-in: 16d7e4a5 user: drh tags: maketest_fixes)
00:57
Update the built-in SQLite to the latest 3.7.9 beta. ... (check-in: ccf43e18 user: drh tags: trunk)
2011-10-19
23:56
Enhanced /json/artifact/FILE_UUID a bit. Now only includes full content if explicitly told to, but returns more metadata even for binary files. ... (check-in: 2165e77c user: stephan tags: json-multitag-test, json)
22:31
merged in trunk [e161670939b93ec]. ... (check-in: 1d0a7103 user: stephan tags: json-multitag-test, json)
22:12
Added permissions checks to artifact/file and artifact/wiki. Renamed a mysterious mlink property. ... (check-in: 83ba8852 user: stephan tags: json-multitag-test, json)
21:53
refactored json_artifact_file() a bit to re-use other code. ... (check-in: a4f4c62a user: stephan tags: json-multitag-test, json)
21:53
removed a no-longer-true "untested" marker. ... (check-in: 4f196f15 user: stephan tags: json-multitag-test, json)
21:26
Re-implemented json_artifact_wiki() to use pre-existing functionality. ... (check-in: f996e663 user: stephan tags: json-multitag-test, json)
21:13
s/fossil_is_json/fossil_has_json/g. Moved fossil_has_json() (nee fossil_is_json()) decl/docs to json_detail.h. ... (check-in: d2c1ae23 user: stephan tags: json-multitag-test, json)
20:54
Fixed a C99/C++ism. Added json_new_string_f() (printf-style). ... (check-in: f5cc421d user: stephan tags: json-multitag-test, json)
20:36
A number of small doc improvements. ... (check-in: fa17e098 user: stephan tags: json-multitag-test, json)
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)
19:54
Merge in the annotatecmd_fix branch. ... (check-in: e1616709 user: drh tags: trunk)
18:59
Fix for ticket [e5999e25eedeb]. Code style fix. ... (check-in: 4a296c0b user: jan tags: trunk)
15:47
fixed json_page_top() and json_cmd_top() to behave as documented when a callback returns non-NULL but does set the error state. ... (check-in: 2f48be58 user: stephan tags: json-multitag-test, json)
14:56
removed a superfluous call to json_set_err() which "overwrote" the previously set error. ... (check-in: 16155447 user: stephan tags: json-multitag-test, json)
01:49
Fix a missed class="button" on the info page. ... (check-in: 5f0899bb user: drh tags: trunk)
01:44
Increase the version number to 1.20. Improvements to style sheets. ... (check-in: 91db2ccf user: drh tags: trunk)
01:29
Merge updates from trunk. ... (check-in: 62d928cb user: mistachkin tags: tcl-integration)
2011-10-18
23:37
When editing the properties of a check-in and comparing the old and new comment text, ignore leading and trailing whitespace and the differences between \r\n and \n. Hopefully this will reduce the number of unwanted comment edits. ... (check-in: 48928829 user: drh tags: trunk)
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)

13:06
add support for fetching text file content and checkin history via /artifact json request ... (check-in: 3d1d139a user: zach tags: json-multitag-test, json)
2011-10-17
23:12
Fix typo in warning message. ... (check-in: c80ee413 user: drh tags: trunk)
18:03
Removed some dead code. Experimentally enabled jQuery ajax back-end to test a problem on my 3DS. ... (check-in: ebb0c047 user: stephan tags: json-multitag-test, json)
16:08
merged in trunk [fda7c2c63d] for side-by-side diffs. ... (check-in: 571f3aca user: stephan tags: json-multitag-test, json)
16:01
Fixed an incorrect const qualifier (caught by clang). ... (check-in: fda7c2c6 user: stephan tags: trunk)
13:09
Font size adjustments for side-by-side diff. Use the dp= query parameter of timeline on the info page. ... (check-in: eefb3168 user: drh tags: trunk)
11:37
Fix the labeling of timelines with the dp=UUID query parameter. ... (check-in: a47fde8e user: drh tags: trunk)
01:19
Merge the side-by-side diff code into trunk. ... (check-in: 0bde74ea user: drh tags: trunk)
01:18
Remove unused variables and surplus blank lines from the side-by-side diff code. ... (Closed-Leaf check-in: a92908a6 user: drh tags: jan-sbsdiff)
01:12
Add new warnings for when Fossil overwrites an unmanged file on "update" or "merge". Undo has been and continues to be available to recover the overwritten files. ... (check-in: 39f979b0 user: drh tags: trunk)
00:26
Rephrasing and fixed a typo. ... (check-in: 8e358aa8 user: jan tags: jan-sbsdiff)
2011-10-16
23:24
Merge the latest trunk changes into the side-by-side diff branch. ... (check-in: 23c3affa user: drh tags: jan-sbsdiff)
23:10
Fix a typo in the timeline EVENT table entries generated by "fossil rebuild" in the previous check-in. ... (check-in: fd486df4 user: drh tags: trunk)
23:00
Show tag changes on the timeline. A "fossil rebuild" is required to take advantage of this new feature. Also put a • character in front of non-checkin timeline entries to make them stand out more. ... (check-in: 87540ed6 user: drh tags: trunk)
21:04
Renamed 1/2-pane diffs to unified and side-by-side in the ui. ... (check-in: ff9de303 user: jan tags: jan-sbsdiff)
17:32
Fix new and harmless compiler warnings that appeared with the upgrade to GCC 4.6.1. ... (check-in: d8bbe4ad user: drh tags: trunk)
16:19
Add sbsdiff options when using show-version-diffs. ... (check-in: adace758 user: jan tags: jan-sbsdiff)
14:33
Removed a GNU-make-only construct which broke Jan's build. ... (check-in: 8da84326 user: stephan tags: json-multitag-test, json)
13:35
Set explicit background color for sbsdiff table in skins. ... (check-in: f4f5e055 user: jan tags: jan-sbsdiff)
13:29
pulled in latest cson for cson_object_merge(). ... (check-in: d3ad893c user: stephan tags: json-multitag-test, json)
13:29
fixed a memleak of parent artifact uuid. long live valgrind. ... (check-in: 3db8bfc5 user: stephan tags: json-multitag-test, json)
12:56
Merge latest changes from trunk ... (check-in: 1349e5ed user: ashish tags: ashish-ipv6)
10:04
merged/resolved trunk [ee723ed98ddb0a]. ... (check-in: a40ac8fd user: stephan tags: json-multitag-test, json)
09:49
minor doc clarification. ... (check-in: 398b53e0 user: stephan tags: json-multitag-test, json)
02:07
Separate sbsdiff block separator meta-rows a little more from regular rows in built-in skin 4. ... (check-in: 7a47abe1 user: jan tags: jan-sbsdiff)
00:14
Updated styles/skins. Built-in skin 4 can now wrap lines. ... (check-in: 1c40493c user: jan tags: jan-sbsdiff)
2011-10-15
21:25
Add sbsdiff link to the /info page. ... (check-in: 286f0950 user: jan tags: jan-sbsdiff)
18:45
Add button to toggle sbsdiff for /vdiff views. Renamed the button in /fdiff. ... (check-in: d1f63cd8 user: jan tags: jan-sbsdiff)
18:05
Add button to toggle sbsdiff for /fdiff views. ... (check-in: d0988fb5 user: jan tags: jan-sbsdiff)
17:36
Vary the number of columns of displayed files in the File List depending on the length of the longest filename in the list. ... (check-in: ee723ed9 user: drh tags: trunk)
17:18
Update to the Fossil-v-Git matrix. ... (check-in: a5228787 user: drh tags: trunk)
15:42
Merge the latest trunk changes into the side-by-side diff branch. ... (check-in: 15de70c2 user: drh tags: jan-sbsdiff)
12:30
Fix clang static analyzer warnings about deref null pointers and undefined values. There are still lots of dead code warnings, but those are harmless. ... (check-in: 63069145 user: drh tags: trunk)
12:16
Mark functions that never return (ex: fossil_panic()) as such so that static analyzers can do a better job of pruning paths. ... (check-in: 86d2b4ef user: drh tags: trunk)
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: 3dd0c155 user: drh tags: trunk)
10:17
A very simple fix to the annotate memory leak problem. ... (check-in: 9929bab7 user: drh tags: trunk)
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)

00:06
Add /*sort*/ marks to some SQL queries to disable warnings about sorting without an index. ... (check-in: fff43ebb user: drh tags: trunk)
2011-10-13
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: 4d32db8e user: drh tags: trunk)
17:10
Added downloadPath property to files in timeline view, leading to /raw/FILENAME?name=uuid. ... (check-in: ea5e5815 user: stephan tags: json-multitag-test, json)
16:45
merged in trunk [862d7dbf59f55e2d]. ... (check-in: 3025ecb2 user: stephan tags: json-multitag-test, json)
16:39
Update the SQLite command-line shell to the latest from the SQLite source tree. ... (check-in: 862d7dbf 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: 399c0dda user: viriketo tags: trunk)