Fossil: Check-in [d15c1ba0]

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

Overview

Comment:	Merge trunk
Downloads:	Tarball \| ZIP archive
Timelines:	family \| ancestors \| descendants \| both \| multi-thread
Files:	files \| file ages \| folders
SHA3-256:	d15c1ba0f90b2265b5d11669bf306e07e99b1a72520b26286c57ace95e058b8c
User & Date:	jan.nijtmans 2017-08-31 02:00:00.000

Context

2017-12-23
01:50		merge trunk ... (check-in: b8e4dcc9 user: jan.nijtmans tags: multi-thread)
2017-08-31
02:00		Merge trunk ... (check-in: d15c1ba0 user: jan.nijtmans tags: multi-thread)
01:00		Enhance the mkindex utility to extract help text for each setting separately and automatically build the aSetting table. Various other enhancements that take advantage of this new capability. ... (check-in: f74f7014 user: drh tags: trunk)
2014-12-06
16:57		Fix merge conflict with trunk ... (check-in: acd71844 user: jan.nijtmans tags: multi-thread)

Changes

Added .dockerignore.

Added .fossil-settings/binary-glob.

Changes to .fossil-settings/clean-glob.

Added .fossil-settings/crlf-glob.

Changes to .fossil-settings/encoding-glob.

Changes to .fossil-settings/ignore-glob.

Deleted .fossil-settings/keep-glob.

Changes to Dockerfile.

Changes to Makefile.classic.

Changes to Makefile.in.

Changes to VERSION.

ajax/cgi-bin/fossil-json.cgi.example became a regular file.

Changes to ajax/i-test/rhino-test.js.

Changes to ajax/index.html.

Changes to ajax/js/fossil-ajaj.js.

Changes to ajax/js/whajaj.js.

Changes to ajax/wiki-editor.html.

Changes to art/CollRev3.dia.

Changes to art/CollRev4.dia.

Changes to auto.def.

Changes to autosetup/README.autosetup.

Changes to autosetup/autosetup.

Changes to autosetup/cc-db.tcl.

Changes to autosetup/cc-lib.tcl.

Changes to autosetup/cc-shared.tcl.

Changes to autosetup/cc.tcl.

Changes to autosetup/config.guess.

Changes to autosetup/config.sub.

Changes to autosetup/jimsh0.c.

Changes to autosetup/local.tcl.

Added autosetup/pkg-config.tcl.

Changes to autosetup/system.tcl.

autosetup/test-tclsh became executable.

Added autosetup/tmake.auto.

Added autosetup/tmake.tcl.

Changes to compat/zlib/CMakeLists.txt.

Changes to compat/zlib/ChangeLog.

Changes to compat/zlib/Makefile.in.

Changes to compat/zlib/README.

Changes to compat/zlib/adler32.c.

Deleted compat/zlib/as400/bndsrc.

Deleted compat/zlib/as400/compile.clp.

Deleted compat/zlib/as400/readme.txt.

Deleted compat/zlib/as400/zlib.inc.

Changes to compat/zlib/compress.c.

Changes to compat/zlib/configure.

Changes to compat/zlib/contrib/README.contrib.

Changes to compat/zlib/contrib/ada/zlib-streams.ads.

Changes to compat/zlib/contrib/ada/zlib-thin.ads.

Changes to compat/zlib/contrib/blast/blast.c.

Changes to compat/zlib/contrib/blast/blast.h.

Changes to compat/zlib/contrib/delphi/ZLib.pas.

Changes to compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs.

Changes to compat/zlib/contrib/infback9/inftree9.c.

compat/zlib/contrib/masmx64/bld_ml64.bat became a regular file.

compat/zlib/contrib/masmx86/bld_ml32.bat became a regular file.

Changes to compat/zlib/contrib/minizip/configure.ac.

Changes to compat/zlib/contrib/minizip/iowin32.c.

compat/zlib/contrib/minizip/make_vms.com became a regular file.

Changes to compat/zlib/contrib/minizip/unzip.c.

Changes to compat/zlib/contrib/minizip/zip.c.

Changes to compat/zlib/contrib/pascal/zlibpas.pas.

Changes to compat/zlib/contrib/puff/puff.c.

