Skip to contentSkip to conversation

git-cvsimport fuzzy commit log matching?

DISCUSSION Christoph Hellwig 3 participants 4 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

I'm currently trying to get clean git imports of the XFS userspace repositories. These are funky in the way they were initially kept in ptools, and SGI-internal SCM that was built ontop of RCS which changeset added ontop. So we know that commits actually were done in atomic changesets. But ptools has the "nice" feature of allowing both per-file
and per-changeset commits. Due to the per-file commits git-cvsimport
often misdetects a single changeset as multiple individual changes, ala:

commit 0d47d43b5878c6e7d7b516a793a82f0076d22089

Author: Barry Naujok <[email protected]>
Date:   Mon Jul 16 15:52:53 2007 +0000

Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd.

Queue up AGs per thread based on ag stride

commit 1fa4685db126fd3071e008a6d18f9d51209ab305

Author: Barry Naujok <[email protected]>
Date:   Mon Jul 16 15:52:53 2007 +0000

Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd.

Handle ag stride command line option and setup threads as required

commit a73288784e77c2411687f6778adb4c0b0f9dcdff

Author: Barry Naujok <[email protected]>
Date:   Mon Jul 16 15:52:53 2007 +0000

Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd.

Execute bits changed from x-- to ---
Queue up AGs per thread based on ag stride

and so on.

Any idea how to tell git-cvsimport that if we have exactly the same timestamp, and maybe the same author it really is the same changeset and we want to merge the commit message?

#1 lore raw
Quoted 34 lines · Christoph Hellwig

I'm currently trying to get clean git imports of the XFS userspace repositories. These are funky in the way they were initially kept in ptools, and SGI-internal SCM that was built ontop of RCS which changeset added ontop. So we know that commits actually were done in atomic changesets. But ptools has the "nice" feature of allowing both per-file
and per-changeset commits. Due to the per-file commits git-cvsimport
often misdetects a single changeset as multiple individual changes, ala:

commit 0d47d43b5878c6e7d7b516a793a82f0076d22089

Author: Barry Naujok <[email protected]>
Date:   Mon Jul 16 15:52:53 2007 +0000

Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd.

Queue up AGs per thread based on ag stride

commit 1fa4685db126fd3071e008a6d18f9d51209ab305

Author: Barry Naujok <[email protected]>
Date:   Mon Jul 16 15:52:53 2007 +0000

Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd.

Handle ag stride command line option and setup threads as required

commit a73288784e77c2411687f6778adb4c0b0f9dcdff

Author: Barry Naujok <[email protected]>
Date:   Mon Jul 16 15:52:53 2007 +0000

Perform parallel processing based on AG stride/concat unit Merge of master-melb:xfs-cmds:29143a by kenmcd.

Quoted 8 lines

Execute bits changed from x-- to ---
Queue up AGs per thread based on ag stride

and so on.

Any idea how to tell git-cvsimport that if we have exactly the same timestamp, and maybe the same author it really is the same changeset and we want to merge the commit message?

Why not using a fancy git-filterbranch script to squash them together instead ? It's probably less work than to try to modify your cvs importer to work the exact way you want.

Signature · 3 lines
·O·  Pierre Habouzit
··O                                                [email protected]
OOO                                                http://www.madism.org
#2 lore raw
In reply to Christoph Hellwig
Quoted 3 lines · Christoph Hellwig

Any idea how to tell git-cvsimport that if we have exactly the same timestamp, and maybe the same author it really is the same changeset and we want to merge the commit message?

Right now, cvsimport relies on cvsps for this. cvsps compares author, timestamp (with a fuzz factor 'cause cvs commits over slow networks or hosts can span minutes - you could dial down to 0, it's the -z flag) *and* commit msg.

What you could do is

1 - run cvsps with export to a file (I've posted in this list how to
run it exactly as cvsimport does)
2 - post-process cvsps ouput with perl (there's a parser already in
cvsimport ;-) )
3 - run cvsimport with the post-processed file

Or postprocess the imported git tree as others have suggested.

hth,

martin

Signature · 5 lines
 [email protected]
 [email protected] -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff
#3 lore raw
Quoted 9 lines · Martin Langhoff

What you could do is

1 - run cvsps with export to a file (I've posted in this list how to
run it exactly as cvsimport does)
2 - post-process cvsps ouput with perl (there's a parser already in
cvsimport ;-) )
3 - run cvsimport with the post-processed file

Or postprocess the imported git tree as others have suggested.

Instead of post-processing I hacked cvsps. It already has a different way to detect changesets when running in --bkcvs mode, and re-using that one for ptools works great.