Comment 6 for bug 1011083

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

It might make sense to move unsupported plugins to lp:compiz if we can turn compiling them off quite easily. The build time is already excessive because we build a bunch of stuff we don't care about. Introducing some cmake variables for that is probably trivial?

In any case, if you wish to start integrating them in, there's a bit of an involved process you need to follow. Ideally, you'd want to maintain the bzr history. Here's how I did it for all of the other compiz plugins:

(dammit, I can't find my extremely useful python script I wrote for this ... in any case, here's how it was done from memory)

You'll need the bzr fastimport and bzr join plugins. I think join is part of the normal bzr distribution. Fastimport I got from bzr branch lp:bzr-fastimport fastimport cloned into ~./bazaar/plugins .

You'll also need a custom plugin called set_root_id. You can get that here: https://bugs.launchpad.net/bzr/+bug/370710/comments/4

From there, its something like this:

git clone $GITURL
bzr init $PLUGIN-bzr
cd $GITDIR
git fast-export | (cd ../$PLUGIN-bzr; bzr fast-import -) #creates a new bzr repo with history in tact
cd ../$PLUGIN-bzr
bzr set-root-id # works around bug 370710

Then move the bzr repo into the compiz/plugins repo and do
bzr join $PLUGIN-bzr

That will create a "merge" of the plugin into lp:compiz. Commit it with bzr commit

To check if it worked correctly, you can use bzr log -n 0 | less

The entire history for the plugin should appear underneath your merge commit

Also check if the per-file history is in tact. I think its a matter of bzr blame somefile.cpp | less in the plugin. Make sure that every line isn't by your lp id ;-)