Re: [fossil-users] filename contains illegal characters
2012/11/22 Jan Nijtmans jan.nijtm...@gmail.com: 2012/11/22 Stefan Bellon sbel...@sbellon.de: On Thu, 22 Nov, Jan Nijtmans wrote: Stefan, could you try out [e6a1910fa8]? This sounds very cool. :-) New test version in [d3bee356ba]. It changes the filename contains illegal characters fatal into a warning, which should make your situation more managable: Even though files containing '\' still cannot be handled, they don't stop the fossil addremove anymore from adding other files. Please allow some time to Richard considering this. The currently ticketing-rework has clearly much more priority than this. 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] howto `grep' through old revisions
On Sat, Nov 24, 2012 at 9:53 PM, Bernd Paysan bernd.pay...@gmx.de wrote: Am Samstag, 24. November 2012, 20:28:16 schrieb j. v. d. hoff: what you propose could easily be filter out from a full recursive search backward through all revisions (and it would require such a search), right? Fossil, like many other VCSes, compresses revisions internally, and stores only some sort of deltas. I don't know how it is actually done, but usually, it's some sort of patches. You only have to grep through the patches, they show you when things were added and removed. Expanding all the history should not be necessary to implement this feature. Fossil's patches are not like SVN patches. Those are always whole lines. Fossil's patches may start mid-word (I think). ˙uʍop-ǝpısdn sı ɹoʇıuoɯ ɹnoʎ 'sıɥʇ pɐǝɹ uɐɔ noʎ ɟı ___ 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] howto `grep' through old revisions
* Gilles gilles.gana...@free.fr [20121124 23:01]: On Sat, 24 Nov 2012 09:21:54 -0500, Richard Hipp d...@sqlite.org wrote: One big problem here is that the user will doubtless expect to have full Perl regular expressions. That will mean another compile-time dependency. And maybe also a run-time dependency if a shared library is used (as most distribution packages managers will likely require). Suddenly, Fossil becomes much less stand-alone and self-contained. Does someone know of a good LGPL regex library that could easily be statically compiled in the Fossil binary? http://en.wikipedia.org/wiki/Comparison_of_regular_expression_engines#Libraries tre? http://laurikari.net/tre/about/ qvb -- pica ___ 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 as DLL?
Gilles, You might want to take a look at the work done for SharpFossil: http://repository.mobile-developers.de/cgi-bin/ikoch/sharpfossil/index. Although it hasn't been worked on in a while, I think some of the commands you are looking for have been implemented as a wrapper useable by C# programs. Tomek To: fossil-users@lists.fossil-scm.org From: gilles.gana...@free.fr Date: Sat, 24 Nov 2012 22:40:11 +0100 Subject: Re: [fossil-users] Fossil as DLL? On Sat, 24 Nov 2012 15:31:41 -0500, Richard Hipp d...@sqlite.org wrote: The current Fossil implementation is not appropriate for converting into a library due to its extensive using of global variables and due to a cavalier attitude toward freeing allocated memory. Fossil is designed to run a single operation quickly, then quit and let the operating system clean up the mess. Even commands like fossil ui operate by having the parent process start up a new short-lived child process to process every HTTP request. Thanks for the info. I'll just read the output of commands searching for the case insensitive y/n, and if found, let the user rewrite the command in case it's incomplete ((eg. commit missing a comment through the -m switch). This question needs to be a FAQ I logged on as anonymous/dynamic-password-on-screen (Logged in as anonymous), but didn't see any Edit link anywhere in the FAQ page so I could add this question. www.fossil-scm.org/index.html/doc/trunk/www/faq.wiki Thank you. ___ 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 Sun, 25 Nov, Jan Nijtmans wrote: The crnl warning is meant to tell people: be carefull, what you are doing works fine on Windows, but not on UNIX. The unicode warning works the same: this file will probably work fine on Windows, but in UNIX project, most likely not. I would be fine with a combined crnl-glob and unicode-glob (windows-glob, maybe?), saying: what you are doing is windows-specific. It's just about the format of data one puts into fossil. If I commit a PowerPoint file, I wouldn't expect a warning this file will not work on UNIX. Neither do I expect such a warning when I commit UTF-16 or CR/NL data. It's all about the file format and the tools used to operate on them. If you have the proper tools installed, you can perfectly handle UTF-16, CR/NL and even PowerPoint files on UNIX. Partly, -f already functions like that, although -f does more: It permits no-op commits as well. I was not able to commit using the -f flag in order to override the CR/NL and the Unicode warning. Not sure about the binary warning, I haven't tested that separately. 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?
On Sun, 25 Nov, Jan Nijtmans wrote:
Partly, -f already functions like that, although -f does more: It
permits no-op commits as well.
I do not (yet) feel confident enough to propose code changes.
Maybe trying to implement a unicode-glob would be a
good not-to-difficult first step. I would welcome that.
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.
Hope this quick and rough patch is of some value.
Greetings,
Stefan
--
Stefan Bellon
Index: src/checkin.c
==
--- src/checkin.c
+++ src/checkin.c
@@ -890,10 +890,11 @@
*/
static void commit_warning(
const Blob *p,/* The content of the file being committed. */
int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
int binOk,/* Non-zero if binary warnings should be disabled. */
+ int unicodeOk,/* Non-zero if unicode warnings should be disabled. */
const char *zFilename /* The full name of the file being committed. */
){
int eType; /* return value of looks_like_utf8/utf16() */
int fUnicode; /* return value of starts_with_utf16_bom() */
char *zMsg; /* Warning message */
@@ -907,10 +908,13 @@
const char *zWarning;
Blob ans;
char cReply;
if( eType==-1 fUnicode ){
+ if ( unicodeOk ){
+return; /* We don't want unicode warnings for this file. */
+ }
zWarning = Unicode and CR/NL line endings;
}else if( eType==-1 ){
if( crnlOk ){
return; /* We don't want CR/NL warnings for this file. */
}
@@ -919,10 +923,13 @@
if( binOk ){
return; /* We don't want binary warnings for this file. */
}
zWarning = binary data;
}else{
+ if ( unicodeOk ){
+return; /* We don't want unicode warnings for this file. */
+ }
zWarning = Unicode;
}
file_relative_name(zFilename, fname, 0);
blob_zero(ans);
zMsg = mprintf(
@@ -1251,36 +1258,42 @@
/* Step 1: Insert records for all modified files into the blob
** table. If there were arguments passed to this command, only
** the identified files are inserted (if they have been modified).
*/
db_prepare(q,
-SELECT id, %Q || pathname, mrid, %s, chnged, %s FROM vfile
+SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile
WHERE chnged==1 AND NOT deleted AND is_selected(id),
-g.zLocalRoot, glob_expr(pathname, db_get(crnl-glob,)),
-glob_expr(pathname, db_get(binary-glob,))
+g.zLocalRoot,
+glob_expr(pathname, db_get(crnl-glob,)),
+glob_expr(pathname, db_get(binary-glob,)),
+glob_expr(pathname, db_get(unicode-glob,))
);
while( db_step(q)==SQLITE_ROW ){
int id, rid;
const char *zFullname;
Blob content;
-int crnlOk, binOk, chnged;
+int crnlOk, binOk, unicodeOk, chnged;
id = db_column_int(q, 0);
zFullname = db_column_text(q, 1);
rid = db_column_int(q, 2);
crnlOk = db_column_int(q, 3);
chnged = db_column_int(q, 4);
binOk = binaryOk || db_column_int(q, 5);
+unicodeOk = db_column_int(q, 6);
blob_zero(content);
if( file_wd_islink(zFullname) ){
/* Instead of file content, put link destination path */
blob_read_link(content, zFullname);
}else{
blob_read_from_file(content, zFullname);
}
-commit_warning(content, crnlOk, binOk, zFullname);
+if( !forceFlag ){
+ /* Do not emit any warnings in force mode. */
+ commit_warning(content, crnlOk, binOk, unicodeOk, zFullname);
+}
if( chnged==1 contains_merge_marker(content) ){
Blob fname; /* Relative pathname of the file */
nConflict++;
file_relative_name(zFullname, fname, 0);
Index: src/configure.c
==
--- src/configure.c
+++ src/configure.c
@@ -103,10 +103,11 @@
{ project-description,CONFIGSET_PROJ },
{ manifest, CONFIGSET_PROJ },
{ binary-glob,CONFIGSET_PROJ },
{ ignore-glob,CONFIGSET_PROJ },
{ crnl-glob, CONFIGSET_PROJ },
+ { unicode-glob, CONFIGSET_PROJ },
{ empty-dirs, CONFIGSET_PROJ },
{ allow-symlinks, CONFIGSET_PROJ },
{ ticket-table, CONFIGSET_TKT },
{ ticket-common, CONFIGSET_TKT },
Index: src/db.c
==
--- src/db.c
+++ src/db.c
@@ -2085,10 +2085,11 @@
{ th1-setup, 0, 40, 0, },
#ifdef FOSSIL_ENABLE_TCL
{ tcl, 0,0, 0, off },
{ tcl-setup, 0, 40, 0, },
#endif
+ { unicode-glob, 0, 40, 1,
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. Hope this quick and rough patch is of some value. Sure it is! I cannot test it now, but this is how I would expect it to work. 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?
2012/11/25 Jan Nijtmans jan.nijtm...@gmail.com: 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. Hope this quick and rough patch is of some value. Stefan, I committed your patch to the bellon-unicode branch. Feedback welcome! At first sight, looks good to me. Thanks! 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 Sun, Nov 25, 2012 at 4:45 PM, Jan Nijtmans jan.nijtm...@gmail.comwrote: 2012/11/25 Jan Nijtmans jan.nijtm...@gmail.com: 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. Hope this quick and rough patch is of some value. Stefan, I committed your patch to the bellon-unicode branch. Feedback welcome! At first sight, looks good to me. Stefan, please fill out http://www.fossil-scm.org/fossil/doc/trunk/www/copyright-release.html and send me a copy via post (maybe also a scan via email) so that I can merge the bellon-unicode branch into trunk. Thanks. Thanks! 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 -- 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] status of fossil / jimtcl and docs
On 19/11/2012, at 7:01 PM, fossil-m...@h-rd.org wrote: From: Steve Bennett steveb-sr3wrjstenvtt0ehb6f...@public.gmane.org I created a proof-of-concept branch (jimtcl) around this time last year that replaced TH1 with Jim Tcl. I also added support for writing xfer scripts in Jim Tcl. Richard was reluctant to incorporate this into the core fossil, I believe because of concerns over security. Joe Mistachkin also added support full Tcl (which is in core, but must be enabled). Here the approach is to bridge via TH1 rather than replace TH1. Cheers, Steve Hi Steve, Thanks for the information. So is it be better to invoke tcl via TH1? Is there any documentation on how to do that? As it stands, this is the only option if you build from trunk. Joe, any docs? And can I also invoke jimtcl, or only standard tcl? I'm asking because jimtcl is already together with fossil, so no extra dependencies are involved. You need to build from the 'jimtcl' branch to do this. This version is somewhat old since I haven't been keeping it up to date. Cheers, Steve thanks, M. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Embedded Systems Specialists - http://workware.net.au/ WorkWare Systems Pty Ltd W: www.workware.net.au P: +61 434 921 300 E: ste...@workware.net.au F: +61 7 3391 6002 ___ 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] howto `grep' through old revisions
On 25/11/2012, at 9:24 AM, Richard Hipp wrote: On Sat, Nov 24, 2012 at 5:02 PM, Gilles gilles.gana...@free.fr wrote: On Sat, 24 Nov 2012 09:21:54 -0500, Richard Hipp d...@sqlite.org wrote: One big problem here is that the user will doubtless expect to have full Perl regular expressions. That will mean another compile-time dependency. And maybe also a run-time dependency if a shared library is used (as most distribution packages managers will likely require). Suddenly, Fossil becomes much less stand-alone and self-contained. Does someone know of a good LGPL regex library that could easily be statically compiled in the Fossil binary? I have a regex library that I've been developing (from scratch) to go into SQLite for the REGEXP operator. It will serve. Jim Tcl (BSD licensed) has a small regex library which supports utf8. -- Embedded Systems Specialists - http://workware.net.au/ WorkWare Systems Pty Ltd W: www.workware.net.au P: +61 434 921 300 E: ste...@workware.net.au F: +61 7 3391 6002 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
