headers
Phil Dawes | 27 Apr 21:16

git woes

Hi Dan,

I've got a couple of patches and a vocab in my git repo now, but still
I'm struggling to make it work properly. I'm publishing to a public repo
on my laptop and then rsyncing that to my webspace, but get failures
pulling from the webspace where I don't from the local dir.

The webspace version is at http://phildawes.net/2008/factor.git

I was wondering if you had any suggestions, or failing that if I could
use some space on factorforge until I get the problem figured out?

Cheers,

Phil

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Permalink | Reply |
headers
Chris Double | 27 Apr 22:42
Picon

Re: git woes

On Mon, Apr 28, 2008 at 7:18 AM, Phil Dawes <phil@...> wrote:
>  I'm publishing to a public repo
>  on my laptop and then rsyncing that to my webspace, but get failures
>  pulling from the webspace where I don't from the local dir.

Lots of questions to try and track the problem down...

What are the exact failures you are getting? Can you copy/paste the
errors?  When you pull from the webspace, are you doing it via http,
ssh or the git protocol?

Is your public repo a bare repository or does it have a working copy?
Have you run 'git-update-server-info' in the repository on the server?
Is the hooks/post-update script executable?

Chris.
--

-- 
http://www.bluishcoder.co.nz

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Permalink | Reply |
headers
Phil Dawes | 28 Apr 10:35

Re: git woes

Hi Chris,

Thanks for getting back to me and apologies for the lack of information.
I'm using the web protocol using the URL I posted in the email. The 
webspace is on web hosting and doesn't allow long-running processes or 
have git installed. When I pull from it on my ubuntu gutsy laptop I get:

$ uname -a
Linux x61 2.6.22-14-generic #1 SMP Tue Dec 18 08:02:57 UTC 2007 i686
GNU/Linux

$ git --version
git version 1.5.2.5

$ git pull http://phildawes.net/2008/factor.git master
Fetching refs/heads/master from http://phildawes.net/2008/factor.git
using http
got 32e5a0bcd7b703782332686c80be33b1b2177b15
walk 32e5a0bcd7b703782332686c80be33b1b2177b15
got 67d487f97d3e0a217e2ec83da630acbce5e7a7ee
Getting alternates list for http://phildawes.net/2008/factor.git
got b445db476b0dbbe6f30c1a0c49921acf817f0308
Getting pack list for http://phildawes.net/2008/factor.git
Getting index for pack 4b4c5471294389d1bc69f3043c7885528b3b527f
Getting index for pack 37511d809fedb22f5f6c73f8d9388d574770b1f0
Getting index for pack 3a16a3863b2a88107e2b674c21d1de7304f99633
Getting index for pack 91422496618834430bd65d9c350c6f3332695fda
Getting index for pack b420f818414fe2e169177194725b683cb74b0e80
Getting index for pack af83740612a7eba3545b594a906145e5c9b44d0e
Getting index for pack 140beb526e3639b2ea477fd0f3e0863bc44d8b1a
(Continue reading)

Permalink | Reply |
headers
Chris Double | 28 Apr 12:27
Picon

Re: git woes

On Mon, Apr 28, 2008 at 8:35 PM, Phil Dawes <phil@...> wrote:
>  error: index file
>  .git/objects/pack/pack-90b65acf57b79281a6216f7096a306eb8ca7ab32.idx is
>  too small
>  Segmentation fault (core dumped)

The only thing I can think of is there is some corruption during the
download. Is the web server perhaps sending the .idx file as plain
text rather than a binary?

>  N.B. What I'm really after is just a way to publish my vocab and patches
>  for the factor repo. Would emailing the patches using git-format-patch
>  be ok?

That would be up to slava or whoever maintains the various
repositories. It's pretty easy to apply patches via email so I
wouldn't imagine it to be a problem. If it's a hassle for slava I'm
sure someone else with a public repository could pick it up for slava
to pull from.

Chris.

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Permalink | Reply |
headers
Phil Dawes | 28 Apr 22:42

Re: git woes

Hi Chris,

Chris Double wrote:
> On Mon, Apr 28, 2008 at 8:35 PM, Phil Dawes <phil@...> wrote:
>>  error: index file
>>  .git/objects/pack/pack-90b65acf57b79281a6216f7096a306eb8ca7ab32.idx is
>>  too small
>>  Segmentation fault (core dumped)
> 
> The only thing I can think of is there is some corruption during the
> download. Is the web server perhaps sending the .idx file as plain
> text rather than a binary?
> 

You nailed it! Putting:
AddType application/octet-stream idx
AddType application/octet-stream pack

into the .htaccess sorted out the problem.

I've just noticed that one of my patches is now obsolete (mapped-files
using normalized-path), but the csv vocab and other patch (vocab
monitor/refresh-all tracks custom vocab-roots) are still valid. Have
done some rebase-ing to reflect this.

Just to check, are you able to pull from my repository?

git pull http://phildawes.net/2008/factor.git master

Many thanks,
(Continue reading)

Permalink | Reply |
headers
Slava Pestov | 29 Apr 01:12

Re: git woes

Hi Phil,

Just letting you know that I'm not ignoring your patches. I will merge  
them very soon.

Slava

On Apr 28, 2008, at 3:42 PM, Phil Dawes wrote:

