Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch globalStateCmd Excluding Merge-Ins
This is equivalent to a diff from df9880287f to 3e60428c4c
2014-09-01
| ||
18:51 | Add the --with-miniz configuration option (with the complete miniz source code.) Add the globalState TH1 command and fixes to the TH1 expr command. ... (check-in: 66ae70a54b user: drh tags: trunk) | |
2014-08-29
| ||
02:28 | Add globalState TH1 command to the change log. ... (Closed-Leaf check-in: 3e60428c4c user: mistachkin tags: globalStateCmd) | |
2014-08-28
| ||
15:22 | Fix the "fossil bisect chart" so that it always shows CURRENT in between the last BAD and first GOOD. ... (check-in: 36d63c67d2 user: drh tags: trunk) | |
05:54 | Merge updates from trunk. ... (check-in: 629891a775 user: mistachkin tags: optFor130, globalStateCmd) | |
05:54 | Merge updates from trunk. ... (check-in: cdad2dc0c2 user: mistachkin tags: reviewFor130, optionalMiniz) | |
00:00 | Merge updates from trunk. ... (check-in: 937d2f479d user: mistachkin tags: reqdFor130, th1ExprFix) | |
2014-08-27
| ||
22:52 | Add another merge test case. ... (check-in: df9880287f user: mistachkin tags: trunk) | |
18:40 | Updated changelog for previous commit. ... (check-in: 8b4bcd9d1f user: stephan tags: trunk) | |
Changes to src/th_main.c.
︙ | ︙ | |||
667 668 669 670 671 672 673 674 675 676 677 678 679 680 | } if( g.thTrace ){ Th_Trace("%s", argv[1]); } Th_SetResult(interp, 0, 0); return TH_OK; } /* ** TH1 command: getParameter NAME ?DEFAULT? ** ** Return the value of the specified query parameter or the specified default ** value when there is no matching query parameter. */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 | } if( g.thTrace ){ Th_Trace("%s", argv[1]); } Th_SetResult(interp, 0, 0); return TH_OK; } /* ** TH1 command: globalState NAME ?DEFAULT? ** ** Returns a string containing the value of the specified global state ** variable -OR- the specified default value. Currently, the supported ** items are: ** ** "checkout" = The active local checkout directory, if any. ** "configuration" = The active configuration database file name, ** if any. ** "executable" = The fully qualified executable file name. ** "log" = The error log file name, if any. ** "repository" = The active local repository file name, if ** any. ** "top" = The base path for the active server instance, ** if applicable. ** "user" = The active user name, if any. ** "vfs" = The SQLite VFS in use, if overridden. ** ** Attempts to query for unsupported global state variables will result ** in a script error. Additional global state variables may be exposed ** in the future. ** ** See also: checkout, repository, setting */ static int globalStateCmd( Th_Interp *interp, void *p, int argc, const char **argv, int *argl ){ const char *zDefault = 0; if( argc!=2 && argc!=3 ){ return Th_WrongNumArgs(interp, "globalState NAME ?DEFAULT?"); } if( argc==3 ){ zDefault = argv[2]; } if( fossil_strnicmp(argv[1], "checkout\0", 9)==0 ){ Th_SetResult(interp, g.zLocalRoot ? g.zLocalRoot : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "configuration\0", 14)==0 ){ Th_SetResult(interp, g.zConfigDbName ? g.zConfigDbName : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "executable\0", 11)==0 ){ Th_SetResult(interp, g.nameOfExe ? g.nameOfExe : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "log\0", 4)==0 ){ Th_SetResult(interp, g.zErrlog ? g.zErrlog : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "repository\0", 11)==0 ){ Th_SetResult(interp, g.zRepositoryName ? g.zRepositoryName : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "top\0", 4)==0 ){ Th_SetResult(interp, g.zTop ? g.zTop : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "user\0", 5)==0 ){ Th_SetResult(interp, g.zLogin ? g.zLogin : zDefault, -1); return TH_OK; }else if( fossil_strnicmp(argv[1], "vfs\0", 4)==0 ){ Th_SetResult(interp, g.zVfsName ? g.zVfsName : zDefault, -1); return TH_OK; }else{ Th_ErrorMessage(interp, "unsupported global state:", argv[1], argl[1]); return TH_ERROR; } } /* ** TH1 command: getParameter NAME ?DEFAULT? ** ** Return the value of the specified query parameter or the specified default ** value when there is no matching query parameter. */ |
︙ | ︙ | |||
1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 | {"artifact", artifactCmd, 0}, {"checkout", checkoutCmd, 0}, {"combobox", comboboxCmd, 0}, {"date", dateCmd, 0}, {"decorate", wikiCmd, (void*)&aFlags[2]}, {"enable_output", enableOutputCmd, 0}, {"getParameter", getParameterCmd, 0}, {"httpize", httpizeCmd, 0}, {"hascap", hascapCmd, 0}, {"hasfeature", hasfeatureCmd, 0}, {"html", putsCmd, (void*)&aFlags[0]}, {"htmlize", htmlizeCmd, 0}, {"http", httpCmd, 0}, {"linecount", linecntCmd, 0}, | > | 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 | {"artifact", artifactCmd, 0}, {"checkout", checkoutCmd, 0}, {"combobox", comboboxCmd, 0}, {"date", dateCmd, 0}, {"decorate", wikiCmd, (void*)&aFlags[2]}, {"enable_output", enableOutputCmd, 0}, {"getParameter", getParameterCmd, 0}, {"globalState", globalStateCmd, 0}, {"httpize", httpizeCmd, 0}, {"hascap", hascapCmd, 0}, {"hasfeature", hasfeatureCmd, 0}, {"html", putsCmd, (void*)&aFlags[0]}, {"htmlize", htmlizeCmd, 0}, {"http", httpCmd, 0}, {"linecount", linecntCmd, 0}, |
︙ | ︙ |
Changes to test/th1.test.
︙ | ︙ | |||
674 675 676 677 678 679 680 | fossil test-th-eval "artifact 0000000000 test/th1.test" test th1-artifact-8 {$RESULT eq {TH_ERROR: repository unavailable}} ############################################################################### fossil test-th-eval --th-open-config "artifact 0000000000 test/th1.test" test th1-artifact-9 {$RESULT eq {TH_ERROR: artifact not found}} | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 | fossil test-th-eval "artifact 0000000000 test/th1.test" test th1-artifact-8 {$RESULT eq {TH_ERROR: repository unavailable}} ############################################################################### fossil test-th-eval --th-open-config "artifact 0000000000 test/th1.test" test th1-artifact-9 {$RESULT eq {TH_ERROR: artifact not found}} ############################################################################### fossil test-th-eval "globalState checkout" test th1-globalState-1 {[string length $RESULT] > 0} ############################################################################### fossil test-th-eval "globalState checkout" test th1-globalState-2 {$RESULT eq [fossil test-th-eval checkout]} ############################################################################### fossil test-th-eval "globalState configuration" test th1-globalState-3 {[string length $RESULT] == 0} ############################################################################### fossil test-th-eval --th-open-config "globalState configuration" test th1-globalState-4 {[string length $RESULT] > 0} ############################################################################### fossil test-th-eval "globalState executable" test th1-globalState-5 {[file rootname [file tail $RESULT]] eq "fossil"} ############################################################################### fossil test-th-eval "globalState log" test th1-globalState-6 {[string length $RESULT] == 0} ############################################################################### fossil test-th-eval --errorlog foserrors.log "globalState log" test th1-globalState-7 {$RESULT eq "foserrors.log"} ############################################################################### fossil test-th-eval "globalState repository" test th1-globalState-8 {[string length $RESULT] > 0} ############################################################################### fossil test-th-eval "globalState repository" test th1-globalState-9 {$RESULT eq [fossil test-th-eval repository]} ############################################################################### fossil test-th-eval "globalState top" test th1-globalState-10 {[string length $RESULT] == 0} ############################################################################### fossil test-th-eval "globalState user" test th1-globalState-11 {[string length $RESULT] == 0} ############################################################################### fossil test-th-eval --user fossil-th1-test "globalState user" test th1-globalState-12 {$RESULT eq "fossil-th1-test"} ############################################################################### fossil test-th-eval "globalState vfs" test th1-globalState-13 {[string length $RESULT] == 0} ############################################################################### fossil test-th-eval "globalState vfs" test th1-globalState-14 {[string length $RESULT] == 0} ############################################################################### if {$tcl_platform(platform) eq "windows"} then { set altVfs win32-longpath } else { set altVfs unix-dotfile } ############################################################################### fossil test-th-eval --vfs $altVfs "globalState vfs" test th1-globalState-15 {$RESULT eq $altVfs} |
Changes to www/changes.wiki.
1 2 3 4 5 6 7 8 9 10 11 12 13 | <title>Change Log</title> <h2>Changes For Version 1.30 (as yet unreleased)</h2> * Add setting to control the number of times autosync will be tried before returning an error. * Add the [/help/fusefs|fossil fusefs DIRECTORY] command that mounts a Fuse Filesystem at the given DIRECTORY and populates it with read-only copies of all historical check-ins. This only works on systems that support FuseFS. * Support customization of commands and webpages, including the ability to add new ones, via the "TH1 hooks" feature. Disabled by default. Enabled via a compile-time option. * Add the <nowiki>[checkout], [render], [styleHeader], [styleFooter], | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | <title>Change Log</title> <h2>Changes For Version 1.30 (as yet unreleased)</h2> * Add setting to control the number of times autosync will be tried before returning an error. * Add the [/help/fusefs|fossil fusefs DIRECTORY] command that mounts a Fuse Filesystem at the given DIRECTORY and populates it with read-only copies of all historical check-ins. This only works on systems that support FuseFS. * Support customization of commands and webpages, including the ability to add new ones, via the "TH1 hooks" feature. Disabled by default. Enabled via a compile-time option. * Add the <nowiki>[checkout], [render], [styleHeader], [styleFooter], [trace], [getParameter], [setParameter], [artifact], and [globalState]</nowiki> commands to TH1, primarily for use by TH1 hooks. * Bring in the latest version of autosetup from upstream. * When committing a (non-binary) file which contains bytes forming an invalid UTF-8 stream, fossil now adds the possibility to convert it to a valid UTF-8 stream ('c') if you like. * Let [/help?cmd=new|fossil new] no longer create an initial empty commit by default. The first commit after checking out an empty repository will become the initial commit. (NOT PLANNED FOR 1.30, BUT DONE TO EXPOSE |
︙ | ︙ |