Re: [fossil-users] Self-registered users unable to log in
On Sat, Mar 31, 2012 at 2:50 PM, Stephan Beal sgb...@googlemail.com wrote:
i _think_ the right thing to do there would be to use call
login_set_user_cookie() to replace the several lines which deal with the
cookie. That said: as Richard says: this isn't a feature any of us touches,
so i'm hesitant to tinker with it :/.
@Justin: can you please try this out and see if it does the trick:
Index: src/login.c
==
--- src/login.c
+++ src/login.c
@@ -1229,23 +1229,11 @@
);
free(zPw);
/* The user is registered, now just log him in. */
uid = db_int(0, SELECT uid FROM user WHERE login=%Q, zUsername);
-zCookieName = login_cookie_name();
-zExpire = db_get(cookie-expire,8766);
-expires = atoi(zExpire)*3600;
-zIpAddr = PD(REMOTE_ADDR,nil);
-
-zCookie = db_text(0, SELECT '%d/' || hex(randomblob(25)), uid);
-cgi_set_cookie(zCookieName, zCookie, login_cookie_path(), expires);
-record_login_attempt(zUsername, zIpAddr, 1);
-db_multi_exec(
-UPDATE user SET cookie=%Q, ipaddr=%Q,
- cexpire=julianday('now')+%d/86400.0 WHERE uid=%d,
-zCookie, ipPrefix(zIpAddr), expires, uid
-);
+login_set_user_cookie( zUsername, uid, NULL );
redirect_to_g();
}
}
}
If so i'll clean that up (remove now-unused vars) and get it committed.
--
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
___
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 switching [was: import of ancient projects]
Hi Stephan, basically newly created would indicate that a branch is being created by using --branch option whereas this new could also indicate that a new branch has been created before running commit along with using --branch. Even better --branch branchname -- create a branch and commit to this newly created branch. I haven't noticed the fossil help --all option whivh would also list checkout and co commands. Marek Original Message From：Stephan Beal sgb...@googlemail.com Time：3/29/2012 20:34 To：Fossil SCM user's discussion fossil-users@lists.fossil-scm.org Subject：Re: [fossil-users] branch switching [was: import of ancient projects] On Thu, Mar 29, 2012 at 8:19 PM, mlfconv mlf.c...@gmail.com wrote: Absolutely no problem, thanks! I haven't figured out co since the version of Fossil I'm using doesn't seem to list co as a command. [1.22] Are there plans to add co to list of commands? It's an alias for checkout, and aliases apparently don't show up in that list. See: [stephan@hamsun:~/cvs/fossil/fossil]$ f help checkout Usage: f checkout ?VERSION | --latest? ?OPTIONS? or: f co ?VERSION | --latest? ?OPTIONS? ... Perhaps instead ofThe --branch option folowed by a branch name causes the new checkin to be placed in the named branch something like the --branch option followed by branch name causes the new check-in to be placed in a newly created branch carrying the name specified by --branch option [stephan@hamsun:~/cvs/fossil/fossil]$ f help ci ... The --branch option followed by a branch name causes the new check-in to be placed in a newly-created branch with the name passed to the --branch option. [stephan@hamsun:~/cvs/fossil/fossil]$ f com -m 'minor checkin doc improvement (suggestion from Marek).' Autosync: http://step...@fossil-scm.org Bytes Cards Artifacts Deltas Sent: 177 2 0 0 Received: 768 17 0 0 Total network traffic: 375 bytes sent, 590 bytes received New_Version: b6d219b9203d17e1c49b663b21ca5d1f266acd9d ... Alsocheck in to this new branch could be replaced by check in to this newly created branch i think that one's splitting hairs. :) alternatively perhaps something like Fossil commit --branch --basis would be nice where if a branch doesn't exist it would create one and if not it would co to that branch. i'll have to defer such a change to someone more familiar with that particular code :/. i primarily hack on the far outer edges of fossil (mainly the JSON API), not in the hard parts ;). -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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
[fossil-users] New CSS on the Fossil homepage
I have succumbed to the temptations of eye-candy. Please offer your thoughts and constructive comments on the new lookhttp://www.fossil-scm.org/fossil/doc/trunk/www/index.wikiof the Fossil website versus the previous style http://www2.fossil-scm.org/fossil/doc/trunk/www/index.wiki. -- 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] branch switching [was: import of ancient projects]
On Sat, Mar 31, 2012 at 5:46 PM, Richard Hipp d...@sqlite.org wrote: to see the very latest text, visit http://www.fossil-scm.org/fossil/help/commit Wow - i didn't know the web interface could do that. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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] import of ancient projects
Hi, I'm now at the stage where everything is imported properly and ended up trying to merge A2 and B2 which resulted in 7 merge conflicts, I'm not sure how to display them (possibly via web ui) or even better how to replace that merge with another file, basically ending up with desired fake merge. thanks, Marek Original Message From：Ron Wilson ronw.m...@gmail.com Time：3/28/2012 19:12 To：Fossil SCM user's discussion fossil-users@lists.fossil-scm.org Subject：Re: [fossil-users] import of ancient projects On Wed, Mar 28, 2012 at 12:54 PM, mlfconv mlf.c...@gmail.com wrote: basically i don't want Fossil to perform a merge of A2 and B2 (A is the master branch) but insert another file which only acts as a merge and is tagged or labeled as merge but no actual merge is performed by Fossil, A3 is only inserted instead of merging (A3 actually is a file that merged two distinct features from A2 and B2 which is why I want to keep it as historical record instead of doing an actual merge, also B2 evolved into B3 after merge into A3. As long as you don't mind that the revision graph will not show any indication of a merge, you can just commit A3 as is. If you do want the graph to show a merge, you can do a fossil merge, then replace the result with your A3 before commiting. (As I mentioned, fossil merge does not automatically commit the result of a merge. In your case, it would merge changes from B into your working copy of A2, leaving the resulting files for you to review/edit/replace, then you have to do the actual commit.) ___ 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] New CSS on the Fossil homepage
On Sat, Mar 31, 2012 at 5:37 PM, Richard Hipp d...@sqlite.org wrote: I have succumbed to the temptations of eye-candy. Please offer your thoughts and constructive comments on the new lookhttp://www.fossil-scm.org/fossil/doc/trunk/www/index.wikiof the Fossil website versus the previous style http://www2.fossil-scm.org/fossil/doc/trunk/www/index.wiki. i like the corners, but the background seems a bit too 1998. i like the rotated skeleton, too. My roommate says the background clashes too much with the site's colors. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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] import of ancient projects
On Sat, Mar 31, 2012 at 6:06 PM, mlfconv mlf.c...@gmail.com wrote: I'm now at the stage where everything is imported properly and ended up trying to merge A2 and B2 which resulted in 7 merge conflicts, I'm not sure how to display them (possibly via web ui) or even better how to replace that merge with another file, basically ending up with desired fake merge. You can't display the conflicts with fossil, but to simply replace the conflicted file, just copy your desired version over it and commit it. There is no conflict resolution flag which has to be set like there is in svn. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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] New CSS on the Fossil homepage
2012/3/31 Stephan Beal sgb...@googlemail.com: On Sat, Mar 31, 2012 at 5:37 PM, Richard Hipp d...@sqlite.org wrote: I have succumbed to the temptations of eye-candy. Please offer your thoughts and constructive comments on the new look of the Fossil website versus the previous style. i like the corners, but the background seems a bit too 1998. i like the rotated skeleton, too. My roommate says the background clashes too much with the site's colors. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Everything is nice, but please forget about the background :) ___ 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] New CSS on the Fossil homepage
On Sat, Mar 31, 2012 at 12:13 PM, Baptiste Daroussin baptiste.darous...@gmail.com wrote: 2012/3/31 Stephan Beal sgb...@googlemail.com: On Sat, Mar 31, 2012 at 5:37 PM, Richard Hipp d...@sqlite.org wrote: I have succumbed to the temptations of eye-candy. Please offer your thoughts and constructive comments on the new look of the Fossil website versus the previous style. i like the corners, but the background seems a bit too 1998. i like the rotated skeleton, too. My roommate says the background clashes too much with the site's colors. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Everything is nice, but please forget about the background :) So now I have three variants up for consideration: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. Please continue with feedback. -- 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] New CSS on the Fossil homepage
2012/3/31 Richard Hipp d...@sqlite.org: On Sat, Mar 31, 2012 at 12:13 PM, Baptiste Daroussin baptiste.darous...@gmail.com wrote: 2012/3/31 Stephan Beal sgb...@googlemail.com: On Sat, Mar 31, 2012 at 5:37 PM, Richard Hipp d...@sqlite.org wrote: I have succumbed to the temptations of eye-candy. Please offer your thoughts and constructive comments on the new look of the Fossil website versus the previous style. i like the corners, but the background seems a bit too 1998. i like the rotated skeleton, too. My roommate says the background clashes too much with the site's colors. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Everything is nice, but please forget about the background :) So now I have three variants up for consideration: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. Please continue with feedback. I do prefer #3. regards, Bapt ___ 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] New CSS on the Fossil homepage
On Sat, Mar 31, 2012 at 6:31 PM, Richard Hipp d...@sqlite.org wrote: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. i like #3 except on my netbook, where another 50 pixels makes all the difference in screen space. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal ___ 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] Self-registered users unable to log in
@Justin: can you please try this out and see if it does the trick: +login_set_user_cookie( zUsername, uid, NULL ); If so i'll clean that up (remove now-unused vars) and get it committed. Yes, this helps. Thank you. ___ 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] New CSS on the Fossil homepage
On Mar 31, 2012, at 18:31 , Richard Hipp wrote: So now I have three variants up for consideration: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. I dislike the disturbing margins. Apart from them, the change seems ok. Kind regards, Remigiusz Modrzejewski ___ 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] New CSS on the Fossil homepage
Actually, the thing I like most is the rotated skeleton. BTW, have you considered a different logo. For me fossils usually associate with ammonites, like: http://commons.wikimedia.org/wiki/File:Haeckel_Douvilleiceras_mammillatum.jpg http://en.wikipedia.org/wiki/File:Haeckel_Ammonitida.jpg http://en.wikipedia.org/wiki/Ammonoidea If you like it then perhaps there's someone on the list with enough talent to produce a nice logo from one of the Haeckel ammonites. Cheers, Jacek 2012/3/31 Richard Hipp d...@sqlite.org: On Sat, Mar 31, 2012 at 12:13 PM, Baptiste Daroussin baptiste.darous...@gmail.com wrote: 2012/3/31 Stephan Beal sgb...@googlemail.com: On Sat, Mar 31, 2012 at 5:37 PM, Richard Hipp d...@sqlite.org wrote: I have succumbed to the temptations of eye-candy. Please offer your thoughts and constructive comments on the new look of the Fossil website versus the previous style. i like the corners, but the background seems a bit too 1998. i like the rotated skeleton, too. My roommate says the background clashes too much with the site's colors. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Everything is nice, but please forget about the background :) So now I have three variants up for consideration: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. Please continue with feedback. -- 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] New CSS on the Fossil homepage
On Sat, Mar 31, 2012 at 12:31:50PM -0400, Richard Hipp wrote: So now I have three variants up for consideration: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. I don't like the wallpaper background in #1! It reminds me of a 1990's website (and no, it didn't look good back then either). We shouldn't strive to be _that_ kind of fossil. I like the rotated fossil logo because it is more space efficient than the upright version. Whether or not to keep the new outside thick border, I could go either way. The link colors on #1 are nice - I especially like how the unclicked link is a nice subtle blue. But, please leave it a bluish hue for unclicked and a purplish hue for click - if for nothing else but standard convention's sake. I got very confused very quick on the reverse motif of whether or not I had been somewhere (but, I know I clicked on that link and read that doc, why is the link still blue???). -- Christopher Berardi http://www.natoufa.com/ May grace and peace by yours in abundance. ___ 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] New CSS on the Fossil homepage
On Sat, Mar 31, 2012 at 8:01 PM, Christopher Berardi cbera...@natoufa.comwrote: On Sat, Mar 31, 2012 at 12:31:50PM -0400, Richard Hipp wrote: So now I have three variants up for consideration: (1) http://www.fossil-scm.org/ (2) http://www2.fossil-scm.org/ (3) http://www3.fossil-scm.org/ #1 is the recent change, with the rock background, which I (being very old school) prefer. #2 is the original before recent changes. #3 is like #1 but without the background image. I don't like the wallpaper background in #1! It reminds me of a 1990's website (and no, it didn't look good back then either). Well, the consensus seems to be emerging that the background image is a bad idea. So I've taken it out of the CSS for now. (It is only commented out, so it can easily be added back in later - and I'll keep it active on my person clones of the repo, of course). All the rest is the same. -- 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
