Mercurial
synchrotron
/ summary
summary |
shortlog
|
changelog
|
tags
|
files
|
bz2
|
zip
|
gz
description
Javascript diff, diff3, merge, and DVCS code
owner
tonyg@lshift.net
last change
Mon, 29 Sep 2008 23:49:54 +0100
changes
7 weeks ago
Tony Garnock-Jones
WIP mc.js based on gitish ideas from fs.js
default
tip
changeset
|
files
7 weeks ago
Tony Garnock-Jones
Make dict_to_set functional rather than imperative.
changeset
|
files
4 months ago
Tony Garnock-Jones
More doc text
changeset
|
files
5 months ago
Tony Garnock-Jones
Avoid "self" as a variable; apparently IE doesn't like it.
changeset
|
files
5 months ago
Tony Garnock-Jones
Some more revs in the example wiki
changeset
|
files
5 months ago
Tony Garnock-Jones
Check in prototype tiddlydvcs instance.
changeset
|
files
5 months ago
Tony Garnock-Jones
Import from other Synchrotron TiddlyWikis
changeset
|
files
5 months ago
Tony Garnock-Jones
Record import stats, and don't overwrite preexisting bodies or revs
changeset
|
files
5 months ago
Tony Garnock-Jones
Use "Revert" label instead of "Commit" when appropriate
changeset
|
files
5 months ago
Tony Garnock-Jones
Added TiddlyWiki plugin based (now somewhat distantly) on MartinBudden's initial prototype
changeset
|
files
5 months ago
Tony Garnock-Jones
Draw revs with newest rev leftmost in graph.
changeset
|
files
5 months ago
Tony Garnock-Jones
Added getMetadata method
changeset
|
files
5 months ago
Tony Garnock-Jones
Better dirty-handling; new prop testers and iterators
changeset
|
files
5 months ago
Tony Garnock-Jones
Detect (some) ancestor-merge cases.
changeset
|
files
5 months ago
Tony Garnock-Jones
Added Checkout.forEachFile().
changeset
|
files
5 months ago
Tony Garnock-Jones
Utility for producing "data:" urls from a collection of PNGs
changeset
|
files
5 months ago
Tony Garnock-Jones
More tiddlywiki meta files
changeset
|
files
5 months ago
Tony Garnock-Jones
Untabify Javascript files.
changeset
|
files
5 months ago
Tony Garnock-Jones
Turn on debug mode in dvcsdemo.js.
changeset
|
files
5 months ago
Tony Garnock-Jones
Lint gives bad advice sometimes.
changeset
|
files
5 months ago
Tony Garnock-Jones
Silence a few lint warnings. Javascript's scope rules are terrible.
changeset
|
files
5 months ago
Tony Garnock-Jones
Make fileRevisions() return a map, rather than a list. The old behaviour is preserved in fileRevisionsSortedByTimestamp.
changeset
|
files
5 months ago
Tony Garnock-Jones
Add Dvcs._debugMode, currently controlling the human-friendliness
changeset
|
files
5 months ago
Tony Garnock-Jones
Return earliest-revision-first from Repository.fileRevisions
changeset
|
files
5 months ago
Tony Garnock-Jones
Fix bugs in "changed" computation. Added Repository.fileRevisions(uuid).
changeset
|
files
5 months ago
Tony Garnock-Jones
Improve hg log renderer.
changeset
|
files
5 months ago
Tony Garnock-Jones
Add TiddlyWiki metadata files.
changeset
|
files
5 months ago
Tony Garnock-Jones
Update fs in ambiguousLCA case, too
changeset
|
files
5 months ago
Tony Garnock-Jones
Return merge ancestore from merge, and display it in the demo.
changeset
|
files
5 months ago
Tony Garnock-Jones
Copyright notices.
changeset
|
files
5 months ago
Tony Garnock-Jones
Alter subheading
changeset
|
files
5 months ago
Tony Garnock-Jones
Link to DVCS demo in the slides
changeset
|
files
5 months ago
Tony Garnock-Jones
Add presets; also include ambiguousLCA preset
changeset
|
files
5 months ago
Tony Garnock-Jones
Take Matthias' suggestion of avoiding the jump on crossovers.
changeset
|
files
5 months ago
Tony Garnock-Jones
Better state message maintenance
changeset
|
files
5 months ago
Tony Garnock-Jones
State display during merge
changeset
|
files
5 months ago
Tony Garnock-Jones
Fix bug where the wrong set of revs was used to populate the worklist initially.
changeset
|
files
5 months ago
Tony Garnock-Jones
Repository drawing code, and a simple DVCS demo UI.
changeset
|
files
5 months ago
Tony Garnock-Jones
Dvcs.Repository.lookupParents is generally useful - promoted to a method.
changeset
|
files
5 months ago
Tony Garnock-Jones
Simple script to read "hg log" output (for drawing purposes)
changeset
|
files
5 months ago
Tony Garnock-Jones
Images for DVCS demo.
changeset
|
files
5 months ago
Tony Garnock-Jones
Correct event title
changeset
|
files
5 months ago
Tony Garnock-Jones
Rabbity theme
changeset
|
files
5 months ago
Tony Garnock-Jones
Note on truncating history
changeset
|
files
5 months ago
Tony Garnock-Jones
Support "digging in" to a conflict region using comm.
changeset
|
files
5 months ago
Tony Garnock-Jones
Note about Bram Cohen's diff algorithm
changeset
|
files
5 months ago
Tony Garnock-Jones
Separate slides for demos; link to diff3 demo
changeset
|
files
5 months ago
Tony Garnock-Jones
Enough rows in the demo textarea to show the whole merge.
changeset
|
files
5 months ago
Tony Garnock-Jones
Diff3 demo page and code.
changeset
|
files
5 months ago
Tony Garnock-Jones
Note on compression use of diff; link to diff demo
changeset
|
files
5 months ago
Tony Garnock-Jones
Add diff demo page and code.
changeset
|
files
5 months ago
Tony Garnock-Jones
Remove unused parameter from LCS function
changeset
|
files
6 months ago
Tony Garnock-Jones
Synchronisation and storage slides
changeset
|
files
6 months ago
Tony Garnock-Jones
Colours in diff3 table.
changeset
|
files
6 months ago
Tony Garnock-Jones
Flesh out slides.
changeset
|
files
6 months ago
Tony Garnock-Jones
Start on slides.
changeset
|
files
6 months ago
Tony Garnock-Jones
Split out tests from main code.
changeset
|
files
6 months ago
Tony Garnock-Jones
Namespace fs.js properly.
changeset
|
files
6 months ago
Tony Garnock-Jones
Use JSON pretty-printing instead of uneval.
changeset
|
files
6 months ago
Tony Garnock-Jones
Switch to full UUIDs
changeset
|
files
6 months ago
Tony Garnock-Jones
Correct test for optional parameter.
changeset
|
files
6 months ago
Tony Garnock-Jones
Support named branches.
changeset
|
files
6 months ago
Tony Garnock-Jones
Rename "FileSystem" to "Checkout".
changeset
|
files
6 months ago
Tony Garnock-Jones
DVCS base.
changeset
|
files
6 months ago
Tony Garnock-Jones
Switch to generic "parentsFun" form of LCA computation.
changeset
|
files
6 months ago
Tony Garnock-Jones
More test cases.
changeset
|
files
6 months ago
Tony Garnock-Jones
Deal with case when no LCA can be found.
changeset
|
files
6 months ago
Tony Garnock-Jones
Merge accidental branching. Oops.
changeset
|
files
6 months ago
Tony Garnock-Jones
Start of graph library for dvcs.
changeset
|
files
6 months ago
Tony Garnock-Jones
Comment diff.js, and remove commented-out logging code.
changeset
|
files
6 months ago
Tony Garnock-Jones
Explicit white background (this new default yellow colour scheme of
changeset
|
files
6 months ago
Tony Garnock-Jones
Ignore a "scratch" directory
changeset
|
files
6 months ago
Tony Garnock-Jones
Random UUID code.
changeset
|
files
6 months ago
Tony Garnock-Jones
Initial commit.
changeset
|
files
...
tags
...
branches
7 weeks ago
c0cbe331868d
default
changeset
|
changelog
|
files
...