Changes to compat/zlib/contrib/vstudio/readme.txt.

Deleted compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user.

Deleted compat/zlib/contrib/vstudio/vc10/minizip.vcxproj.user.

Deleted compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user.

Deleted compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user.

Changes to compat/zlib/contrib/vstudio/vc10/zlib.rc.

Deleted compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user.

Changes to compat/zlib/contrib/vstudio/vc10/zlibvc.def.

Deleted compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user.

Changes to compat/zlib/contrib/vstudio/vc11/zlib.rc.

Changes to compat/zlib/contrib/vstudio/vc11/zlibvc.def.

Added compat/zlib/contrib/vstudio/vc12/miniunz.vcxproj.

Added compat/zlib/contrib/vstudio/vc12/minizip.vcxproj.

Added compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj.

Added compat/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj.

Added compat/zlib/contrib/vstudio/vc12/zlib.rc.

Added compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj.

Added compat/zlib/contrib/vstudio/vc12/zlibvc.def.

Added compat/zlib/contrib/vstudio/vc12/zlibvc.sln.

Added compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj.

Added compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.

Added compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.

Added compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.

Added compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.

Added compat/zlib/contrib/vstudio/vc14/zlib.rc.

Added compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.

Added compat/zlib/contrib/vstudio/vc14/zlibvc.def.

Added compat/zlib/contrib/vstudio/vc14/zlibvc.sln.

Added compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.

Changes to compat/zlib/contrib/vstudio/vc9/zlib.rc.

Changes to compat/zlib/contrib/vstudio/vc9/zlibvc.def.

Changes to compat/zlib/crc32.c.

Changes to compat/zlib/deflate.c.

Changes to compat/zlib/deflate.h.

Deleted compat/zlib/doc/algorithm.txt.

Deleted compat/zlib/doc/rfc1950.txt.

Deleted compat/zlib/doc/rfc1951.txt.

Deleted compat/zlib/doc/rfc1952.txt.

Deleted compat/zlib/doc/txtvsbin.txt.

Changes to compat/zlib/examples/gun.c.

Changes to compat/zlib/examples/gzlog.c.

Changes to compat/zlib/examples/zran.c.

Changes to compat/zlib/gzguts.h.

Changes to compat/zlib/gzlib.c.

Changes to compat/zlib/gzread.c.

Changes to compat/zlib/gzwrite.c.

Changes to compat/zlib/infback.c.

Changes to compat/zlib/inffast.c.

Changes to compat/zlib/inflate.c.

Changes to compat/zlib/inflate.h.

Changes to compat/zlib/inftrees.c.

compat/zlib/make_vms.com became a regular file.

Changes to compat/zlib/msdos/Makefile.dj2.

Changes to compat/zlib/msdos/Makefile.emx.

Changes to compat/zlib/old/Makefile.emx.

Changes to compat/zlib/old/os2/Makefile.os2.

Added compat/zlib/os400/README400.

Added compat/zlib/os400/bndsrc.

Added compat/zlib/os400/make.sh.

Added compat/zlib/os400/zlib.inc.

Changes to compat/zlib/qnx/package.qpg.

Changes to compat/zlib/test/example.c.

Changes to compat/zlib/test/infcover.c.

Changes to compat/zlib/test/minigzip.c.

Changes to compat/zlib/treebuild.xml.

Changes to compat/zlib/trees.c.

Changes to compat/zlib/uncompr.c.

Changes to compat/zlib/win32/Makefile.gcc.

Changes to compat/zlib/win32/Makefile.msc.

Changes to compat/zlib/win32/README-WIN32.txt.

Changes to compat/zlib/win32/VisualC.txt.

Changes to compat/zlib/win32/zlib.def.

Changes to compat/zlib/win32/zlib1.rc.

Changes to compat/zlib/zconf.h.

Changes to compat/zlib/zconf.h.cmakein.

Changes to compat/zlib/zconf.h.in.

Changes to compat/zlib/zlib.3.

Changes to compat/zlib/zlib.3.pdf.

Changes to compat/zlib/zlib.h.

Changes to compat/zlib/zlib.map.

compat/zlib/zlib2ansi became executable.

