Gerrit branches

Development
1

Hi all,

I’ve pushed a few new topics to gerrit and updated some old ones. Many
of them are interdependent, and although gerrit does seem to support
this (yay!), I haven’t found a way to view the branch tree clearly.
Since it will be easiest to review these branches so that the base
branches are ready to merge first, below is a summary of how they are
connected.

In general, 1.x depends on 1, 1.a.x depends on 1.a, etc. Top level
entries (1., 2., …) are not dependent on anything:

  1. port_crystallography_dockwidgets
    1.a crystal-view-options
    1.a.i ENH_renderOneCell
    1.b cleanup_crystallography_dockwidgets
  2. ENH_initializeCameraOnUnitCellCenter
  3. ENH_molecule_overloads

Hope this helps,

Dave

2

Hi Dave,

On Sat, Dec 17, 2011 at 4:27 PM, David Lonie loniedavid@gmail.com wrote:

Hi all,

I’ve pushed a few new topics to gerrit and updated some old ones. Many
of them are interdependent, and although gerrit does seem to support
this (yay!), I haven’t found a way to view the branch tree clearly.
Since it will be easiest to review these branches so that the base
branches are ready to merge first, below is a summary of how they are
connected.

In general, 1.x depends on 1, 1.a.x depends on 1.a, etc. Top level
entries (1., 2., …) are not dependent on anything:

  1. port_crystallography_dockwidgets
    1.a crystal-view-options
    1.a.i ENH_renderOneCell
    1.b cleanup_crystallography_dockwidgets
  2. ENH_initializeCameraOnUnitCellCenter
  3. ENH_molecule_overloads

I think Gerrit has always handled the dependencies, just not in an
amazing way… It helps to have this top level view, especially as you
have several inter-dependent topics. I have started to merge some of
them. We actually upgraded Gerrit to 2.2.1 on Monday, and are
preparing to upgrade it to 2.2.2-rc0 with our topic branch features
soon.

You can look at our test deployment here,

http://reviewtest.source.kitware.com:81

This is also where we have been testing out the build testing scripts
for early MolCore development.

Marcus

3

On Wed, Dec 21, 2011 at 4:25 PM, Marcus D. Hanwell
mhanwell@gmail.com wrote:

You can look at our test deployment here,

http://reviewtest.source.kitware.com:81

This is also where we have been testing out the build testing scripts
for early MolCore development.

That looks very nice, I like the new topic and navigation features in
the header. So MolCore patches sent here will automatically run the
gtests? Will that work with Avogadro’s CTest system when the main
gerrit instance is upgraded?

Dave

4

On Wed, Dec 21, 2011 at 5:11 PM, David Lonie loniedavid@gmail.com wrote:

On Wed, Dec 21, 2011 at 4:25 PM, Marcus D. Hanwell
mhanwell@gmail.com wrote:

You can look at our test deployment here,

http://reviewtest.source.kitware.com:81

This is also where we have been testing out the build testing scripts
for early MolCore development.

That looks very nice, I like the new topic and navigation features in
the header. So MolCore patches sent here will automatically run the
gtests? Will that work with Avogadro’s CTest system when the main
gerrit instance is upgraded?

It should, once I have figured out how to ensure all of Avogadro’s
dependencies are met. So there is still the challenge of ensuring the
tested Avogadro can find everything it needs, and I think I have that
largely figured out using a superbuild approach to built the bulk of
the dependencies.

Going to the Qt developer days gave me a few new ideas on the best
ways to use Gerrit - their instance is up and running now too. I also
verified Avogadro master builds with the recently released Qt 4.8.

Marcus