[fossil-users] fossil gdiff temporary file's name woes
hi there, doing a fossil gdiff opens an external editor with 2 or more files, where the older file is opened (in my case) with ~0 appended to the end of the filename. my problem with this approach is, that it throws off editors somewhat. filetype might not be detected correctly (in gvim for example) and sometimes i need to set the filetype manually. as this name is not used otherwise, it would be nice if the filename was modified in some other way. doesn't matter how really, just leave the extension untouched :] -f -- name a psychological rock group? pink freud! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] side by side diffs 2nd column misalignment
hi there, when viewing side by side diffs, the second column is not vertically aligned. this is visible in opera (but not in firefox) i think the problem is that html special characters are not counted as 1 character in the html output, and the span's are not vertically aligned. normally whitespace is ignored in html, but the css specifies white-space: pre; and opera honors this. the strange thing is, in the default font size the sides are aligned, but when changing the font size, they get out of alignment. the unified diff does not have this problem, as all line numbers are in the front. i can post a screenshot if needed, but y'all should be running opera anyway if you like small, fast, self-contained software :] -f -- if they can send a man to the moon... why not send 'em all? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] files with conflicts
hi there, is there a way to get the list of files having a conflict using fossil, as opposed to search for CONFLICT? what is the basic flow to solve a conflict when for example after fossil up several files show merge conflicts? -f -- i'm weird, but i'm saving up to be eccentric. ___ 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] zip/tar patch
any interest in this simple patch?
hmm, on Tue, Feb 07, 2012 at 07:48:30PM +0100, frantisek holop said that
hi there,
the motivation for this patch was that the zip and tarball links
from the web ui get a filename and checkout for free, while they
are a mandatory parameters for the command line.
so i tried to unify it a bit: the default archive name is now both
from web and cli the same, a lowercased project name followed by the
artifact ID. spaces are substituted with '-'.
$ fossil zip
fossil-030035345c.zip: 2944427 bytes
$ fossil zip tip
fossil-030035345c.zip: 2944427 bytes
$ fossil zip -o f.zip
f.zip: 2944427 bytes
$ fossil zip -o f.zip tip
f.zip: 2944427 bytes
$ fossil tar
fossil-030035345c.tgz: 2944427 bytes
$ fossil tar tip
fossil-030035345c.tgz: 2944427 bytes
$ fossil tar -o f.tgz
f.zip: 2944427 bytes
$ fossil tar -o f.tgz tip
f.zip: 2944427 bytes
$ fossil help zip
Usage: fossil zip [--name DIRECTORY] [-o OUTPUTFILE]
[-R REPOSITORY] [VERSION]
Generate a ZIP archive containing VERSION of the checkout.
If VERSION is omitted, the current checkout is used.
The name of the resulting archive can be set using the -o option,
otherwise it will be derived from the project name followed by the
check-in's artifact ID. Unless the --name option is specified, the
the top-level directory inside the archive will have the same name.
Options:
--name DIRECTORY Name of the top-level directory inside
the archive.
-o OUTPUTFILE Name of the archive.
-R|--repository FILE Use the repository in FILE.
See also: tarball
--- src/info.c
+++ src/info.c
@@ -500,11 +500,18 @@
@ td%h(zUser) @ %h(zIpAddr) on %s(zDate)/td/tr
}
db_finalize(q);
}
if( g.perm.History ){
- const char *zProjName = db_get(project-name, unnamed);
+ char *zProjName = db_get(project-name, unnamed);
+ int i;
+ for(i=0; istrlen(zProjName); i++){
+zProjName[i] = fossil_tolower(zProjName[i]);
+if( zProjName[i]==' ' ){
+ zProjName[i] = '-';
+ }
+ }
@ trthTimelines:/thtd
@ a href=%s(g.zTop)/timeline?f=%S(zUuid)family/a
if( zParent ){
@ | a href=%s(g.zTop)/timeline?p=%S(zUuid)ancestors/a
}
@@ -526,16 +533,14 @@
@ /td/tr
@ trthOthernbsp;Links:/th
@ td
@ a href=%s(g.zTop)/dir?ci=%S(zUuid)files/a
if( g.perm.Zip ){
-char *zUrl = mprintf(%s/tarball/%s-%S.tar.gz?uuid=%s,
- g.zTop, zProjName, zUuid, zUuid);
-@ | a href=%s(zUrl)Tarball/a
+@ | a
href=%s(g.zTop)/tarball/%s(zProjName)-%S(zUuid).tgz=%s(zUuid)
+@ Tarball/a
@ | a
href=%s(g.zTop)/zip/%s(zProjName)-%S(zUuid).zip?uuid=%s(zUuid)
@ ZIP archive/a
-fossil_free(zUrl);
}
@ | a href=%s(g.zTop)/artifact/%S(zUuid)manifest/a
if( g.perm.Write ){
@ | a href=%s(g.zTop)/ci_edit?r=%S(zUuid)edit/a
}
--- src/tar.c
+++ src/tar.c
@@ -525,42 +525,63 @@
}
/*
** COMMAND: tarball*
**
-** Usage: %fossil tarball VERSION OUTPUTFILE [--name DIRECTORYNAME]
[-R|--repository REPO]
+** Usage: %fossil tarball [--name DIRECTORY] [-o OUTPUTFILE]
+** [-R REPOSITORY] VERSION
+**
+** Generate a compressed tarball archive containing VERSION of the
+** project. If VERSION is omitted, the current checkout is used.
+**
+** The name of the resulting archive can be set using the -o option,
+** otherwise it will be derived from the project name followed by the
+** check-in's artifact ID. Unless the --name option is specified, the
+** the top-level directory inside the archive will have the same name.
+**
+** Options:
+** --name DIRECTORY Name of the top-level directory inside
+** the archive.
+** -o OUTPUTFILE Name of the archive.
+** -R|--repository FILE Use the repository in FILE.
**
-** Generate a compressed tarball for a specified version. If the --name
-** option is used, its argument becomes the name of the top-level directory
-** in the resulting tarball. If --name is omitted, the top-level directory
-** named is derived from the project name, the check-in date and time, and
-** the artifact ID of the check-in.
+** See also: zip
*/
void tarball_cmd(void){
int rid;
Blob tarball;
const char *zName;
+ const char *fName;
+ int wrote;
zName = find_option(name, 0, 1);
+ fName = find_option(o, o, 1);
db_find_and_open_repository(0, 0);
- if( g.argc!=4 ){
-usage(VERSION OUTPUTFILE);
+ if( g.argc!=2 g.argc!=3 ){
+usage([--name DIRECTORY] [-o OUTPUTFILE] [-R REPOSITORY] [VERSION]);
}
- rid = name_to_typed_rid(g.argv[2], ci);
+ if( g.argc==3 ){
+rid = name_to_typed_rid(g.argv[2], ci);
+ }else{
+rid
Re: [fossil-users] zip/tar patch
hmm, on Sat, Feb 11, 2012 at 05:27:41PM +0100, Lluís Batlle i Rossell said that On Sat, Feb 11, 2012 at 03:55:10PM +0100, frantisek holop wrote: any interest in this simple patch? In general I don't mind. But in particular: a) the patch has wrong indentation in some places could you be more speficic please? i tried to follow the main style but i admit its not my preferred indentation. b) I prefer .tar.gz over .tgz c) I like *both* uuid and date in the file names i guess these will be the final decision of the project leader.. unless using placeholders, there is no chance to please everyone. in my patch i followed what the web ui does as i thought that to be the preffered version. -f -- age is only skin deep. ___ 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 artifact not complaining
hmm, on Fri, Feb 10, 2012 at 04:08:03PM +0100, Stephan Beal said that Because i'm pedantic ;). i prefer could not resolve because that is actually what is happening: we are asking the fossil internals to convert the user-provided symbol name into its internal form (an integer). We are not asking fossil to search for a specific artifact, only to resolve its symbolic name into another form. i think we are getting into a linguistic issue here, resolving is searching by its nature :] but i am fine with any verb.. [stephan@hamsun:~/cvs/fossil/fossil]$ ./fossil artifact abcdcafe ./fossil: Could not resolve artifact [abcdcafe] [stephan@hamsun:~/cvs/fossil/fossil]$ echo $? 1 you called the pedantic card, so i call and raise :] artifact takes as argument symbolic names as well and those are not inside brackets: fossil artifact tip fossil artifact tiptiptip but i see the commit is in already so this thread became academic :] -f -- name a psychological rock group? pink freud! ___ 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] make fossil up 'quiter'
hmm, on Thu, Feb 09, 2012 at 08:19:36AM -, Eric said that fossil update is concerned only with the branch you have in your checkout directory. If autosync is on it does a pull first, but that's a separate operation, and it os concerned only with artifacts in the repository and knows nothing about branches. I wish people would stop expecting fossil to behave like git, if it did you might as well use git. i have never used git. i would simply prefer fossil to report nothing if there is nothing to report... $ fossil up $ come to think of it, as a developer i am not really interested in fossil's traffic statistics either, it is more distracting than useful and would expect such extra information under --verbose. perhaps my minimalism is too maximal :] regarding git, i think it's not unreasonable to compare programs that in one way or the other server the same purpose, no? no need to be touchy about it. -f -- the greatest hate springs from the greatest love. ___ 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] make fossil up 'quiter'
hmm, on Thu, Feb 09, 2012 at 05:58:47AM -0500, Martin Gagnon said that i have never used git. i would simply prefer fossil to report nothing if there is nothing to report... $ fossil up $ come to think of it, as a developer i am not really interested in fossil's traffic statistics either, it is more distracting than useful and would expect such extra information under --verbose. perhaps my minimalism is too maximal :] That's might be a good output when autosync is off. But if autosync is ON, we should see something related to the sync step. Indeed, the sync step (or pull/push) might be slimmed a bit too. I would suggest only a progress or a counter refreshing a single line (using \r), so we can see if there's activity. If the sync step have no output, one might confuse very long sync with network timeout and an impatient will CTRL-C too early. by all means, if there is some activity (pulling and/or pushing), report it. but the case i was referring to is when i am pushing nothing, and pulling nothing. as fossil returns to shell right away, i think the outcome is clear. regarding the network timeouts, no program reports them until they time out :] -f -- if you live long enough, it will kill 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] zip/tar patch
hmm, on Fri, Feb 10, 2012 at 03:12:01AM +0900, MIURA Masahiro said that
On Fri, Feb 10, 2012 at 02:26, Stephan Beal sgb...@googlemail.com wrote:
i once administered a Solaris system where someone accidentally managed,
over a serial terminal, to touch a new file whos name was a single
backspace character (ASCII 0x08). The only way we managed to delete it was
deleting its parent directory.
Using Zsh on Linux, I can delete the file by 'rm ^H'.
('^H' is typed as ctrl-v ctrl-h.)
Also, 'rm ?' will do (after getting other single-letter-named files out).
getting off-topic i am afraid, but it's also possible to delete
any fancy named files/directories by its inode :]
-f
--
god? i'm no god. god has mercy.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] make fossil up 'quiter'
hi there, fossil always reports the latest artifact ID and commit message whenever doing 'fossil up', even though actually there was no new check-in. for example: $ fossil up Autosync: http://www.fossil-scm.org/ Bytes Cards Artifacts Deltas Sent: 177 2 0 0 Received:2608 57 0 0 Total network traffic: 319 bytes sent, 1565 bytes received -- updated-to: 9b1d394a719f00f5a293612fe824e1a1fb1ed2e4 2012-02-08 03:04:23 UTC tags: trunk comment: Update the version number to 1.22 and begin entering change log information for the next release. (user: drh) this confuses me sometimes thinking there was a new check-in :[ wouldn't it be more natural not to print anything if the local check-out is exactly as the remote one? and have this repeating output as part of the --verbose output? what do you think? -f -- anarchy is better than no government at all. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] zip/tar patch
hi there,
the motivation for this patch was that the zip and tarball links
from the web ui get a filename and checkout for free, while they
are a mandatory parameters for the command line.
so i tried to unify it a bit: the default archive name is now both
from web and cli the same, a lowercased project name followed by the
artifact ID. spaces are substituted with '-'.
$ fossil zip
fossil-030035345c.zip: 2944427 bytes
$ fossil zip tip
fossil-030035345c.zip: 2944427 bytes
$ fossil zip -o f.zip
f.zip: 2944427 bytes
$ fossil zip -o f.zip tip
f.zip: 2944427 bytes
$ fossil tar
fossil-030035345c.tgz: 2944427 bytes
$ fossil tar tip
fossil-030035345c.tgz: 2944427 bytes
$ fossil tar -o f.tgz
f.zip: 2944427 bytes
$ fossil tar -o f.tgz tip
f.zip: 2944427 bytes
$ fossil help zip
Usage: fossil zip [--name DIRECTORY] [-o OUTPUTFILE]
[-R REPOSITORY] [VERSION]
Generate a ZIP archive containing VERSION of the checkout.
If VERSION is omitted, the current checkout is used.
The name of the resulting archive can be set using the -o option,
otherwise it will be derived from the project name followed by the
check-in's artifact ID. Unless the --name option is specified, the
the top-level directory inside the archive will have the same name.
Options:
--name DIRECTORY Name of the top-level directory inside
the archive.
-o OUTPUTFILE Name of the archive.
-R|--repository FILE Use the repository in FILE.
See also: tarball
--- src/info.c
+++ src/info.c
@@ -500,11 +500,18 @@
@ td%h(zUser) @ %h(zIpAddr) on %s(zDate)/td/tr
}
db_finalize(q);
}
if( g.perm.History ){
- const char *zProjName = db_get(project-name, unnamed);
+ char *zProjName = db_get(project-name, unnamed);
+ int i;
+ for(i=0; istrlen(zProjName); i++){
+zProjName[i] = fossil_tolower(zProjName[i]);
+if( zProjName[i]==' ' ){
+ zProjName[i] = '-';
+ }
+ }
@ trthTimelines:/thtd
@ a href=%s(g.zTop)/timeline?f=%S(zUuid)family/a
if( zParent ){
@ | a href=%s(g.zTop)/timeline?p=%S(zUuid)ancestors/a
}
@@ -526,16 +533,14 @@
@ /td/tr
@ trthOthernbsp;Links:/th
@ td
@ a href=%s(g.zTop)/dir?ci=%S(zUuid)files/a
if( g.perm.Zip ){
-char *zUrl = mprintf(%s/tarball/%s-%S.tar.gz?uuid=%s,
- g.zTop, zProjName, zUuid, zUuid);
-@ | a href=%s(zUrl)Tarball/a
+@ | a href=%s(g.zTop)/tarball/%s(zProjName)-%S(zUuid).tgz=%s(zUuid)
+@ Tarball/a
@ | a
href=%s(g.zTop)/zip/%s(zProjName)-%S(zUuid).zip?uuid=%s(zUuid)
@ ZIP archive/a
-fossil_free(zUrl);
}
@ | a href=%s(g.zTop)/artifact/%S(zUuid)manifest/a
if( g.perm.Write ){
@ | a href=%s(g.zTop)/ci_edit?r=%S(zUuid)edit/a
}
--- src/tar.c
+++ src/tar.c
@@ -525,42 +525,63 @@
}
/*
** COMMAND: tarball*
**
-** Usage: %fossil tarball VERSION OUTPUTFILE [--name DIRECTORYNAME]
[-R|--repository REPO]
+** Usage: %fossil tarball [--name DIRECTORY] [-o OUTPUTFILE]
+** [-R REPOSITORY] VERSION
+**
+** Generate a compressed tarball archive containing VERSION of the
+** project. If VERSION is omitted, the current checkout is used.
+**
+** The name of the resulting archive can be set using the -o option,
+** otherwise it will be derived from the project name followed by the
+** check-in's artifact ID. Unless the --name option is specified, the
+** the top-level directory inside the archive will have the same name.
+**
+** Options:
+** --name DIRECTORY Name of the top-level directory inside
+** the archive.
+** -o OUTPUTFILE Name of the archive.
+** -R|--repository FILE Use the repository in FILE.
**
-** Generate a compressed tarball for a specified version. If the --name
-** option is used, its argument becomes the name of the top-level directory
-** in the resulting tarball. If --name is omitted, the top-level directory
-** named is derived from the project name, the check-in date and time, and
-** the artifact ID of the check-in.
+** See also: zip
*/
void tarball_cmd(void){
int rid;
Blob tarball;
const char *zName;
+ const char *fName;
+ int wrote;
zName = find_option(name, 0, 1);
+ fName = find_option(o, o, 1);
db_find_and_open_repository(0, 0);
- if( g.argc!=4 ){
-usage(VERSION OUTPUTFILE);
+ if( g.argc!=2 g.argc!=3 ){
+usage([--name DIRECTORY] [-o OUTPUTFILE] [-R REPOSITORY] [VERSION]);
}
- rid = name_to_typed_rid(g.argv[2], ci);
+ if( g.argc==3 ){
+rid = name_to_typed_rid(g.argv[2], ci);
+ }else{
+rid = db_lget_int(checkout,0);
+ }
if( zName==0 ){
-zName = db_text(default-name,
- SELECT replace(%Q,' ','_')
- || strftime('_%%Y-%%m-%%d_%%H%%M%%S_', event.mtime)
+zName = db_text(unnamed,
+ SELECT lower(replace(%Q,' ','-'))
+
Re: [fossil-users] zip/tar patch
hmm, on Tue, Feb 07, 2012 at 08:59:37PM +0100, Stephan Beal said that On Tue, Feb 7, 2012 at 7:48 PM, frantisek holop min...@obiit.org wrote: so i tried to unify it a bit: the default archive name is now both from web and cli the same, a lowercased project name followed by the artifact ID. spaces are substituted with '-'. Out of curiosity: why force lower-case? That seems like an arbitrary decision without a technical reason. i have one Java tree in Fossil for which i highly prefer a CamelCasedName. no reason really, matter of personal preference. i was sure that this part wouldnt be left without discussion :] it is trivial to remove from the patch of course. -f -- dogmatism: puppyism come to its full growth. ___ 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] zip/tar patch
hmm, on Tue, Feb 07, 2012 at 09:48:23PM +0100, Stephan Beal said that In any case, i like the feature, i just don't like the forced lower-casing. (To be clear: not that my vote counts for anything!) well it all comes down to if project name is a good data source for a filename.. anyway, i feel much stronger about spaces in filenames, that is mostly asking for trouble. -f -- to my embarrassment, i was born in bed with a lady! ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] a very simple add.c patch
hi there,
a simple patch that tries to do the following:
-remove end of line whitespace
-put all See also entries in alphabetical order
-remove SUMMARY that i dont see being used anywhere else
i felt that because 'mv' is in add.c, perhaps it also
has a place on the See also lines of the other add.c commands...
-f
--- src/add.c
+++ src/add.c
@@ -49,11 +49,11 @@
.fslckout,
.fslckout-journal,
.fslckout-wal,
.fslckout-shm,
- /* The use of .fos as the name of the checkout database is
+ /* The use of .fos as the name of the checkout database is
** deprecated. Use .fslckout instead. At some point, the following
** entries should be removed. 2012-02-04 */
.fos,
.fos-journal,
.fos-wal,
@@ -148,11 +148,11 @@
int i;/* Loop counter */
const char *zReserved;/* Name of a reserved file */
Blob repoName;/* Treename of the repository */
Stmt loop;/* SQL to loop over all files to add */
int (*xCmp)(const char*,const char*);
-
+
if( !file_tree_name(g.zRepositoryName, repoName, 0) ){
blob_zero(repoName);
zRepo = ;
}else{
zRepo = blob_str(repoName);
@@ -198,15 +198,15 @@
** does not appear on the command line then the ignore-glob setting is
** used.
**
** Options:
**
-**--dotfiles include files beginning with a dot (.)
-**--ignore CSG ignore files matching patterns from the
+**--dotfiles include files beginning with a dot (.)
+**--ignore CSG ignore files matching patterns from the
** comma separated list of glob patterns.
-**
-** See also: addremove, rm
+**
+** See also: addremove, mv, rm
*/
void add_cmd(void){
int i; /* Loop counter */
int vid; /* Currently checked out version */
int nRoot; /* Full path characters in g.zLocalRoot */
@@ -234,11 +234,11 @@
ON vfile(pathname COLLATE nocase)
);
#endif
pIgnore = glob_create(zIgnoreFlag);
nRoot = strlen(g.zLocalRoot);
-
+
/* Load the names of all files that are to be added into sfile temp table */
for(i=2; ig.argc; i++){
char *zName;
int isDir;
Blob fullName;
@@ -278,11 +278,11 @@
**
** This command does NOT remove the files from disk. It just marks the
** files as no longer being part of the project. In other words, future
** changes to the named files will not be versioned.
**
-** See also: addremove, add
+** See also: add, addremove, mv
*/
void delete_cmd(void){
int i;
int vid;
Stmt loop;
@@ -308,11 +308,11 @@
AND NOT deleted,
zTreeName, zTreeName, zTreeName
);
blob_reset(treeName);
}
-
+
db_prepare(loop, SELECT x FROM sfile);
while( db_step(loop)==SQLITE_ROW ){
fossil_print(DELETED %s\n, db_column_text(loop, 0));
}
db_finalize(loop);
@@ -390,12 +390,11 @@
**
** * All files in the repository but missing from the checkout (that is,
** all files that show as MISSING with the status command) are
** removed as if by the rm command.
**
-** The command does not commit. You must run the commit separately
-** as a separate step.
+** This command does not commit automatically.
**
** Files and directories whose names begin with . are ignored unless
** the --dotfiles option is used.
**
** The --ignore option overrides the ignore-glob setting. See
@@ -402,18 +401,18 @@
** documentation on the settings command for further information.
**
** The --test option shows what would happen without actually doing anything.
**
** This command can be used to track third party software.
-**
-** Options:
-** --dotfiles include files beginning with a dot (.)
-** --ignore CSG ignore files matching patterns from the
+**
+** Options:
+** --dotfiles include files beginning with a dot (.)
+** --ignore CSG ignore files matching patterns from the
**comma separated list of glob patterns.
** --test If given, show what would be done without doing so.
**
-** See also: add, rm
+** See also: add, mv, rm
*/
void addremove_cmd(void){
Blob path;
const char *zIgnoreFlag = find_option(ignore,0,1);
int allFlag = find_option(dotfiles,0,0)!=0;
@@ -436,11 +435,11 @@
if( vid==0 ){
fossil_panic(no checkout to add to);
}
db_begin_transaction();
- /* step 1:
+ /* step 1:
** Populate the temp table sfile with the names of all unmanged
** files currently in the check-out, except for files that match the
** --ignore or ignore-glob patterns and dot-files. Then add all of
** the files in the sfile temp table to the set of managed files.
*/
@@ -507,13 +506,11 @@
**
** This command does NOT rename or move the files on disk. This command merely
** records the fact that filenames have changed so that appropriate notations
** can be made at the next commit/checkin.
**
-**
-** SUMMARY: fossil mv|rename
Re: [fossil-users] a very simple add.c patch
hmm, on Sun, Feb 05, 2012 at 09:23:09PM +0100, frantisek holop said that a simple patch that tries to do the following: forgot to add, it also removes a tautology about addremove not doing commit automatically -f -- when i want your opinion i'll give it to 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] fossil help
hi there, i am trying to learn fossil and 'fossil help' is a great tool for this. however as a newcomer i have noticed a couple of discrepancies. i have already worked out that fossil is liberal with command line switches and accepts --longoptions with a single '-' as well. as it looks like that the great majority of documentation is written in the --longoption form, i think it would be nice to have all these commands in the same form. fossil is not liberal only with the form but also with the position of the options, another thing that might not be obvious for new users (and i haven't found it anywhere in the documentation so far), so again, some sort of consistency would be nice. as a bsd user, i am great fan of consistent description of command line options and i think that command [options] [arguments] works quite well. in the fossil help, ?OPTIONS? is sometimes before, sometimes after the arguments. and lastly, the notation of a parameter being optional or not is also a bit of curiousity for me, i have never seen the ?OPTIONS? notation before, and while its clear, what's it about, i think [OPTIONS] is a more common and recognized form for command line programs. a quick search through the sources indicates that a very small minority of the commands use [ ] instead of ? ?... if there is interest for this from the architect, i'd be more than happy to send a diff that would make these changes. -f -- unicorns aren't myth, virgins are! ___ 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] Applying patches with fossil
hmm, on Sun, Feb 05, 2012 at 09:47:20PM +0100, François Vogel said that This page: http://fossil-scm.org/fossil/doc/trunk/www/concepts.wiki says in section 3.0 second paragraph that Fossil is completely self-contained. It is not necessary to install any other software in order to use fossil. You do not need CVS, gzip, diff, [...] patch, or any similar software on your system in order to use fossil effectively. I couldn't find any command in fossil for applying patches, though. So, how do you proceed with fossil? i think that was meant to apply to the workflow when one fossil user pushes their changes to another one using fossil, and not patch files as such. -f -- in my dreams i'm dying all the time. ___ 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 help
and also, sometimes possible options are listed on the usage line, sometimes simply ?OPTIONS? is showed :] -f -- go ahead, jump. 100,000 lemmings can't be wrong. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] gvimdiff as gdiff-command
hi there, i tried to use gvimdiff as the gdiff-command but i always kept getting empty file where the temporary ~0 file should have been. then i realized that gvim returns to the shell right away, and fossil probably takes that as a signal to removes the temp file. i solved this with gvim's -f option (Foreground: Don't fork when starting GUI) $ fossil set gd gdiff-command(local) gvimdiff -f but how is this solved with the other GUI editors? is there a way to work around this in fossil itself? -f -- today is a fine day for firm decisions. or is it? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] minor doc patch, .fos suggestion
hi there, reading through the documentation i thought some sentences would be easier to read with some minor changes, and i also removed end of line whitespace. the other item from the subject concerns the future change of '_FOSSIL_' to '.fos'. i am totally new on the list, so i am not familiar with the debate (if any happened) regarding this change, but the linguistic issue is that 'fos' in hungarian means a certain type of excrement.. i dont know if this is open to discussion, but if it were, i'd say '.fossil' would not be a good choice, as it looks like a repository without a name. '.fockout' would have it's own problems in english ;} so seeing that it's also part of fossil, also an sqlite db file, why not have something less mystical, bit more verbose (being hidden anyway), like '.checkout.fossil' or some such? in the worst case please keep _FOSSIL_ around for us hungarians :] -f Index: www/tech_overview.wiki == --- www/tech_overview.wiki +++ www/tech_overview.wiki @@ -6,11 +6,11 @@ h21.0 Introduction/h2 At its lowest level, a Fossil repository consists of an unordered set of immutable artifacts. You might think of these artifacts as files, since in many cases the artifacts exactly correspond to source code files -that are stored in the Fossil repository. But other control artifacts +that are stored in the Fossil repository. But other control artifacts are also included in the mix. These control artifacts define the relationships between artifacts - which files go together to form a particular version of the project, who checked in that version and when, what was the check-in comment, what wiki pages are included with the project, what are the edit histories of each wiki page, what bug reports or tickets are @@ -17,29 +17,27 @@ included, who contributed to the evolution of each ticket, and so forth, and so on. This low-level file format is called the global state of the repository, since this is the information that is synced to peer repositories using push and pull operations. The low-level file format is also called enduring since it is intended to last for many years. -The details of the low-level, enduring, global file format +The details of the low-level, enduring, global file format are [./fileformat.wiki | described separately]. This article is about how Fossil is currently implemented. Instead of dealing with vague abstractions of enduring file formats as the -[./fileformat.wiki | that other document] does, this article provides -some detail on how Fossil actually stores information on disk. +[./fileformat.wiki | other document] does, this article provides +some detail on how Fossil actually stores information on disk. h22.0 Three Databases/h2 -Fossil stores state information in +Fossil stores state information in [http://www.sqlite.org/ | SQLite] database files. SQLite keeps an entire relational database, including multiple tables and indices, in a single disk file. The SQLite library allows the database files to be efficiently queried and updated using the industry-standard -SQL language. And SQLite makes updates to these database files atomic, -even if a system crashes or power failure occurs in the middle of the -update, meaning that repository content is protected even during severe -malfunctions. +SQL language. SQLite updates are atomic, so even in the event of a system +crash or power failure the repository content is protected. Fossil uses three separate classes of SQLite databases: ol liThe configuration database @@ -48,11 +46,11 @@ /ol The configuration database is a one-per-user database that holds global configuration information used by Fossil. There is one repository database per project. The repository database is the -file that people are normally referring to when they say +file that people are normally referring to when they say a Fossil repository. The checkout database is found in the working checkout for a project and contains state information that is unique to that working checkout. Fossil does not always use all three database files. The web interface, @@ -134,11 +132,11 @@ instead of a dot) and is located in the directory specified by the LOCALAPPDATA, APPDATA, or HOMEPATH environment variables, in that order. h32.2 Repository Databases/h3 -The repository database is the file that is commonly referred to as +The repository database is the file that is commonly referred to as the repository. This is because the repository database contains, among other things, the complete revision, ticket, and wiki history for a project. It is customary to name the repository database after then name of the project, with a .fossil suffix. For example, the repository database for the self-hosting Fossil repository is called fossil.fossil @@ -145,11 +143,11 @@ and the repository database for SQLite is called sqlite.fossil.