Changes to compat/zlib/zutil.c.

Changes to compat/zlib/zutil.h.

Changes to debian/makedeb.sh.

Added fossil.1.

Changes to setup/fossil.iss.

Changes to setup/fossil.nsi.

Added skins/README.md.

Added skins/aht/details.txt.

Added skins/black_and_white/css.txt.

Added skins/black_and_white/details.txt.

Added skins/black_and_white/footer.txt.

Added skins/black_and_white/header.txt.

Added skins/blitz/README.md.

Added skins/blitz/arrow_project.png.

Added skins/blitz/css.txt.

Added skins/blitz/details.txt.

Added skins/blitz/dir.png.

Added skins/blitz/file.png.

Added skins/blitz/footer.txt.

Added skins/blitz/fossil_100.png.

Added skins/blitz/fossil_80_reversed_darkcyan.png.

Added skins/blitz/fossil_80_reversed_darkcyan_text.png.

Added skins/blitz/header.txt.

Added skins/blitz/rss_20.png.

Added skins/blitz/ticket.txt.

Added skins/blitz_no_logo/README.md.

Added skins/blitz_no_logo/css.txt.

Added skins/blitz_no_logo/details.txt.

Added skins/blitz_no_logo/footer.txt.

Added skins/blitz_no_logo/header.txt.

Added skins/blitz_no_logo/ticket.txt.

Added skins/bootstrap/css.txt.

Added skins/bootstrap/details.txt.

Added skins/bootstrap/footer.txt.

Added skins/bootstrap/header.txt.

Added skins/default/README.md.

Added skins/default/css.txt.

Added skins/default/details.txt.

Added skins/default/footer.txt.

Added skins/default/header.txt.

Added skins/eagle/README.md.

Added skins/eagle/css.txt.

Added skins/eagle/details.txt.

Added skins/eagle/footer.txt.

Added skins/eagle/header.txt.

Added skins/enhanced1/css.txt.

Added skins/enhanced1/details.txt.

Added skins/enhanced1/footer.txt.

Added skins/enhanced1/header.txt.

Added skins/khaki/css.txt.

Added skins/khaki/details.txt.

Added skins/khaki/footer.txt.

Added skins/khaki/header.txt.

Added skins/original/css.txt.

Added skins/original/details.txt.

Added skins/original/footer.txt.

Added skins/original/header.txt.

Added skins/plain_gray/css.txt.

Added skins/plain_gray/details.txt.

Added skins/plain_gray/footer.txt.

Added skins/plain_gray/header.txt.

Added skins/rounded1/css.txt.

Added skins/rounded1/details.txt.

Added skins/rounded1/footer.txt.

Added skins/rounded1/header.txt.

Added skins/xekri/README.md.

Added skins/xekri/css.txt.

Added skins/xekri/details.txt.

Added skins/xekri/footer.txt.

Added skins/xekri/header.txt.

Changes to src/add.c.

Changes to src/allrepo.c.

Changes to src/attach.c.

Changes to src/bisect.c.

Changes to src/blob.c.

Changes to src/branch.c.

Changes to src/browse.c.

Changes to src/builtin.c.

Changes to src/bundle.c.

Changes to src/cache.c.

Changes to src/captcha.c.

Changes to src/cgi.c.

Changes to src/checkin.c.

Changes to src/checkout.c.

Changes to src/clone.c.

Changes to src/codecheck1.c.

Changes to src/comformat.c.

Changes to src/config.h.

Changes to src/configure.c.

Changes to src/content.c.

Changes to src/cson_amalgamation.c.

Changes to src/cson_amalgamation.h.

Changes to src/db.c.

Changes to src/delta.c.

Changes to src/deltacmd.c.

Changes to src/descendants.c.

Changes to src/diff.c.

Changes to src/diff.tcl.

Changes to src/diffcmd.c.

Added src/dispatch.c.

Changes to src/doc.c.

Changes to src/encode.c.

Changes to src/event.c.

Changes to src/export.c.

Changes to src/file.c.

Changes to src/finfo.c.

Changes to src/foci.c.

Added src/fshell.c.

Changes to src/fusefs.c.

Changes to src/glob.c.

Changes to src/graph.c.