> You nailed it! Putting:
> AddType application/octet-stream idx
> AddType application/octet-stream pack
>
> into the .htaccess sorted out the problem.
>
> I've just noticed that one of my patches is now obsolete (mapped-files
> using normalized-path), but the csv vocab and other patch (vocab
> monitor/refresh-all tracks custom vocab-roots) are still valid. Have
> done some rebase-ing to reflect this.
>
> Just to check, are you able to pull from my repository?
>
> git pull http://phildawes.net/2008/factor.git master
>
> Many thanks,
>
> Phil

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
(Continue reading)

Permalink | Reply |
headers
Slava Pestov | 30 Apr 03:56

Re: git woes

Hi Phil,

I've merged your contributions into the main repository and added a  
new extra/usa-cities library which uses your CSV parser (I blogged  
about it). The parser is very clean and well written, you did an  
excellent job and I look forward to seeing more contributions from you  
in the future.

Slava

On Apr 28, 2008, at 3:42 PM, Phil Dawes wrote:

> git pull http://phildawes.net/2008/factor.git master

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Permalink | Reply |
headers
Slava Pestov | 30 Apr 06:16

CSV unit tests

Hi Phil,

I had to fix a couple of things in csv-tests.factor (missing IN:, and  
one unit-test should have been named-unit-test) but there's a failing  
unit test.

Can you please fix this? No binary packages can be uploaded as long as  
tests fail.

Slava

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
Permalink | Reply |
headers
Phil Dawes | 30 Apr 11:37

Re: CSV unit tests

Sorry about that - probably happened after the rebasing as I didn't 
think to re-run the tests. Will get it fixed in my lunch break.

Apologies,

Phil

Slava Pestov wrote:
> Hi Phil,
> 
> I had to fix a couple of things in csv-tests.factor (missing IN:, and  
> one unit-test should have been named-unit-test) but there's a failing  
> unit test.
> 
> Can you please fix this? No binary packages can be uploaded as long as  
> tests fail.
> 
> Slava
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
> Don't miss this year's exciting event. There's still time to save $100. 
> Use priority code J8TL2D2. 
> http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
> _______________________________________________
> Factor-talk mailing list
> Factor-talk@...
> https://lists.sourceforge.net/lists/listinfo/factor-talk
>
(Continue reading)

Permalink | Reply |
headers
Phil Dawes | 30 Apr 12:15

Re: CSV unit tests

Ah no, the problem was me misunderstanding how the run-tests word works. 
I assumed if it printed no errors that that was all cool. D'oh!

Phil Dawes wrote:
> Sorry about that - probably happened after the rebasing as I didn't 
> think to re-run the tests. Will get it fixed in my lunch break.
> 
> Apologies,
> 
> Phil
> 
> Slava Pestov wrote:
>> Hi Phil,
>>
>> I had to fix a couple of things in csv-tests.factor (missing IN:, and  
>> one unit-test should have been named-unit-test) but there's a failing  
>> unit test.
>>
>> Can you please fix this? No binary packages can be uploaded as long 
>> as  tests fail.
>>
>> Slava
>>
>> -------------------------------------------------------------------------
>> This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
>> Don't miss this year's exciting event. There's still time to save 
>> $100. Use priority code J8TL2D2. 
>> http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone 
>>
>> _______________________________________________
(Continue reading)

Permalink | Reply |
headers
Phil Dawes | 30 Apr 13:59

Re: CSV unit tests

Fixed. It's a crufty edge-case because the RFC says whitespace is 
significant which makes parsing easy, but in practice lots of csv files 
contain space padding between non-quoted fields that needs trimming
e.g.:  foo, bah, baz
Unfortunately leading spaces in quotes were also getting trimmed so now 
  quoted fields handle whitespace separately to unquoted ones.

Sorry for the hassle, I've learnt my lesson about run-tests!

Phil

Phil Dawes wrote:
> Ah no, the problem was me misunderstanding how the run-tests word works. 
> I assumed if it printed no errors that that was all cool. D'oh!
> 
> Phil Dawes wrote:
>> Sorry about that - probably happened after the rebasing as I didn't 
>> think to re-run the tests. Will get it fixed in my lunch break.
>>
>> Apologies,
>>
>> Phil
>>
>> Slava Pestov wrote:
>>> Hi Phil,
>>>
>>> I had to fix a couple of things in csv-tests.factor (missing IN:, 
>>> and  one unit-test should have been named-unit-test) but there's a 
>>> failing  unit test.
>>>
(Continue reading)

Permalink | Reply |
headers
Slava Pestov | 30 Apr 18:52

Re: CSV unit tests

Hi Phil,

The correct word to use is 'test'.

"csv" test

Slava

On Apr 30, 2008, at 5:15 AM, Phil Dawes wrote:

> Ah no, the problem was me misunderstanding how the run-tests word  
> works.
> I assumed if it printed no errors that that was all cool. D'oh!
>
> Phil Dawes wrote:
>> Sorry about that - probably happened after the rebasing as I didn't
>> think to re-run the tests. Will get it fixed in my lunch break.
>>
>> Apologies,
>>
>> Phil
>>
>> Slava Pestov wrote:
>>> Hi Phil,
>>>
>>> I had to fix a couple of things in csv-tests.factor (missing IN:,  
>>> and
>>> one unit-test should have been named-unit-test) but there's a  
>>> failing
>>> unit test.
(Continue reading)

Permalink | Reply |

Gmane