Re: [fossil-users] A warning on 'undo'
On Jan 18, 2013, at 17:49 , Lluís Batlle i Rossell wrote: On Fri, Jan 18, 2013 at 11:46:50AM -0500, sky5w...@gmail.com wrote: When in doubt, I run: fossil status Well, I usually don't doubt. If fossil doesn't warn me, I consider it hasn't thrown away any my local changes. And I don't want to doubt. :) That's an opportunity for improvement: automatically stash local changes before destroying. 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] How to force commit?
2012/11/25 Stefan Bellon sbel...@sbellon.de: Attached you'll find a patch that adds the unicode-glob to the settings and respects its setting in the check-in. Additionally I disabled all the check-in warnings (crnl, binary and unicode) in case --force/-f is set on commit. This patch is now in trunk already, but I'm just wondering if the unicode-globwouldn't better be named encoding-glob. The actual purpose of this warning is not whether some file contains unicode, the fact that the encoding is known to be not UTF-8 is what's really matters: those files cannot be displayed correctly in the fossil web UI. This would allow to enhance the file content checking such that it detects invalid utf-8 as well, without the need to add a new *-glob setting. The concept can be found in the improve_commit_warning branch. Feedback appreciated. Regards, Jan Nijtmans ___ 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] Fossil 1.25
On Mon, Jan 21, 2013 at 6:11 PM, sky5w...@gmail.com wrote: But fossil ui shows manifest version: This page was generated in about 0.016s by Fossil version [80bf94e0f7] 2013-01-18 21:34:21 How can I trick the simpler 1.25 to appear? Untested, but i _think_ you need to go into the footer config and replace: Fossil version $manifest_version $manifest_date with Fossil version $release_version -- - 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] Fossil 1.25
On Mon, Jan 21, 2013 at 12:11 PM, sky5w...@gmail.com wrote: Another question about compiling fossil from src? VERSION.h contents: #define MANIFEST_UUID 80bf94e0f7ea9eb64ad9c35ed61863d73160767e #define MANIFEST_VERSION [80bf94e0f7] #define MANIFEST_DATE 2013-01-18 21:34:21 #define MANIFEST_YEAR 2013 #define RELEASE_VERSION 1.25 #define RELEASE_VERSION_NUMBER 125 #define RELEASE_RESOURCE_VERSION 1,25,0,0 But fossil ui shows manifest version: This page was generated in about 0.016s by Fossil version [80bf94e0f7] 2013-01-18 21:34:21 How can I trick the simpler 1.25 to appear? Edit the Footer using the Admin/Footer web interface. Replace $manifest_version and $manifest_date with $release_version. -- 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] Fossil 1.25
Done. Can't believe I didn't see that :( Fossil v$release_version$manifest_version $manifest_date Thanks for fossil! On Mon, Jan 21, 2013 at 12:16 PM, Richard Hipp d...@sqlite.org wrote: On Mon, Jan 21, 2013 at 12:11 PM, sky5w...@gmail.com wrote: Another question about compiling fossil from src? VERSION.h contents: #define MANIFEST_UUID 80bf94e0f7ea9eb64ad9c35ed61863d73160767e #define MANIFEST_VERSION [80bf94e0f7] #define MANIFEST_DATE 2013-01-18 21:34:21 #define MANIFEST_YEAR 2013 #define RELEASE_VERSION 1.25 #define RELEASE_VERSION_NUMBER 125 #define RELEASE_RESOURCE_VERSION 1,25,0,0 But fossil ui shows manifest version: This page was generated in about 0.016s by Fossil version [80bf94e0f7] 2013-01-18 21:34:21 How can I trick the simpler 1.25 to appear? Edit the Footer using the Admin/Footer web interface. Replace $manifest_version and $manifest_date with $release_version. -- 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 force commit?
On Mon, 21 Jan, Jan Nijtmans wrote: This patch is now in trunk already, but I'm just wondering if the unicode-globwouldn't better be named encoding-glob. The actual purpose of this warning is not whether some file contains unicode, the fact that the encoding is known to be not UTF-8 is what's really matters: those files cannot be displayed correctly in the fossil web UI. Well, then the question is whether not just allow to commit everything (regardless of the file content) and guess the encoding for display purposes in the web UI. This can be a 2-step approach: First look for a BOM and use that as encoding indicator, if no BOM is present, call the encoding heuristic code from UNIX tool file (licensed under a 2-clause BSD license). This code compiles on a variety of platforms and we successfully use it on 32-bit and 64-bit configurations for GNU/Linux, Windows and Solaris to guess the encoding of files at work. Greetings, Stefan -- Stefan Bellon ___ 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 force commit?
2013/1/21 Stefan Bellon sbel...@sbellon.de: On Mon, 21 Jan, Jan Nijtmans wrote: This patch is now in trunk already, but I'm just wondering if the unicode-globwouldn't better be named encoding-glob. The actual purpose of this warning is not whether some file contains unicode, the fact that the encoding is known to be not UTF-8 is what's really matters: those files cannot be displayed correctly in the fossil web UI. Well, then the question is whether not just allow to commit everything (regardless of the file content) and guess the encoding for display purposes in the web UI. I'm not trying to discuss whether to allow committing something or not, that's exactly what the *-glob settings are for. I just would not like to add a new *-glob setting for every possible encoding, therefore I propose to rename unicode-glob to encoding-glob. Then crnl-glob, binary-glob and encoding-glob form a nice triplet of categories which can be controled separately, without the need to define any more of them in the future. Opinions? Fossil 1.24 didn't have unicode-glob yet, therefore now is a good time to re-consider the name before 1.25 is released. Regards, Jan Nijtmans ___ 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 force commit?
On Mon, 21 Jan, Jan Nijtmans wrote: I'm not trying to discuss whether to allow committing something or not, that's exactly what the *-glob settings are for. That's what I do not understand. I do not understand the relevance of the encoding regarding whether a file should be allowed to be committed or not. If I understand your suggestion correctly, the best name would be non-utf-8-glob which looks kind of strange to me. And a lot of people would just set this to * in order to allow for iso-8859-1, iso-8859-15, Windows-1251, etc. If this however it used to determine whether the web UI can display the content, then for those configurations no file would be displayed in the web UI, as non-utf-8-glob * (or encoding-glob with the same semantics) would mean not UTF-8, no idea to display for all files. That's why I suggested that the encoding of a file does not have any relevance of whether it can be committed or not. The encoding of a file just has relevance when the data is being interpreted again. The user knows how to deal with the committed content, only the web UI does not. Therefore the web UI needs heuristics to guess the encoding correctly in order to display it properly. BTW, the UNIX file code also has heuristics for binary and DOS line endings, so that you wouldn't have to explicitly set those globs either. My proposal was just to allow any file to be committed, but for display purposes, the file heuristics tells what encoding and what line ending a file has, or whether it is even binary. If I am completely misunderstanding what those *-glob are intended for, please explain in more detail to me. Fossil 1.24 didn't have unicode-glob yet, therefore now is a good time to re-consider the name before 1.25 is released. Yes, IF those need to stay and IF unicode-glob is a bad name, THEN now is the time to change it to encoding-glob. I'm just not sure that this solves the issue ... unless I misunderstand the issue. I am not trolling nor making up arguments, I just don't see that renaming unicode-glob to encoding-glob makes things any different. Greetings, Stefan -- Stefan Bellon ___ 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 force commit?
2013/1/21 Stefan Bellon sbel...@sbellon.de: If I am completely misunderstanding what those *-glob are intended for, please explain in more detail to me. OK, I'll try to do that. On UNIX, there's no issue: All files committed are normally in the system encoding, assuming it's UTF-8. In the Windows world, some editors/tools might produce files in cp1252 or 'unicode'. Committing those to fossil is no problem at all, until those are checked out on UNIX. What I want is a safety net: If I make a mistake, editing some file with Notepad++ but forgetting to set the encoding right. I would like fossil to warn me. The *-glob settings are meant to configure whether people want such a warning. Some do, other's don't. I don't mind what the default is, as long as I can configure it to give me the warnings. That's what the 3 *-glob settings are providing. Fossil 1.24 didn't have unicode-glob yet, therefore now is a good time to re-consider the name before 1.25 is released. Yes, IF those need to stay and IF unicode-glob is a bad name, THEN now is the time to change it to encoding-glob. I'm just not sure that this solves the issue ... unless I misunderstand the issue. I am not trolling nor making up arguments, I just don't see that renaming unicode-glob to encoding-glob makes things any different. I don't think that unicode-glob is a bad name, just that encoding-glob is more general. But I would love to hear how others think about that. Maybe someone has a brilliant alternative. Regards, Jan Nijtmans ___ 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 force commit?
On Mon, 21 Jan, Jan Nijtmans wrote: I don't mind what the default is, as long as I can configure it to give me the warnings. That's what the 3 *-glob settings are providing. Ok, then I misunderstood you when you reasoned with the web UI. As long as I can set all three *-glob to *, I'm fine with whatever you call them, then. ;-) Greetings, Stefan -- Stefan Bellon ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