Changes to src/gzip.c.

Added src/hname.c.

Changes to src/http.c.

Changes to src/http_socket.c.

Changes to src/http_ssl.c.

Changes to src/http_transport.c.

Changes to src/import.c.

Changes to src/info.c.

Changes to src/json.c.

Changes to src/json_artifact.c.

Changes to src/json_branch.c.

Changes to src/json_config.c.

Changes to src/json_detail.h.

Changes to src/json_diff.c.

Changes to src/json_dir.c.

Changes to src/json_finfo.c.

Changes to src/json_login.c.

Changes to src/json_report.c.

Changes to src/json_tag.c.

Changes to src/json_timeline.c.

Changes to src/json_user.c.

Changes to src/json_wiki.c.

Changes to src/leaf.c.

Added src/linenoise.c.

Added src/linenoise.h.

Changes to src/loadctrl.c.

Changes to src/login.c.

Changes to src/lookslike.c.

Changes to src/main.c.

Changes to src/main.mk.

Changes to src/makeheaders.c.

Changes to src/makeheaders.html.

Changes to src/makemake.tcl.

Changes to src/manifest.c.

Changes to src/markdown.c.

Added src/markdown.md.

Changes to src/markdown_html.c.

Changes to src/md5.c.

Changes to src/merge.c.

Changes to src/merge3.c.

Changes to src/mkbuiltin.c.

Changes to src/mkindex.c.

Changes to src/mkversion.c.

Changes to src/moderate.c.

Changes to src/name.c.

Changes to src/path.c.

Added src/piechart.c.

Changes to src/pivot.c.

Changes to src/popen.c.

Changes to src/printf.c.

Changes to src/publish.c.

Changes to src/purge.c.

Changes to src/rebuild.c.

Changes to src/regexp.c.

Changes to src/report.c.

Changes to src/rss.c.

Changes to src/schema.c.

Changes to src/search.c.

Added src/security_audit.c.

Changes to src/setup.c.

Changes to src/sha1.c.

Added src/sha1hard.c.

Added src/sha3.c.

Changes to src/shell.c.

Changes to src/shun.c.

Added src/sitemap.c.

Changes to src/skins.c.

Changes to src/sqlcmd.c.

Changes to src/sqlite3.c.

Changes to src/sqlite3.h.

Changes to src/stash.c.

Changes to src/stat.c.

Added src/statrep.c.

Changes to src/style.c.

Changes to src/sync.c.

Changes to src/tag.c.

Changes to src/tar.c.

Changes to src/th.c.

Changes to src/th.h.

Changes to src/th_lang.c.

Changes to src/th_main.c.

Changes to src/th_tcl.c.

Changes to src/timeline.c.

Changes to src/tkt.c.

Changes to src/tktsetup.c.

Changes to src/translate.c.

Changes to src/undo.c.

Changes to src/unicode.c.

Added src/unversioned.c.

Changes to src/update.c.

Changes to src/url.c.

Changes to src/user.c.

Changes to src/utf8.c.

Changes to src/util.c.

Changes to src/verify.c.

Changes to src/vfile.c.

Changes to src/wiki.c.

Changes to src/wikiformat.c.

Changes to src/winfile.c.

Changes to src/winhttp.c.

Changes to src/xfer.c.

Changes to src/xfersetup.c.

Changes to src/zip.c.

Added test/amend.test.

Added test/clean.test.

Changes to test/cmdline.test.

Changes to test/comment.test.

Added test/commit-warning.test.

Added test/contains-selector.test.

Changes to test/delta1.test.

Changes to test/diff-test-1.wiki.

Added test/diff.test.

Added test/fake-editor.tcl.

Changes to test/file1.test.

Added test/fileStat.th1.

Added test/fileage-test-1.wiki.

Changes to test/glob.test.

Changes to test/graph-test-1.wiki.

Added test/json.test.

Changes to test/merge1.test.

Changes to test/merge2.test.

Changes to test/merge3.test.

Changes to test/merge4.test.

Changes to test/merge5.test.

Changes to test/merge6.test.

Added test/merge_exe.test.

Changes to test/merge_renames.test.

Added test/merge_warn.test.

Added test/mv-rm.test.

