Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-23 Thread Eric Rubin-Smith
Stephan Beal wrote: FYI: i committed one on top of that. The advantage is that it's centralized, the disadvantage is that it hashes every manifest before parsing (to get the UUID, since parsing modifies it). Might be considered too expensive, considering how rare broken manifests are.

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-23 Thread Eric Rubin-Smith
Stephan Beal wrote: We'd be interested in hearing back if you discover how an error on your end (if indeed it is) is confusing fossil into trying to read non-manifest files as manifests. Actually, your question sort of confuses me. From my (very tenuous) understanding of the code, it

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-23 Thread Stephan Beal
On Thu, Oct 23, 2014 at 5:06 PM, Eric Rubin-Smith eas@gmail.com wrote: Stephan Beal wrote: We'd be interested in hearing back if you discover how an error on your end (if indeed it is) is confusing fossil into trying to read non-manifest files as manifests. Actually, your question

[fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
I haven't changed much recently about my repository topology. One central master repo that I push to from my dev repo. No one else is doing any pushing. The master repo has hooks set up for publishing my commits etc to a remote HTTP REST API. The only change I made recently is to open up my

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 6:31 PM, Eric Rubin-Smith eas@gmail.com wrote: I tried this, which doesn't give much useful info: $ fossil test-parse-manifest ./manifest I assume it's the remove fossil complaining, though -- not the local one. That's my assumption, too, but can you paste that

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 6:48 PM, Stephan Beal sgb...@googlemail.com wrote: fossil set manifest on (if it's not already) and then the manifest should be dumped to manifest.uuid. Please post the contents of that file for a checkin which fails this way, and i think that will show us what's

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 7:22 PM, Stephan Beal sgb...@googlemail.com wrote: [stephan@host:~/cvs/fossil/cwal]$ f-mfparse ~/Downloads/manifest.txt Parsing this manifest: /home/stephan/Downloads/manifest.txt f-mfparse: ERROR #128 (FSL_RC_CA_SYNTAX): Malformed UUID in F-card Now i need to expand

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Richard Hipp
Can somebody please forward the bad manifest to me too? On Wed, Oct 15, 2014 at 1:31 PM, Stephan Beal sgb...@googlemail.com wrote: On Wed, Oct 15, 2014 at 7:22 PM, Stephan Beal sgb...@googlemail.com wrote: [stephan@host:~/cvs/fossil/cwal]$ f-mfparse ~/Downloads/manifest.txt Parsing this

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 7:31 PM, Stephan Beal sgb...@googlemail.com wrote: F .fossil-settings/allow-symlinks a09a968bf05a50058f3ad50132730b719bc39e76 That UUID is 40 bytes long, i.e. an SHA1 hash, which is syntactically correct So i'm not sure what he's complaining about. Will need to run

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Stephan Beal wrote: According my debugger, that uuid is 41 bytes long, including a carriage-return character. How on earth that happend is a mystery to me, as fossil does not use \r characters anywhere unless it's prescribed by a standard (e.g. HTTP headers). The C-card also contains a

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 7:44 PM, Eric Rubin-Smith eas@gmail.com wrote: How dare you suggest it! :) I don't think that's what's happening. Maybe that was your mail client when you saved my attachment, or mine when I initially sent it (though I doubt it, since I am using a Linux + mutt).

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 7:47 PM, Stephan Beal sgb...@googlemail.com wrote: On Wed, Oct 15, 2014 at 7:44 PM, Eric Rubin-Smith eas@gmail.com wrote: Let me re-send you the manifest as a 'gz' file. Hopefully no code between me and you will be too clever for its own good this time. No,

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Richard Hipp
On Wed, Oct 15, 2014 at 1:47 PM, Stephan Beal sgb...@googlemail.com wrote: Let me re-send you the manifest as a 'gz' file. Hopefully no code between me and you will be too clever for its own good this time. Good idea. Please send it to Richard, too. fossil test-parse runs without error

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 7:56 PM, Richard Hipp d...@sqlite.org wrote: Perhaps we should enhance the error message to include the UUID of the problem manifest as part of the error message? Working on a patch now. -- - stephan beal http://wanderinghorse.net/home/stephan/

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Richard Hipp wrote: Are you sure that is the manifest that is causing the problem? Perhaps we should enhance the error message to include the UUID of the problem manifest as part of the error message? In case you find it useful for your debugging, I have continued plodding along with my

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Richard Hipp
On Wed, Oct 15, 2014 at 2:15 PM, Eric Rubin-Smith eas@gmail.com wrote: Richard Hipp wrote: Are you sure that is the manifest that is causing the problem? Perhaps we should enhance the error message to include the UUID of the problem manifest as part of the error message? In case

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Stephan Beal wrote: Working on a patch now. Sorry, I'm realizing that the Fossil version I mentioned (1.29) is tainted with my own private changes to the C code (to get my TH1 hooks working). I submitted them to this list, and Joe Mistachkin accepted them -- but with significant changes. It

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Richard Hipp wrote: Can you try compiling the tip of the better-error-msgs branch and put that on your server, then let us know what the new error message is? Our emails crossed paths. I'll do as you suggest and let you know what happens. -- Eric A. Rubin-Smith Aterlo Networks, Inc.

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Richard Hipp wrote: Can you try compiling the tip of the better-error-msgs branch and put that on your server, then let us know what the new error message is? Here we go: $ fossil push Push to https://eas@snip:10444/ Round-trips: 1 Artifacts sent: 2 received: 0 Error: push script failed:

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 8:27 PM, Eric Rubin-Smith eas@gmail.com wrote: Error: push script failed: syntax error in manifest [449bc674c3fc9c036db0d4dc71281b7cb900fe7d] You mention custom changes with regards to push scripts, which make me curious about that error message: i can find push

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Stephan Beal
On Wed, Oct 15, 2014 at 8:19 PM, Richard Hipp d...@sqlite.org wrote: On Wed, Oct 15, 2014 at 2:15 PM, Eric Rubin-Smith eas@gmail.com wrote: Richard Hipp wrote: Are you sure that is the manifest that is causing the problem? Perhaps we should enhance the error message to include the

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Eric Rubin-Smith wrote: $ fossil push Push to https://eas@snip:10444/ Round-trips: 1 Artifacts sent: 2 received: 0 Error: push script failed: syntax error in manifest [449bc674c3fc9c036db0d4dc71281b7cb900fe7d] Round-trips: 1 Artifacts sent: 2 received: 0 Push finished with 818173

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Eric Rubin-Smith
Stephan Beal wrote: You mention custom changes with regards to push scripts, which make me curious about that error message: i can find push script failed nowhere in fossil. Where is it coming from (if you know)? The strings are escaped :) eric@dev:~/Fossil-5ff4e33617/src$ grep -r 'push\\s'

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Richard Hipp
On Wed, Oct 15, 2014 at 2:27 PM, Eric Rubin-Smith eas@gmail.com wrote: Richard Hipp wrote: Can you try compiling the tip of the better-error-msgs branch and put that on your server, then let us know what the new error message is? Here we go: $ fossil push Push to

Re: [fossil-users] push fails with complaint about manifest syntax error

2014-10-15 Thread Ron W
On Wed, Oct 15, 2014 at 2:36 PM, Stephan Beal sgb...@googlemail.com wrote: FYI: i committed one on top of that. The advantage is that it's centralized, the disadvantage is that it hashes every manifest before parsing (to get the UUID, since parsing modifies it). Might be considered too