Re: [fossil-users] Veracity Version control
On Tue, Mar 10, 2015 at 12:15 PM, Ron W ronw.m...@gmail.com wrote: On Tue, Mar 10, 2015 at 1:58 PM, jungle Boogie jungleboog...@gmail.com wrote: -also isn’t a single-button way to switch the default settings of permissions to the repository from open-source (default) to private, corporate use. (No idea what this means) I'm thinking he wants 2 sets of default settings: The existing one (which he perceives as being open source oriented) and another set that are more appropriate for use by software teams within a corporate environment. My interpretation as well, although I would think that three such (standard) profiles would make most sense: open source, corporate, and private. -- Andreas Kupries Senior Tcl Developer Code to Cloud: Smarter, Safer, Faster™ F: 778.786.1133 andre...@activestate.com, http://www.activestate.com Learn about Stackato for Private PaaS: http://www.activestate.com/stackato ___ 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] How to fix parallel timeline
On 3/11/15, Andreas Kupries andre...@activestate.com wrote: On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp d...@sqlite.org wrote: On 3/11/15, David Mason dma...@ryerson.ca wrote: I have several students who, through some problem while cloning the fossil I created for them, created a parallel timeline. (see screenshot) I want to merge them, but fossil merge says there's no head to merge. The commits by the student are on the right and are not tagged as trunk, but tagging them as such doesn't seem to help. Using --baseline in merge didn't help either. I was about to suggest using --baseline. What is the exact command-sequence that you used? And how do you know it didn't work - did it give an error? I wonder if merging by exact sha-hash would work ? I'm looking at the source code, and I'm thinking that --baseline ought to work. The command sequence should be: fossil update 33f9c5915f fossil merge 094b1b8a4d --baseline ce53290262 I'm still curious as to how the students managed to get the repo into this state, too. The only thing I can think of is that they had one or more check-ins in between ce53290262 and 198f28add5 that the shunned. It makes me wonder if we ought not put more safety checks and harsher warnings on the shun command? -- D. Richard Hipp d...@sqlite.org ___ 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] Veracity Version control
On Wed, Mar 11, 2015 at 1:49 AM, Graeme Pietersz gra...@pietersz.net wrote: On 11/03/15 00:45, Ron W wrote: I'm thinking he wants 2 sets of default settings: The existing one (which he perceives as being open source oriented) and another set that are more appropriate for use by software teams within a corporate environment. It would be nice to have, and not just for corporate teams. It is bit of a pain to set up a repo that has nothing publicly accessible - i.e. only logged in users see anything. It is not a huge problem, but it is a mild annoyance for those of us who regularly set up new repos. It would be nice to just click a button or run a command that sets sensible defaults for a private repo. I just remembered 2 things that partially mitigate the absence of this: 1. fossil new has a --template option to obtain settings from. It claims to require a path to the repo file. 2. fossil config has export, import, merge and other commands to save/load settings to/from a file or even another Fossil server. ___ 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] How to fix parallel timeline
On 3/11/15, David Mason dma...@ryerson.ca wrote: I have several students who, through some problem while cloning the fossil I created for them, created a parallel timeline. (see screenshot) Fossil is suppose to be bullet-proof. I'd really like to know what your students did in order to get the repository into this shape. Can you recreate the problem so that we can fix it and prevent a recurrence? Can you send me the repository file (via private email to d...@sqlite.org) so that I can try to diagnose the underlying problem? I want to merge them, but fossil merge says there's no head to merge. The commits by the student are on the right and are not tagged as trunk, but tagging them as such doesn't seem to help. Using --baseline in merge didn't help either. I was about to suggest using --baseline. What is the exact command-sequence that you used? And how do you know it didn't work - did it give an error? Any help to merge these timeline much appreciated. ../Dave -- D. Richard Hipp d...@sqlite.org ___ 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] hooks in Fossil
On Wed, Mar 11, 2015 at 8:29 AM, Gour g...@atmarama.net wrote: Now, I'd like that whenever I commit changes on my local machine and push them unto remote server, that the content of 'public' folder gets copied/synced to the remote server to the specific directory so that the site is automatically refreshed. Any hint how to accomplish it with Fossil? I've seen some posts about TH1 hooks, but not sure that's the right thing to do it. Users oF Git, of course, use Git's hooks in such scenario... I know very little about TH1 hooks, too. Another possibility might be RSS. I recall reading on this list where some have set up build servers, such as Jenkins, that monitor the Fossil RSS feed. ___ 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] Veracity Version control
Thus said Andy Goth on Wed, 11 Mar 2015 15:56:43 -0500: anonymous does have some privileges not inherited from nobody (hmncz) anonymous doesn't have z by default. No, but nobody does: https://www.fossil-scm.org/index.html/info/68ce0bcf6269988e Maybe what he really meant was that any user (not the Fossil Anonymous user), can access /zip by default? Andy -- TAI64 timestamp: 40005500b0c1 ___ 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] How to fix parallel timeline
Thus said Richard Hipp on Wed, 11 Mar 2015 15:56:41 -0400: That's an processing artifact of the graph generator. The 198f28add5 check-in references some parent a09a968bf05 which is not in the tree, so the graph generator just draws a line off the bottom of the page, not knowing what else to do. I see, definitely not the problem I thought it was. Is it possible that the parent that it references came from private content in the student's clone? Thanks, Andy -- TAI64 timestamp: 40005500afa7 ___ 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] Veracity Version control
On 3/11/2015 2:08 PM, Graeme Pietersz wrote: I just experimented with a new repo Even if nobody has no privileges, anonymous can login. True. Take away all of anonymous's capabilities to remove the ability for anonymous to log in. The documentation needs to be updated to say this clearly. anonymous does have some privileges not inherited from nobody (hmncz) anonymous doesn't have z by default. and these can be used by directly typing in the appropriate URLs. I have not tested everything, but I have verified the biggest weakness: anonymous can download a zip archive using the /zip url. h affects timeline, etc. generation m gives /wikiappend n gives /tktnew c gives /tktedit z gives /zip -- Andy Goth | andrew.m.goth/at/gmail/dot/com signature.asc Description: OpenPGP digital signature ___ 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] How to fix parallel timeline
Thanks for all the imagining. (Sorry, I was off reading the latest episode of Harry Potter and the Methods of Rationality hpmor.com quite extraordinary!) But I'm back. I could imagine one student doing some weird thing, but not a score of them with the same outcome. The directions were as I posted (without the bits in red). I would virtually guarantee that *none* of the students tried shun or rebuild or copied over the .fossil file but they all did it, and did the same thing? As likely that they all had the same hash code! :-) Sorry I can't reconstruct the sequence more accurately, but with 125 students coming in at random times with problems and only seeing this split-timeline yesterday, and now trying to put it all together Here's what I've got: 1) I have a directory with a .fossil-settings and a1/.hold a2/.hold called Template-Checkout 2) I execute a script containing: fossil new $f chmod g+w $f fossil sqlite $f INSERT INTO config VALUES ('remote_user_ok',1,strftime('%s','now')); for ta in `cat TA-id` do fossil user -R $f new $ta $ta $pw fossil user -R $f capabilities $ta v done fossil user -R $f new $who $who $pw fossil user -R $f capabilities $who v ( cd Template-Checkout fossil open --nested ../$f fossil add --dotfiles . fossil commit -m 'default setup' fossil close || exit 1 ) || { echo build for $who FAILED!! exit 1 } 3) this is inside another working directory - hence the --nested, $f is student.fossil 4) the student does a fossil clone as per the instructions in http://cps506.sarg.ryerson.ca/Resources/fossil.html 5) when they do the fossil open they *DON'T* see any files listed. The next line they see is 'project-name:' 6) they are apparently not in trunk - in fact there are no tags 7) they create files, add them, do ci 8) the marker (shruthi) clones them, updates them, and seeing nothing, registers a mark of 0 in a file called a1/Marks, adds it, commits it 9a) the student does an update, sees no mark file, or 9b) the student sees the mark file, but all files look to have gone. 10) when I update/clone and do ui I see that there are 2 timelines. Does that help at all? Thanks! On 11 March 2015 at 14:43, Eric Rubin-Smith eas@gmail.com wrote: ... unless the students used raw SQL to hack there project-id to make it match the repository into which they were pushing. But I'm thinking that is not what happened here. Little anecdote. When I was a student we were using CVS for our big project. One teammate couldn't understand why his check-ins were not showing up in CVSTrac (thanks Richard:-)... investigation revealed that he was trying to 'cp' his files onto the CVS repo tree rather than using 'cvs' commands. Not sure which is a better stress tester, a randomized fuzz program or an inexperienced student with 5 volts of coffee onboard at 2am... Eric ___ 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] Veracity Version control
On 11/03/15 23:53, Andreas Kupries wrote: On Wed, Mar 11, 2015 at 11:16 AM, jungle Boogie jungleboog...@gmail.com wrote: Hi Andreas, On 11 March 2015 at 10:58, Andreas Kupries andre...@activestate.com wrote: On Wed, Mar 11, 2015 at 10:34 AM, Richard Boehme rboe...@gmail.com wrote: I would be strongly in favor of presets in Fossil as everyone has outlined open source - everyone can read corporate - only registered users can read, and new users have minimal permissions private - I'm unsure what this means. Comments? Single user with total access, nobody else. The repo at http://core.tcl.tk/akupries/lspace/ should be an example. Locked down entirely, to myself. So the difference between private and corporate is the number of people who have access? Private = 1 user all permissions .. but the developer and reader privileges still exist so the initial user can easily add collaborators, the effect would not be very different from a Github private repo Corporate = many users different permissions Something like: 1) nobody can read the wiki and tickets, but has no access to code (or whatever else may be stored in a fossil repo) 2) users who register themselves can edit the wiki and open or comment on tickets, but have no access to code Open source = ability to clone view code on site This is my view, yes. With corporate more open than private, and more closed than OSS in the default perms. Is that correct? Thanks. Richard --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] How to fix parallel timeline
On 3/11/15, Andy Bradford amb-fos...@bradfords.org wrote: We're just eliminating all the obvious things. So, let me ask this... in the PNG of the timeline you sent, why does your ``default setup'' commit show up *after* the other timeline's first commit? According to your own steps, this should have happened prior to any students getting it, yet the second timeline clearly has a beginning time that precedes your ``default setup.'' That's an processing artifact of the graph generator. The 198f28add5 check-in references some parent a09a968bf05 which is not in the tree, so the graph generator just draws a line off the bottom of the page, not knowing what else to do. -- D. Richard Hipp d...@sqlite.org ___ 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] How to fix parallel timeline
On 3/11/15, David Mason dma...@ryerson.ca wrote: As for what they did, it was a while ago that they set them up. There was a problem that the students on Linux (typically ubuntu) didn't see the stuff I had created for them (default .fossil-settings and assignment directories), which sounds a lot like this problem. I guess they were never working on trunk. Perhaps if i'd told them to fossil update trunk it would have worked. The problem was that the version of fossil that apt-get used was version 1.27 (I think... maybe 1.29) and I created the fossils with 1.30[a507dc7cf5] (and use 1.30[cf49528e5c] to look at them). This is the resource page I point them at: http://cps506.sarg.ryerson.ca/Resources/fossil.html The first visible student check-in is 198f28add5. The manifest for that check-in shows that its parent check-in is a09a968bf05a50058f3ad50132730b719bc39e76. But artifiact a09a968bf05a50058f3ad50132730b719bc39e76 is not a check-in, it is a content file. That means that the 198f28add5 check-in manifest is corrupt. I do not know how that came to be Brainstorming... Maybe something like this occurred: (1) Copy the original repository file into xyz.fossil (2) run fossil open xyz.fossil (3) Copy a revised version of the repository over top of xyz.fossil (4) run fossil commit Copying over a repository with a new version, as is done in step (3), should not be done while there are open check-outs. One should fossil close first, then overwrite the repo, then fossil open again. That is something we do not check right now - maybe we should. It never occurred to me that somebody might overwrite a repository that was in use with a different repository. Is the scenario above a possibility? -- D. Richard Hipp d...@sqlite.org ___ 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] Veracity Version control
Hi Any, On 10 March 2015 at 23:53, Andy Goth andrew.m.g...@gmail.com wrote: On 3/11/2015 12:15 AM, jungle Boogie wrote: I created a test repo with a few commits: The commit of the 100 MB files took about 300 seconds but this ran on a single core 512MB-1gig RAM machine. I know this is unscientific but it seems fossil handled the large pretty commits well. If this were done on a machine with an SSD and some more RAM, it may not take quite as long. Please try again but with repo-cksum turned off, see what difference it makes. Adding happened almost instantly and the initial commit took about the same amount of time on a similar, but not exact machine. I unchecked 'repo-cksum' under setup_settings. The checksum was printed out around 140 seconds and then nothing until it was completed. Next time I'll actually run time but here's results with ^t in freeBSD: fossil commit -m added 10 100MB binary files load: 0.37 cmd: fossil 6695 [runnable] 6.16r 3.18u 0.90s 32% 4924k ./bigfile contains binary data. Use --no-warnings or the binary-glob setting to disable this warning. Commit anyhow (a=all/y/N)? a load: 0.34 cmd: fossil 6695 [runnable] 15.03r 5.51u 1.45s 32% 113692k load: 0.44 cmd: fossil 6695 [wdrain] 24.55r 13.60u 2.03s 68% 314064k load: 0.41 cmd: fossil 6695 [getblk] 28.05r 13.70u 2.73s 56% 28516k load: 0.45 cmd: fossil 6695 [runnable] 36.17r 19.38u 2.99s 73% 167064k load: 0.54 cmd: fossil 6695 [getblk] 44.30r 23.50u 4.10s 61% 19628k load: 0.53 cmd: fossil 6695 [runnable] 54.37r 30.71u 4.44s 75% 185956k load: 0.53 cmd: fossil 6695 [runnable] 64.78r 33.85u 5.86s 54% 109252k load: 0.56 cmd: fossil 6695 [runnable] 72.14r 41.00u 5.95s 81% 193056k load: 0.69 cmd: fossil 6695 [runnable] 90.17r 52.30u 7.31s 85% 210268k load: 0.68 cmd: fossil 6695 [runnable] 105.68r 60.91u 8.80s 79% 196856k load: 0.65 cmd: fossil 6695 [getblk] 130.93r 72.39u 11.58s 53% 104832k New_Version: 1ee295991b53f42250a642d770536aa8f6b858b3 load: 0.74 cmd: fossil 6695 [getblk] 172.76r 93.67u 15.97s 44% 74328k load: 0.65 cmd: fossil 6695 [runnable] 188.90r 96.85u 18.64s 39% 36320k load: 0.57 cmd: fossil 6695 [runnable] 200.54r 98.85u 20.52s 37% 212004k load: 0.49 cmd: fossil 6695 [runnable] 217.87r 102.10u 23.18s 33% 149572k load: 0.48 cmd: fossil 6695 [getblk] 238.94r 106.18u 26.51s 33% 88188k load: 0.45 cmd: fossil 6695 [runnable] 280.33r 112.19u 29.37s 24% 148652k load: 0.46 cmd: fossil 6695 [getblk] 311.58r 118.78u 34.00s 35% 105172k -- Andy Goth | andrew.m.goth/at/gmail/dot/com -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] Veracity Version control
On 3/11/2015 8:58 AM, Graeme Pietersz wrote: On 11/03/15 12:25, Andy Goth wrote: All you have to do is take away all of nobody's privileges. f user capabilities nobody Can also be done with the web interface. And the same for anonymous surely? No need. anonymous inherits its ability to log in from nobody. Taking away nobody's privileges also takes away anonymous's privileges. The user administration page says: No login is required for user nobody. The capabilities of the nobody user are inherited by all users, regardless of whether or not they are logged in. To disable universal access to the repository, make sure that the nobody user has no capabilities enabled. The password for nobody is ignored. If you like, you can explicitly move nobody's privileges to anonymous so that anonymous login is required. You would do this to give every human access but block spiders. Login is required for user anonymous but the password is displayed on the login screen beside the password entry box so anybody who can read should be able to login as anonymous. On the other hand, spiders and web-crawlers will typically not be able to login. Set the capabilities of the anonymous user to things that you want any human to be able to do, but not any spider. Every other logged-in user inherits the privileges of anonymous. -- Andy Goth | andrew.m.goth/at/gmail/dot/com signature.asc Description: OpenPGP digital signature ___ 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] Veracity Version control
Hi Andreas, On 11 March 2015 at 10:58, Andreas Kupries andre...@activestate.com wrote: On Wed, Mar 11, 2015 at 10:34 AM, Richard Boehme rboe...@gmail.com wrote: I would be strongly in favor of presets in Fossil as everyone has outlined open source - everyone can read corporate - only registered users can read, and new users have minimal permissions private - I'm unsure what this means. Comments? Single user with total access, nobody else. The repo at http://core.tcl.tk/akupries/lspace/ should be an example. Locked down entirely, to myself. So the difference between private and corporate is the number of people who have access? Private = 1 user all permissions Corporate = many users different permissions Open source = ability to clone view code on site Is that correct? Thanks. Richard --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] Veracity Version control
On Wed, Mar 11, 2015 at 11:16 AM, jungle Boogie jungleboog...@gmail.com wrote: Hi Andreas, On 11 March 2015 at 10:58, Andreas Kupries andre...@activestate.com wrote: On Wed, Mar 11, 2015 at 10:34 AM, Richard Boehme rboe...@gmail.com wrote: I would be strongly in favor of presets in Fossil as everyone has outlined open source - everyone can read corporate - only registered users can read, and new users have minimal permissions private - I'm unsure what this means. Comments? Single user with total access, nobody else. The repo at http://core.tcl.tk/akupries/lspace/ should be an example. Locked down entirely, to myself. So the difference between private and corporate is the number of people who have access? Private = 1 user all permissions Corporate = many users different permissions Open source = ability to clone view code on site This is my view, yes. With corporate more open than private, and more closed than OSS in the default perms. Is that correct? Thanks. Richard --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Andreas Kupries Senior Tcl Developer Code to Cloud: Smarter, Safer, Faster™ F: 778.786.1133 andre...@activestate.com, http://www.activestate.com Learn about Stackato for Private PaaS: http://www.activestate.com/stackato ___ 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] How to fix parallel timeline
Are you sure your students didn't shun something or try to use reconstruct? What would happen if the student tried to push a repo that they had created with 'fossil init' to the central clone? ___ 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] How to fix parallel timeline
On Wed, Mar 11, 2015 at 11:43 AM, Eric Rubin-Smith eas@gmail.com wrote: ... unless the students used raw SQL to hack there project-id to make it match the repository into which they were pushing. But I'm thinking that is not what happened here. Little anecdote. When I was a student we were using CVS for our big project. One teammate couldn't understand why his check-ins were not showing up in CVSTrac (thanks Richard:-)... investigation revealed that he was trying to 'cp' his files onto the CVS repo tree rather than using 'cvs' commands. Not sure which is a better stress tester, a randomized fuzz program Semi-recently seen on the sqlite list, and on HN today (https://news.ycombinator.com/item?id=9183225) http://lcamtuf.coredump.cx/afl/ or an inexperienced student with 5 volts of coffee onboard at 2am... Ouch -- Andreas Kupries Senior Tcl Developer Code to Cloud: Smarter, Safer, Faster™ F: 778.786.1133 andre...@activestate.com, http://www.activestate.com Learn about Stackato for Private PaaS: http://www.activestate.com/stackato ___ 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] How to fix parallel timeline
Thus said David Mason on Wed, 11 Mar 2015 15:17:57 -0400: But I'm back. I could imagine one student doing some weird thing, but not a score of them with the same outcome. The directions were as I posted (without the bits in red). I would virtually guarantee that *none* of the students tried shun or rebuild or copied over the .fossil file but they all did it, and did the same thing? As likely that they all had the same hash code! :-) We're just eliminating all the obvious things. So, let me ask this... in the PNG of the timeline you sent, why does your ``default setup'' commit show up *after* the other timeline's first commit? According to your own steps, this should have happened prior to any students getting it, yet the second timeline clearly has a beginning time that precedes your ``default setup.'' Thanks, Andy -- TAI64 timestamp: 400055009a46 ___ 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] Veracity Version control
On 11 March 2015 at 12:26, Graeme Pietersz gra...@pietersz.net wrote: .. but the developer and reader privileges still exist so the initial user can easily add collaborators, the effect would not be very different from a Github private repo Corporate = many users different permissions Something like: 1) nobody can read the wiki and tickets, but has no access to code (or whatever else may be stored in a fossil repo) 2) users who register themselves can edit the wiki and open or comment on tickets, but have no access to code Yes, it would be nice to restrict file/code access. -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] Veracity Version control
I would be strongly in favor of presets in Fossil as everyone has outlined open source - everyone can read corporate - only registered users can read, and new users have minimal permissions private - I'm unsure what this means. Comments? Thanks. Richard On 3/11/15, Ron W ronw.m...@gmail.com wrote: On Wed, Mar 11, 2015 at 1:49 AM, Graeme Pietersz gra...@pietersz.net wrote: On 11/03/15 00:45, Ron W wrote: I'm thinking he wants 2 sets of default settings: The existing one (which he perceives as being open source oriented) and another set that are more appropriate for use by software teams within a corporate environment. It would be nice to have, and not just for corporate teams. It is bit of a pain to set up a repo that has nothing publicly accessible - i.e. only logged in users see anything. It is not a huge problem, but it is a mild annoyance for those of us who regularly set up new repos. It would be nice to just click a button or run a command that sets sensible defaults for a private repo. I just remembered 2 things that partially mitigate the absence of this: 1. fossil new has a --template option to obtain settings from. It claims to require a path to the repo file. 2. fossil config has export, import, merge and other commands to save/load settings to/from a file or even another Fossil server. -- Thank you. Richard Boehme Email: rboe...@gmail.com Phone: 443-739-8502 Work Phone: 410-966-6606 (Mon - Thu 6 AM - 4:30 PM) ___ 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] How to fix parallel timeline
On 3/11/15, Eric Rubin-Smith eas@gmail.com wrote: Are you sure your students didn't shun something or try to use reconstruct? What would happen if the student tried to push a repo that they had created with 'fossil init' to the central clone? The push would be refused. Every fossil init creates a new random project-id string. Repos with different project-ids will not sync. The project-id exists to prevent the kind of accident you describe. ... unless the students used raw SQL to hack there project-id to make it match the repository into which they were pushing. But I'm thinking that is not what happened here. -- D. Richard Hipp d...@sqlite.org ___ 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] How to fix parallel timeline
... unless the students used raw SQL to hack there project-id to make it match the repository into which they were pushing. But I'm thinking that is not what happened here. Little anecdote. When I was a student we were using CVS for our big project. One teammate couldn't understand why his check-ins were not showing up in CVSTrac (thanks Richard:-)... investigation revealed that he was trying to 'cp' his files onto the CVS repo tree rather than using 'cvs' commands. Not sure which is a better stress tester, a randomized fuzz program or an inexperienced student with 5 volts of coffee onboard at 2am... Eric ___ 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] How to fix parallel timeline
Thus said Richard Hipp on Wed, 11 Mar 2015 12:48:04 -0400: I'm still curious as to how the students managed to get the repo into this state, too. This is possible if you open a repository using the --empty command line option. Basically, what you end up with when you do this are two DAGs in the repository, each with their own independent line of development. This means that merging between the two won't really be possible, (or perhaps very difficult) because they are not at all related in their DAG. Did the students use --empty (perhaps misunderstanding what it is used for)? Andy -- TAI64 timestamp: 400055009345 ___ 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] Veracity Version control
Hi Andy, On 11 March 2015 at 11:49, jungle Boogie jungleboog...@gmail.com wrote: Next time I'll actually run time but here's results with ^t in freeBSD: fossil commit -m added 10 100MB binary files load: 0.37 cmd: fossil 6695 [runnable] 6.16r 3.18u 0.90s 32% 4924k ./bigfile contains binary data. Use --no-warnings or the binary-glob setting to disable this warning. Commit anyhow (a=all/y/N)? a load: 0.34 cmd: fossil 6695 [runnable] 15.03r 5.51u 1.45s 32% 113692k load: 0.44 cmd: fossil 6695 [wdrain] 24.55r 13.60u 2.03s 68% 314064k load: 0.41 cmd: fossil 6695 [getblk] 28.05r 13.70u 2.73s 56% 28516k load: 0.45 cmd: fossil 6695 [runnable] 36.17r 19.38u 2.99s 73% 167064k load: 0.54 cmd: fossil 6695 [getblk] 44.30r 23.50u 4.10s 61% 19628k load: 0.53 cmd: fossil 6695 [runnable] 54.37r 30.71u 4.44s 75% 185956k load: 0.53 cmd: fossil 6695 [runnable] 64.78r 33.85u 5.86s 54% 109252k load: 0.56 cmd: fossil 6695 [runnable] 72.14r 41.00u 5.95s 81% 193056k load: 0.69 cmd: fossil 6695 [runnable] 90.17r 52.30u 7.31s 85% 210268k load: 0.68 cmd: fossil 6695 [runnable] 105.68r 60.91u 8.80s 79% 196856k load: 0.65 cmd: fossil 6695 [getblk] 130.93r 72.39u 11.58s 53% 104832k New_Version: 1ee295991b53f42250a642d770536aa8f6b858b3 load: 0.74 cmd: fossil 6695 [getblk] 172.76r 93.67u 15.97s 44% 74328k load: 0.65 cmd: fossil 6695 [runnable] 188.90r 96.85u 18.64s 39% 36320k load: 0.57 cmd: fossil 6695 [runnable] 200.54r 98.85u 20.52s 37% 212004k load: 0.49 cmd: fossil 6695 [runnable] 217.87r 102.10u 23.18s 33% 149572k load: 0.48 cmd: fossil 6695 [getblk] 238.94r 106.18u 26.51s 33% 88188k load: 0.45 cmd: fossil 6695 [runnable] 280.33r 112.19u 29.37s 24% 148652k load: 0.46 cmd: fossil 6695 [getblk] 311.58r 118.78u 34.00s 35% 105172k This is probably what you were expecting! % time fossil commit -m 10 100MB files to add ./bigfile contains binary data. Use --no-warnings or the binary-glob setting to disable this warning. Commit anyhow (a=all/y/N)? a New_Version: 96778d7a2c524b8ff7a279fba587fa87d3dbf084 load: 0.76 cmd: fossil 6811 [getblk] 150.21r 89.35u 13.39s 58% 8824k fossil commit -m 10 100MB files to add 96.78s user 18.96s system 62% cpu 3:04.76 total That's drastically better! I must have failed to save/refresh the setting to ensure it was disabled previously. I will say that attempting to load the hex binary in chrome didn't work. The tab in chrome crashed after about five minutes. -- Andy Goth | andrew.m.goth/at/gmail/dot/com -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] How to fix parallel timeline
Thus said David Mason on Wed, 11 Mar 2015 11:07:11 -0400: I have several students who, through some problem while cloning the fossil I created for them, created a parallel timeline. (see screenshot) Do you create the intial repository for the students? If so, do you initialize the repository without a project-code or do something else with the project code? Do your instructions for opening the repository include --empty? What version of fossil is being used to create/clone the repositories? See some discussion here for some relevant discussion: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg17644.html Andy -- TAI64 timestamp: 400055009683 ___ 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] How to fix parallel timeline
I've emailed the fossil to drh. That sequence of update and merge just toggled between timelines. I.e.: ADDED Fossils/A3.hs ADDED Fossils/a1.hs ADDED Fossils/a2-a2.hs ADDED Fossils/test DELETE .fossil-settings/allow-symlinks DELETE .fossil-settings/binary-glob DELETE .fossil-settings/clean-glob DELETE .fossil-settings/ignore-glob DELETE .fossil-settings/ignore-glob.no-warn DELETE a1/.hold DELETE a2/.hold DELETE a3/.hold DELETE a4/.hold DELETE a5/.hold DELETE a6/.hold As for what they did, it was a while ago that they set them up. There was a problem that the students on Linux (typically ubuntu) didn't see the stuff I had created for them (default .fossil-settings and assignment directories), which sounds a lot like this problem. I guess they were never working on trunk. Perhaps if i'd told them to fossil update trunk it would have worked. The problem was that the version of fossil that apt-get used was version 1.27 (I think... maybe 1.29) and I created the fossils with 1.30[a507dc7cf5] (and use 1.30[cf49528e5c] to look at them). This is the resource page I point them at: http://cps506.sarg.ryerson.ca/Resources/fossil.html ../Dave On 11 March 2015 at 12:48, Richard Hipp d...@sqlite.org wrote: On 3/11/15, Andreas Kupries andre...@activestate.com wrote: On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp d...@sqlite.org wrote: On 3/11/15, David Mason dma...@ryerson.ca wrote: I have several students who, through some problem while cloning the fossil I created for them, created a parallel timeline. (see screenshot) I want to merge them, but fossil merge says there's no head to merge. The commits by the student are on the right and are not tagged as trunk, but tagging them as such doesn't seem to help. Using --baseline in merge didn't help either. I was about to suggest using --baseline. What is the exact command-sequence that you used? And how do you know it didn't work - did it give an error? I wonder if merging by exact sha-hash would work ? I'm looking at the source code, and I'm thinking that --baseline ought to work. The command sequence should be: fossil update 33f9c5915f fossil merge 094b1b8a4d --baseline ce53290262 I'm still curious as to how the students managed to get the repo into this state, too. The only thing I can think of is that they had one or more check-ins in between ce53290262 and 198f28add5 that the shunned. It makes me wonder if we ought not put more safety checks and harsher warnings on the shun command? -- D. Richard Hipp d...@sqlite.org ___ 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] How to fix parallel timeline
I'd virtually guarantee that 20 students - and only the ones running using the apt-get fossil - did not try the --empty switch. Unfortunately. And when I added tags to the empty timeline they were still not mergable. ../Dave On 11 March 2015 at 15:10, Andy Bradford amb-fos...@bradfords.org wrote: Thus said Richard Hipp on Wed, 11 Mar 2015 12:48:04 -0400: I'm still curious as to how the students managed to get the repo into this state, too. This is possible if you open a repository using the --empty command line option. Basically, what you end up with when you do this are two DAGs in the repository, each with their own independent line of development. This means that merging between the two won't really be possible, (or perhaps very difficult) because they are not at all related in their DAG. Did the students use --empty (perhaps misunderstanding what it is used for)? Andy -- TAI64 timestamp: 400055009345 ___ 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] How to fix parallel timeline
On 3/11/15, Andy Bradford amb-fos...@bradfords.org wrote: Thus said David Mason on Wed, 11 Mar 2015 15:17:57 -0400: But I'm back. I could imagine one student doing some weird thing, but not a score of them with the same outcome. The directions were as I posted (without the bits in red). I would virtually guarantee that *none* of the students tried shun or rebuild or copied over the .fossil file but they all did it, and did the same thing? As likely that they all had the same hash code! :-) We're just eliminating all the obvious things. So, let me ask this... in the PNG of the timeline you sent, why does your ``default setup'' commit show up *after* the other timeline's first commit? According to your own steps, this should have happened prior to any students getting it, yet the second timeline clearly has a beginning time that precedes your ``default setup.'' Thanks, Andy -- TAI64 timestamp: 400055009a46 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- D. Richard Hipp d...@sqlite.org ___ 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] hooks in Fossil
Wed, 11 Mar 2015 13:29:13 +0100 Gour g...@atmarama.net: Now, I'd like that whenever I commit changes on my local machine and push them unto remote server, that the content of 'public' folder gets copied/synced to the remote server to the specific directory so that the site is automatically refreshed. Any hint how to accomplish it with Fossil? I've seen some posts about TH1 hooks, but not sure that's the right thing to do it. You could use TH1 hooks for this, but it's sort of a two-step process if you want to invoke external commands. You strictly need Fossil built with TCL, as TH1 doesn't expose system calls (yet). Basically you'd prepare `th1-setup` (Admin Settings) with a script such as: proc command_notify {} { if {$::cmd_name eq push} { tclInvoke exec ./your/public-update-script } } You can easily do the same with the Admin Transfer hooks. (They're just less general than TH1 hooks, meant for the most common tasks.) Either add a TCL exec as `Push` script there: tclInvoke exec ... Or alternatively just use a webserver callback script: http http://localhost/fossil/update-public-repo.cgi; (Perhaps more work to wrap your updating script as CGI handler though..) ___ 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] hooks in Fossil
You can hook the commit: admintransferscommit , but you'll need a way to make it copy the files. I have a similar setup with LaTeX generating a PDF every time I commit a change to the source. For this purpose I built an exec command for TH1. By pure luck I've just sent a patch for my latest version, under an email labeled TH1 exec. Maybe you can take a look at it, include it in the fossil source code, compile, and use it. If you do, any comments to improve it are welcomed. I guess you can write a shell script (or bat in windows) and use something like rsync... dunno which is your remote server setup. You will be calling that one from the hook. On Wed, Mar 11, 2015 at 12:25 PM, Ron W ronw.m...@gmail.com wrote: On Wed, Mar 11, 2015 at 8:29 AM, Gour g...@atmarama.net wrote: Now, I'd like that whenever I commit changes on my local machine and push them unto remote server, that the content of 'public' folder gets copied/synced to the remote server to the specific directory so that the site is automatically refreshed. Any hint how to accomplish it with Fossil? I've seen some posts about TH1 hooks, but not sure that's the right thing to do it. Users oF Git, of course, use Git's hooks in such scenario... I know very little about TH1 hooks, too. Another possibility might be RSS. I recall reading on this list where some have set up build servers, such as Jenkins, that monitor the Fossil RSS feed. ___ 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] Xekri with small side-by-side diff
The branch skin-xekri has been updated with the font size change as well as some other improvements based on an off-list conversation with Jungle. Please check it out and let me know if there are any more requested changes. Thank you Jungle, your input was greatly appreciated! On Tue, Mar 10, 2015 at 1:41 PM, jungle Boogie jungleboog...@gmail.com wrote: Hi Andrew, On 10 March 2015 at 11:33, Andrew Moore zak...@gmail.com wrote: Hello! Sorry the font was to small for you (I contributed the skin), that change looks good. Thanks for the contributions! Do you mind sharing which browser and OS you are using? I would like to try to reproduce the issue. As far as fonts go, all font sizes should be relative (using the rem value suffix) to the font size defined in the html section at the top of the CSS file. The test I'm doing is simply a git repo clone of freeswitch so I'll give you admin access in a different email and you can do whatever you want to test it. What other modifications are you making that seem to be ignored in the CSS? Thanks for the feedback :-) zakero -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] Veracity Version control
On 3/11/2015 12:15 AM, jungle Boogie wrote: I created a test repo with a few commits: The commit of the 100 MB files took about 300 seconds but this ran on a single core 512MB-1gig RAM machine. I know this is unscientific but it seems fossil handled the large pretty commits well. If this were done on a machine with an SSD and some more RAM, it may not take quite as long. Please try again but with repo-cksum turned off, see what difference it makes. -- Andy Goth | andrew.m.goth/at/gmail/dot/com signature.asc Description: OpenPGP digital signature ___ 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] Veracity Version control
On Wed, Mar 11, 2015 at 01:53:36AM -0500, Andy Goth wrote: On 3/11/2015 12:15 AM, jungle Boogie wrote: I created a test repo with a few commits: The commit of the 100 MB files took about 300 seconds but this ran on a single core 512MB-1gig RAM machine. I know this is unscientific but it seems fossil handled the large pretty commits well. If this were done on a machine with an SSD and some more RAM, it may not take quite as long. Please try again but with repo-cksum turned off, see what difference it makes. It should cut the size about in half, but a better question would be what openssl speed sha1 gives for the largest block size. Joerg ___ 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] How to fix parallel timeline
Thus said David Mason on Wed, 11 Mar 2015 15:17:57 -0400: Does that help at all? I tried these steps with Fossil from trunk and saw the files when I opened the Fossil. Any chance you could make up a test fossil using the above mentioned steps (and a fake student/user and TA) in the environment where you normally make them and make it available for download? Thanks, Andy -- TAI64 timestamp: 40005501105c ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Fossil Skins with help menu for 'nobody'
Hello All, Kind of a continuation of this thread: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg19442.html Specifically regarding user permissions later on in the thread. The following skins have the help menu exposed even if user 'nobody' has no permissions: -Enhanced Default -Eagle -Xekri Is this expected for only these skins or should it match the other six skins? -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info xmpp: jungle-boo...@jit.si ___ 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] TH1 exec
For those interested in a TH1 exec command, I took the ideas from Stephan and Ron, and mixed a few of my own. Here I present my latest version for the exec command I'm using. Now I directly call the functions already included in src/popen.c This time, it can take up to 3 parameters: *exec ?NOWAIT? ?stdin? cmd* *stdin:* will be sent to the child process (and then the pipe will be closed). *NOWAIT: *will create the process and continue (I/O pipes are closed immediately, but not until stdin is passed to the child). *cmd:* well... you know what it means. As usual, comments, ideas and criticism are welcomed! http://abiliojr.homenet.org:20001/public/execcmd.diff On Thu, Feb 5, 2015 at 12:11 PM, Ron W ronw.m...@gmail.com wrote: On Thu, Feb 5, 2015 at 11:09 AM, Abilio Marques abili...@gmail.com wrote: Here the current code (missing the capture of the stdout). I send it as a patch to the current trunk version (0d1d7f6481). Ideas? I suggest altering the parameter processing to be: if ( argc == 3 ){ if (fossil_strcmp(argv[1], NOWAIT) == 0){ wait = 0; cmd = argv[2]; } else { return /* insert value for unknown option */; } } else { cmd = argv[1]; } ___ 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] Veracity Version control
On 11/03/15 12:25, Andy Goth wrote: On 3/11/2015 12:49 AM, Graeme Pietersz wrote: On 11/03/15 00:45, Ron W wrote: I'm thinking he wants 2 sets of default settings: The existing one (which he perceives as being open source oriented) and another set that are more appropriate for use by software teams within a corporate environment. It would be nice to have, and not just for corporate teams. It is bit of a pain to set up a repo that has nothing publicly accessible - i.e. only logged in users see anything. It is not a huge problem, but it is a mild annoyance for those of us who regularly set up new repos. It would be nice to just click a button or run a command that sets sensible defaults for a private repo. All you have to do is take away all of nobody's privileges. f user capabilities nobody Can also be done with the web interface. And the same for anonymous surely? ___ 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] Xekri with small side-by-side diff
On 3/11/15, Andrew Moore zak...@gmail.com wrote: The branch skin-xekri has been updated with the font size change as well as some other improvements based on an off-list conversation with Jungle. Please check it out and let me know if there are any more requested changes. Thank you Jungle, your input was greatly appreciated! I have recompiled the server to the latest code from Andrew and Jungle Boogie, and made the xekri skin available under the alternative URL: https://www.fossil-scm.org/skin2 -- D. Richard Hipp d...@sqlite.org ___ 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] How to fix parallel timeline
Thus said Richard Hipp on Wed, 11 Mar 2015 14:32:18 -0400: Brainstorming... Maybe something like this occurred: (1) Copy the original repository file into xyz.fossil (2) run fossil open xyz.fossil (3) Copy a revised version of the repository over top of xyz.fossil (4) run fossil commit This seems like a much more likely scenario than anything else I've seen and certainly within the realm of what a student unfamiliar with ``allowing the SCM to manage things'' might do, thinking they have to manage the .fossil file. Many moons ago, some fellow students blamed CVS for losing their changes everytime certain people committed. But that's because they had files outside the working area, would make changes there, and then copy them into CVS (like it was some glorified backup), not realizing that everytime they did this, they wiped out someone else's changes. How could this be prevented? Write a repo synchronization value into the config table and the vvar table in the .fslckout DB and then verify that they are the same before committing? Andy -- TAI64 timestamp: 400055010af4 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users