Changes to test/release-checklist.wiki.

Changes to test/revert.test.

Added test/set-manifest.test.

Added test/settings-repo.test.

Added test/settings.test.

Added test/stash.test.

Added test/subdir/README.html.

Added test/subdir/one/readme.wiki.

Added test/symlinks.test.

Changes to test/tester.tcl.

Added test/th1-docs-input.txt.

Added test/th1-docs.test.

Changes to test/th1-hooks.test.

Added test/th1-repo.test.

Changes to test/th1-tcl.test.

Changes to test/th1.test.

Added test/unversioned.test.

Changes to test/utf.test.

Changes to test/valgrind-www.tcl.

Added test/wiki.test.

Changes to tools/cvs2fossil/changeset.

Changes to tools/cvs2fossil/lib/c2f_pbreakacycle.tcl.

Changes to tools/cvs2fossil/lib/c2f_prev.tcl.

Changes to tools/cvs2fossil/lib/mem.tcl.

Changes to tools/fossil_chat.tcl.

Changes to tools/fossilwiki.

Added tools/man_page_command_list.tcl.

Changes to win/Makefile.PellesCGMake.

Changes to win/Makefile.dmc.

Changes to win/Makefile.mingw.

Changes to win/Makefile.mingw.mistachkin.

Changes to win/Makefile.msc.

Changes to win/buildmsvc.bat.

Changes to win/fossil.rc.

Changes to win/include/dirent.h.

Changes to win/include/unistd.h.

Added www/aboutcgi.wiki.

Added www/aboutdownload.wiki.

Changes to www/adding_code.wiki.

Changes to www/antibot.wiki.

Added www/blame.wiki.

Changes to www/branching.wiki.

Changes to www/bugtheory.wiki.

Changes to www/build.wiki.

Changes to www/changes.wiki.

Changes to www/checkin_names.wiki.

Added www/childprojects.wiki.

Deleted www/cmd_.wiki-template.

Changes to www/concepts.wiki.

Changes to www/contribute.wiki.

Changes to www/copyright-release.html.

Changes to www/custom_ticket.wiki.

Added www/customgraph.md.

Added www/customskin.md.

Changes to www/delta_encoder_algorithm.wiki.

Changes to www/delta_format.wiki.

Changes to www/embeddeddoc.wiki.

Added www/encryptedrepos.wiki.

Added www/env-opts.md.

Changes to www/event.wiki.

Changes to www/faq.tcl.

Changes to www/faq.wiki.

Changes to www/fileformat.wiki.

Changes to www/fiveminutes.wiki.

Changes to www/foss-cklist.wiki.

Changes to www/fossil-from-msvc.wiki.

Changes to www/fossil-v-git.wiki.

Changes to www/fossil.eps.

Changes to www/fossil2.eps.

Changes to www/fossil_prompt.sh.

Added www/globs.md.

Changes to www/hacker-howto.wiki.

Added www/hashpolicy.wiki.

Changes to www/hints.wiki.

Changes to www/index.wiki.

Changes to www/inout.wiki.

Changes to www/makefile.wiki.

Changes to www/mkdownload.tcl.

Changes to www/mkindex.tcl.

Changes to www/newrepo.wiki.

Changes to www/password.wiki.

Name change from www/permutedindex.wiki to www/permutedindex.html.

Changes to www/pop.wiki.

Changes to www/private.wiki.

Changes to www/qandc.wiki.

Changes to www/quickstart.wiki.

Changes to www/quotes.wiki.

Changes to www/reviews.wiki.

Changes to www/scgi.wiki.

Changes to www/selfcheck.wiki.

Changes to www/selfhost.wiki.

Changes to www/server.wiki.

Changes to www/settings.wiki.

Changes to www/shunning.wiki.

Changes to www/stats.wiki.

Changes to www/style.wiki.

Changes to www/sync.wiki.

Changes to www/tech_overview.wiki.

Added www/th1.md.

Changes to www/theory1.wiki.

Changes to www/uitest.html.

Added www/unvers.wiki.

Added www/webpage-ex.md.

Changes to www/webui.wiki.

Added www/whyusefossil.wiki.

Changes to www/wikitheory.wiki.

Added www/xkcd-git.gif.