Re: PATCH: add git to verify-cvs2svn.py ; fix too many warnings issue
Michael Haggerty <[email protected]> Wed, 25 Aug 2010 16:56:42 +0200
| Newsgroups | gmane.comp.version-control.subversion.cvs2svn.devel |
|---|---|
| Message-ID | <[email protected]> |
James Blackburn wrote: > On 25 August 2010 09:13, Michael Haggerty <[email protected] > <mailto:[email protected]>> wrote: >> GIT_DIR=$PATH/.git git archive --format tar $BRANCH | >> tar -C $dest_dir -x > > Learn something new every day :) > > Attached is a patch with both python tar and platform tar. I went for > python tar first, and it worked until I tried a larger repo. I found > that checking out some tags would cause the whole verify process to > hang. Inserting prints showed that git_cmd.wait() never returned, and > the underlying git proecss was <defunct>. I'm guessing the pipe is full > causing wait() to deadlock. > I've left this code in, disabled by default, in case you can spot > something wrong. > > Otherwise It verifies a small cvs conversion ok. Very nice. I just committed your patch to trunk, with a couple of small changes: * Limit lines to 79 characters * Fixed some string interpolation typos I don't see any obvious reason why the tarfile version should not work. You might do some tests with git replaced by a simple program that copies a tar file to stdout using various write sizes and flush behavior, perhaps writes to stderr as well, etc. and see if you can determine what it is that confuses tarfile. It could very well be a bug in the tarfile module or in git-archive, or some failed subprocess magic. > One other minor change: I find that if I pipe or redirect output of > verify-cvs2svn.py it doesn't show up in a timely manner, so I've added a > stdout.flush() at various stages in verify_contents(...). Also committed to trunk. Thanks! Michael ------------------------------------------------------ http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2651238 To unsubscribe from this discussion, e-mail: [[email protected]].