Re: [fossil-users] branch assistance needed
On 04/07/2018 16:42, jungle Boogie wrote: On 12:42AM, Wed, Jul 4, 2018 Nicola > Maybe, the sentence above could be complemented with an example of how > to do that and how *not* to do it (e.g., explaining what the effect of > adding a 'trunk' tag to a random check-in is and why it should not be > done). So provide a patch with the enhancement and let's see what happens. IIUC, the sentence refers to an implementation detail: moving check-ins between branches is implemented by simply renaming tags. But, it is easy (at least, for a newcomer like myself) on a first (and possibly second) reading to interpret it in the sense that *the user* can move check-ins between branches that way. As for contributing to the project, currently I'd likely do more harm than good :) I have been using Fossil for a short time, and many details are not entirely clear to me yet (e.g., I still don't understand well the purpose of tagging branches with both branch=name and sym-name), but I am taking notes as I am learning, and I am willing to share them some time in the future for the benefit of other beginners. Nicola ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Segfault on json test
On Thu, Jul 5, 2018 at 5:38 PM Dingyuan Wang wrote: > Hi, > > The following test: > > tclsh test/tester.tcl fossil json > > fails with: > > [...] > /home/gumble/dev/fossil/fossil json --json-input anon-1 > ERROR: child killed: segmentation violation > https://www.fossil-scm.org/index.html/info/f488a5aa97a3b15f There are still 2 json tests which fail, but i didn't write those and can't say anything useful about them :/. The segfault is resolved, in any case. Thanks for the report! -- - stephan beal http://wanderinghorse.net/home/stephan/ "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Segfault on json test
On Thu, Jul 5, 2018 at 5:38 PM Dingyuan Wang wrote:
> The following test:
>
> tclsh test/tester.tcl fossil json
>
> fails with:
>
i believe the fix is simply:
[stephan@host:~/fossil/fossil]$ f diff
Index: src/cgi.c
==
--- src/cgi.c
+++ src/cgi.c
@@ -211,11 +211,12 @@
const char *zValue, /* Value of the cookie. Automatically escaped */
const char *zPath,/* Path cookie applies to. NULL means "/" */
int lifetime /* Expiration of the cookie in seconds from now */
){
char *zSecure = "";
- if( zPath==0 ){
+ if(!g.isHTTP) return /* likely JSON CLI mode */;
+ else if( zPath==0 ){
zPath = g.zTop;
if( zPath[0]==0 ) zPath = "/";
}
if( g.zBaseURL!=0 && strncmp(g.zBaseURL, "https:", 6)==0 ){
zSecure = " secure;";
but i need to test more before committing.
--
- stephan beal
http://wanderinghorse.net/home/stephan/
"Freedom is sloppy. But since tyranny's the only guaranteed byproduct of
those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Segfault on json test
Hi,
The following test:
tclsh test/tester.tcl fossil json
fails with:
[...]
/home/gumble/dev/fossil/fossil json --json-input anon-1
ERROR: child killed: segmentation violation
JSON ERROR: unexpected token ":" at position 1; expecting VALUE
test json-login-a-env-validJSON FAILED!
test test-framework-json FAILED!
! json: key "payload" not known in dictionary
-code = 1
-level = 0
-errorstack = INNER dictGet CALL {test_json_payload json-login-a
{authToken name capabilities loginCookieName} {}}
-errorcode = TCL LOOKUP DICT payload
-errorinfo = key "payload" not known in dictionary
while executing
"dict get $::JR payload"
(procedure "test_json_payload" line 2)
invoked from within
"test_json_payload json-login-a {authToken name capabilities
loginCookieName} {}"
(file "/home/gumble/dev/fossil/test/json.test" line 263)
invoked from within
"source $testdir/$testfile.test"
-errorline = 1"
* End of json: 3 errors so far **
* Final results: 3 errors out of 121 tests
* Considered failures: json-1 json-login-a-env-validJSON
test-framework-json
* Ignored results: 0 ignored errors out of 121 tests
The stack trace shows:
#0 0x55d0cdf3c39e in cgi_set_cookie (
zName=zName@entry=0x55d0ceaad160 "fossil-5617be7b37c6ab30",
zValue=zValue@entry=0x55d0ceaabaa0
"97fd92d7871e141066b93aedca178577682f732f/2458305.14815368/anonymous",
zPath=0x0, lifetime=lifetime@entry=21600)
at ./src/cgi.c:216
216 if( zPath[0]==0 ) zPath = "/";
#1 0x55d0cdf835e2 in login_set_anon_cookie (zIpAddr=,
zIpAddr@entry=0x0, zCookieDest=zCookieDest@entry=0x7ffef7822f88)
at ./src/login.c:329
#2 0x55d0cdf7daba in json_page_login () at ./src/json_login.c:151
#3 0x55d0cdf7a89f in json_dispatch_root_command (
zCommand=0x55d0ceac516c "login") at ./src/json.c:2209
#4 0x55d0cdf7abab in json_cmd_top () at ./src/json.c:2313
#5 0x55d0cdf2bb9e in main (argc=, argv=)
at ./src/main.c:760
Therefore, this commit
https://www.fossil-scm.org/index.html/info/0a1f4ed6aa92f130
introduces the problem.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Cannot clone sqlite docs repository
Maybe this is a misconfiguration. The www and www3 repositories work fine: > $ fossil clone https://www.sqlite.org/cgi/src wwwsqlite.fossil > Round-trips: 10 Artifacts sent: 0 received: 78047 > Clone done, sent: 2667 received: 50594812 ip: 2.0.1.187 > Rebuilding repository meta-data... > 100.0% complete... > Extra delta compression... > Vacuuming the database... > project-id: 2ab58778c2967968b94284e989e43dc11791f548 > server-id: 0d986cdadefbdf6dc5817013b3d9be5a3c33b78e > admin-user: user (password is "2f88bf") > $ fossil clone https://www2.sqlite.org/cgi/src www2sqlite.fossil > Round-trips: 27 Artifacts sent: 0 received: 78047 > Clone done, sent: 7207 received: 134928244 ip: 2.0.1.187 > Rebuilding repository meta-data... > 100.0% complete... > Extra delta compression... > Vacuuming the database... > project-id: 2ab58778c2967968b94284e989e43dc11791f548 > server-id: 5ebe7cb6f24643f7a7f60c2794f97d0154cfbfed > admin-user: user (password is "2ab3fc") > $ fossil clone https://www3.sqlite.org/cgi/src www3sqlite.fossil > Round-trips: 19 Artifacts sent: 0 received: 78048 > Clone done, sent: 5082 received: 94686053 ip: 2.0.1.187 > Rebuilding repository meta-data... > 100.0% complete... > Extra delta compression... > Vacuuming the database... > project-id: 2ab58778c2967968b94284e989e43dc11791f548 > server-id: 57fcd57ec4bfc31240703e469ebe8e92068d61c8 > admin-user: user (password is "7fc7a3") > $ fossil clone https://www.sqlite.org/cgi/docsrc wwwdocsrc.fossil > Round-trips: 3 Artifacts sent: 0 received: 8845 > Clone done, sent: 815 received: 13188415 ip: 2.0.1.187 > Rebuilding repository meta-data... > 100.0% complete... > Extra delta compression... > Vacuuming the database... > project-id: a49a74a282acfe2f07de91768b854dffd3d783df > server-id: bee6212e61fabb9cfe6753e409b2732acd6ca1f4 > admin-user: user (password is "0acf21") > $ fossil clone https://www3.sqlite.org/cgi/docsrc www3docsrc.fossil > Round-trips: 3 Artifacts sent: 0 received: 8203 > Clone done, sent: 816 received: 14209026 ip: 2.0.1.187 > Rebuilding repository meta-data... > 100.0% complete... > Extra delta compression... > Vacuuming the database... > project-id: a49a74a282acfe2f07de91768b854dffd3d783df > server-id: 9dd7397cf53e97143a6817b46a6088ee1ce1a07d > admin-user: user (password is "245158") > $ fossil clone https://www2.sqlite.org/cgi/docsrc www2docsrc.fossil > Round-trips: 2 Artifacts sent: 0 received: 0 > Error: not authorized to clone > Round-trips: 2 Artifacts sent: 0 received: 0 > Clone done, sent: 546 received: 582 ip: 2.0.1.187 > server returned an error - clone aborted But when I clone somewhere else and then sync on www2 it works fine! > $ fossil clone --unversioned https://www.hwaci.com/cgi-bin/docsrc > www2docsrc.fossil > Round-trips: 3 Artifacts sent: 0 received: 7650 > Clone done, sent: 861 received: 10881275 ip: 2.0.1.187 > Rebuilding repository meta-data... > 100.0% complete... > Extra delta compression... > Vacuuming the database... > project-id: a49a74a282acfe2f07de91768b854dffd3d783df > server-id: c1ef59b76a7e193ec96d899c3838110d0cd93777 > admin-user: user (password is "edcf77") > $ fossil sync --verily --unversioned https://www2.sqlite.org/cgi/docsrc > -R www2docsrc.fossil > Round-trips: 2 Artifacts sent: 0 received: 0 > Server says: pull only - not authorized to push > Round-trips: 4 Artifacts sent: 0 received: 1194 > Sync done, sent: 237100 received: 2094711 ip: 2.0.1.187 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Markdown wiki relative links
Sure, a name like /wiki/a/b could be interpreted as /wiki?name=a/b, but it would still break relative paths. It's not enough for Fossil to understand that the / in a/b isn't a path separator; the browser would need to understand that as well. Linking to (c) would either go to /wiki/a/c or /c, but not /wiki/c. On Thu, Jul 5, 2018, 02:30 Dominique Devienne wrote: > On Wed, Jul 4, 2018 at 11:37 PM Stephan Beal > wrote: > >> i don't _think_ that you can use %2f in a path component and have it >> apply different semantics than a slash. How would software know to >> differentiate between the two? That would be similar to expecting a local >> file name of a\/b to work. (If it did work, it would cause no end of >> confusion.) >> > > Sure. The slash(es) would be part of the URL. > But it's the job of the "URL router" to figure it out. > > There's likely a known prefix for wiki pages, so the URL's subpart after > that prefix > can be interpreted as a "name", as is. > > It's definitely not "usual" to route a URL that way, but it certainly > possible IMHO. --DD > ___ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Markdown wiki relative links
On Wed, Jul 4, 2018 at 11:37 PM Stephan Beal wrote: > i don't _think_ that you can use %2f in a path component and have it apply > different semantics than a slash. How would software know to differentiate > between the two? That would be similar to expecting a local file name of > a\/b to work. (If it did work, it would cause no end of confusion.) > Sure. The slash(es) would be part of the URL. But it's the job of the "URL router" to figure it out. There's likely a known prefix for wiki pages, so the URL's subpart after that prefix can be interpreted as a "name", as is. It's definitely not "usual" to route a URL that way, but it certainly possible IMHO. --DD ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] branch assistance needed
On Jul 4, 2018, at 9:50 AM, Dewey Hylton wrote: > > The solution ended up being much less messy than I anticipated Yes; while Fossil will let you create awful messes, this is mitigated by several design choices: 1. It’s really hard to make Fossil actually lose data. It can be done, but it takes enough effort that you’re highly unlikely to do it by accident. 2. If you have a mess with no data loss, recovery within the existing repository is usually simple enough that restoring from a backup copy and replaying your work is almost never the best option. 3. Once bitten this way, the reason why you were bitten and the right way to avoid it is usually clear. Contrast other systems where you can be told how you screwed up and how to fix it and still be at risk of doing it again because the right way doesn’t “click”. > This is a great community. Fossil is worth fighting for. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
