plone · witsch · Jun 17, 2012 · Jun 17, 2012 · Jun 17, 2012 · Jun 17, 2012
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,16 @@
 .installed.cfg
 .mr.developer.cfg
+local.cfg
 bin
 develop-eggs
 include
 lib
+local
 parts
 packages
 src
 var
+downloads
 jenkins.plone.org.auth.cfg
 *.bak
 /docs/build
diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
 Introduction
 ============
-This is the development buildout for Plone 4.2. If this is your first time here, please read ALL if the instructions at `readthedocs.org <http://readthedocs.org/docs/buildoutcoredev>`_  before getting started. It will save you time in the end, we promise!
+This is the development buildout for Plone 4.3. If this is your first time here, please read ALL if the instructions at `readthedocs.org <http://readthedocs.org/docs/buildoutcoredev>`_  before getting started. It will save you time in the end, we promise!
 
 
 
diff --git a/bootstrap.py b/bootstrap.py
@@ -37,7 +37,7 @@
                           'bootstrap script defaults to '
                           '1.5.2, unlike usual buildout bootstrap scripts.*')
 parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=True,
+                   action="store_true", dest="distribute", default=False,
                    help="Use Disribute rather than Setuptools.")
 
 parser.add_option("-c", None, action="store", dest="config_file",

diff --git a/buildout.cfg b/buildout.cfg
@@ -5,7 +5,9 @@ extends =
 eggs +=
     Plone
 
-parts += sphinx
+parts +=
+    sphinx
+    pip-requirements
 
 [instance]
 resources = ${buildout:directory}/resources
@@ -16,10 +18,16 @@ interpreter = ${buildout:directory}/bin/zopepy
 source = ${buildout:directory}/docs
 build = ${buildout:directory}/docs/build
 
+[pip-requirements]
+recipe = plone.recipe.command
+command = ${buildout:bin-directory}/buildout annotate |\
+    sed -n -e '1,/^\[versions\]$/d' -e '/^\[/,$d' -e '/^ /d' -e 's/= /==/' -e 'p' > requirements.txt
+update-command = ${:command}
+stop-on-error = false
+
 [test]
 eggs +=
     Products.CMFPlacefulWorkflow
-    Products.kupu
     diazo [test]
     plone.app.iterate
     plone.app.openid
@@ -34,7 +42,6 @@ eggs +=
 [test-groups]
 Add-ons =
     Products.CMFPlacefulWorkflow
-    Products.kupu
     plone.app.iterate
     plone.app.openid
     plone.openid

diff --git a/checkouts.cfg b/checkouts.cfg
@@ -1,44 +1,59 @@
 [buildout]
 always-checkout = force
-# Please keep alphabetized.
-# If you add a checkout here and Plone 4.1 is using the same branch,
-# you must also add the checkout to the Plone 4.1 buildout.
+# PLEASE KEEP ALPHABETIZED.
+# If you add a checkout here and Plone 4.2 is using the same branch,
+# you must also add the checkout to the Plone 4.2 buildout.
 auto-checkout =
     Plone
-    Products.CMFCore
+    Products.Archetypes
+    Products.ATContentTypes
+    Products.CMFEditions
     Products.CMFPlone
-    Products.PloneTestCase
+    Products.ResourceRegistries
     Products.TinyMCE
-    Products.contentmigration
+    archetypes.referencebrowserwidget
     archetypes.querywidget
+    collective.testcaselayer
+    kss.core
     plone.app.collection
     plone.app.content
-    plone.app.contentlisting
-    plone.app.contentrules
     plone.app.controlpanel
+    plone.app.form
+# Need to downgrade to 1.7.1 due to https://dev.plone.org/ticket/13183
+# Note that the 1.7.2 release includes a misnamed 1.7.1 unminified version
     plone.app.jquery
+    plone.app.jquerytools
+    plone.app.kss
     plone.app.layout
+    plone.app.linkintegrity
     plone.app.locales
+    plone.app.portlets
     plone.app.querystring
     plone.app.registry
+    plone.app.search
+    plone.app.theming
     plone.app.upgrade
-    plone.autoform
+    plone.app.vocabularies
+    plone.app.workflow
+    plone.app.z3cform
+    plone.i18n
     plone.portlet.collection
+    plone.recipe.zeoserver
     plone.recipe.zope2instance
-    plone.subrequest
-    plone.supermodel
+    plone.resourceeditor
+    plonetheme.classic
     plonetheme.sunburst
 # Test fixes only
     Products.CMFCalendar
-    Products.CMFDefault
-    Products.CMFDiffTool
+    Products.CMFEditions
     Products.CMFPlacefulWorkflow
-    Products.PasswordResetTool
-    archetypes.kss
     plone.app.blob
-    plone.app.caching
+    plone.app.i18n
     plone.app.imaging
     plone.app.kss
+    plone.app.redirector
     plone.app.testing
-    plone.app.theming
-    plone.outputfilters
+    plone.behavior
+    plone.resource
+    plone.rfc822
+    plone.stringinterp
diff --git a/core.cfg b/core.cfg
@@ -5,10 +5,8 @@ parts =
     test
     alltests
     checkversions
-# Windows developers might want to comment out this,
-# since "collective.recipe.omelette" uses "junction.exe"
-# which takes horrendously long time
     packages
+    pep8
 
 extends =
     sources.cfg
@@ -20,6 +18,7 @@ allow-hosts =
     *.python.org
     *.plone.org
     *.zope.org
+    launchpad.net
 
 find-links += http://dist.plone.org/thirdparty/
 
@@ -32,10 +31,6 @@ versions = versions
 eggs =
     Products.CMFPlone
     plone.reload
-# temporary bypass for https://bugs.launchpad.net/zope2/+bug/539181
-    roman
-# currently required by Products.CMFCore
-    Products.ZSQLMethods
 
 develop =
 
@@ -49,7 +44,9 @@ environment-vars =
 
 [zopepy]
 recipe = zc.recipe.egg
-eggs = ${buildout:eggs}
+eggs =
+    ${buildout:eggs}
+    ${test:eggs}
 interpreter = zopepy
 scripts = zopepy
 
@@ -60,5 +57,7 @@ eggs = z3c.checkversions [buildout]
 
 [packages]
 recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
+eggs =
+    ${instance:eggs}
+    ${test:eggs}
 packages = ./
diff --git a/docs/intro.rst b/docs/intro.rst
@@ -106,7 +106,8 @@ Updating CHANGES.rst and checkouts.cfg
 --------------------------------------
 Once all the tests are running locally on your machine, you are ALMOST ready to commit the changes. A couple housekeeping things before moving on. 
 
-First, please edit CHANGES.rst (or CHANGES.txt) in each pakage you have modified and add a summary of the change. This change note will be collated for the next Plone release and is important for integrators and developers.
+First, please edit CHANGES.rst (or CHANGES.txt, or HISTORY.txt) in each package you have modified and add a summary of the change. This change note will be collated for the next Plone release and is important for integrators and developers to be able to see what they will get if they upgrade.
+New changelog entries should be added at the very top of CHANGES.txt.
 
 *Most importantly*, if you didn't do it earlier, edit checkouts.cfg in the buildout directory and add your changes package to the auto-checkout list. This lets the release manager know that the package has been updated so that when the next release of Plone is cut a new egg will be released and Plone will need to pin to the next version of that package. READ: this is how your fix becomes an egg! 
 
@@ -134,6 +135,62 @@ If you answered YES to all of these questions, you are ready to push your change
  * Please try to make one change per commit. If you are fixing three bugs, make three commits. That way, it is easier to see what was done when, and easier to roll back any changes if necessary. If you want to make large changes cleaning up whitespace or renaming variables, it is especially important to do so in a separate commit for this reason.
 * We have a few angels that follow the changes and each commit to see what happens to their favourite CMS! If you commit something REALLY sketchy, they will politely contact you, most likely after immediately reverting changes. There is no official people assigned to this so if you are especially nervous, jump into #plone and ask for a quick eyeball on your changes.
 
+Committing to Products.CMFPlone
+-------------------------------
+If you are working a bug fix on Products.CMFPlone,
+there are a couple other things to take notice of.
+First and foremost, 
+you'll see that there are several branches.
+At the time of writing this document,
+there are branches for 4.1, 4.2, and master, which is the implied 4.3.
+
+Still with me? So you have a bug fix for 4.x.
+If the fix is only for one version,
+make sure to get that branch and party on.
+However, chances are the bug is in multiple branches. 
+
+Let's say the bug starts in 4.1. Pull the 4.1 branch and fix and commit there with tests.
+
+If your fix only involved a single commit,
+you can use git's ``cherry-pick`` command to apply the same commit
+to a different branch.
+
+First check out the branch::
+
+  > git checkout 4.2
+
+And then cherry-pick the commit (you can get the SHA hash from git log).
+
+  > git cherry-pick b6ff4309
+
+There may be conflicts; if so, resolve them and then follow the directions
+git gives you to complete the cherry-pick.
+
+If your fix involved multiple commits, cherry-picking them one by one can get tedious.
+In this case things are easiest if you did your fix in a separate feature branch.
+
+In that scenario, you first merge the feature branch to the 4.1 branch::
+
+  > git checkout 4.1
+  > git merge my-awesome-feature
+
+Then you return to the feature branch and make a branch for `rebasing` it onto the 4.2 branch::
+
+  > git checkout my-awesome-feature
+  > git checkout -b my-awesome-feature-4.2
+  > git rebase ef978a --onto 4.2
+
+(ef978a happens to be the last commit in the feature branch's history before
+it was branched off of 4.1. You can look at git log to find this.)
+
+At this point, the feature branch's history has been updated, but it hasn't actually
+been merged to 4.2 yet. This lets you deal with resolving conflicts before you
+actually merge it to the 4.2 release branch. Let's do that now::
+
+  > git checkout 4.2
+  > git merge my-awesome-feature-4.2
+
+
 Branches and Forks and Direct Commits - Oh My!
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Plone used to be in an svn repository, so everyone is familiar and accustomed to committing directly to the branches. After the migration to github, the community decided to maintain this spirit. If you have signed the contributor agreement, you can commit directly to the branch (for plone this would be the version branch, for most other packages this would be master).

diff --git a/ecosystem.cfg b/ecosystem.cfg
@@ -1,42 +1,39 @@
 [buildout]
 extends =
-    buildout.cfg
+    core.cfg
 
-[test]
-eggs +=
+auto-checkout +=
+    plone.app.dexterity
+    plone.app.referenceablebehavior
+    plone.app.relationfield
+    plone.app.stagingbehavior
+    plone.formwidget.contenttree
+    plone.schemaeditor
+
+test-eggs +=
 	collective.z3cform.datagridfield [test]
-	collective.z3cform.datetimewidget
-	five.grok
+        five.grok [form]
 	five.intid
-	plone.alterego
-	plone.app.dexterity [grok,test]
 	plone.app.lockingbehavior [tests]
 	plone.app.referenceablebehavior
 	plone.app.relationfield
 	plone.app.stagingbehavior [test]
-	plone.app.textfield [tests]
 	plone.app.versioningbehavior
-	plone.behavior
-	plone.dexterity [test]
 	plone.directives.dexterity
 	plone.directives.form
 	plone.formwidget.autocomplete
 	plone.formwidget.contenttree
-	plone.formwidget.namedfile
-	plone.namedfile [blobs]
-	plone.rfc822
-	plone.schemaeditor
-	plone.synchronize
-	z3c.batching
-	z3c.blobfile
-	z3c.formwidget.query
 	z3c.objpath
 	z3c.relationfield
 
+[instance]
+eggs +=
+    plone.app.dexterity[grok,relations]
+    plone.app.referenceablebehavior
+
 [test-groups]
-Dexterity =
+Dexterity-ecosystem =
 	collective.z3cform.datagridfield
-	collective.z3cform.datetimewidget
 	five.grok
 	five.intid
 	grokcore.annotation
@@ -46,37 +43,29 @@ Dexterity =
 	grokcore.site
 	grokcore.view
 	grokcore.viewlet
-	plone.alterego
-	plone.app.dexterity
 	plone.app.intid
 	plone.app.lockingbehavior
 	plone.app.referenceablebehavior
 	plone.app.relationfield
 	plone.app.stagingbehavior
-	plone.app.textfield
 	plone.app.versioningbehavior
-	plone.app.z3cform
-	plone.autoform
-	plone.behavior
-	plone.dexterity
 	plone.directives.dexterity
 	plone.directives.form
-	plone.folder
 	plone.formwidget.autocomplete
 	plone.formwidget.contenttree
-	plone.formwidget.namedfile
-	plone.namedfile
-	plone.rfc822
-	plone.schemaeditor
-	plone.supermodel
-	plone.z3cform
-	z3c.form
-	z3c.formwidget.query
 	z3c.relationfield
 
 [alltests]
 exclude +=
     collective.z3cform.datagridfield-demo
     mocker
-    rwproperty
     wsgi-intercept
+
+[sources]
+plone.app.dexerity = git ${remotes:plone}/plone.app.dexterity.git pushurl=${remotes:plone_push}/plone.app.dexterity.git
+plone.app.intid = git ${remotes:plone}/plone.app.intid.git pushurl=${remotes:plone_push}/plone.app.intid.git
+plone.app.relationfield = git ${remotes:plone}/plone.app.relationfield.git pushurl=${remotes:plone_push}/plone.app.relationfield.git
+plone.app.referenceablebehavior = git ${remotes:plone}/plone.app.referenceablebehavior pushurl=${remotes:plone_push}/plone.app.referenceablebehavior.git
+plone.app.stagingbehavior = git ${remotes:plone}/plone.app.stagingbehavior.git pushurl=${remotes:plone_push}/plone.app.stagingbehavior.git
+plone.formwidget.contenttree = git ${remotes:plone}/plone.formwidget.contenttree.git pushurl=${remotes:plone_push}/plone.formwidget.contenttree.git
+plone.schemaeditor = git ${remotes:plone}/plone.schemaeditor.git pushurl=${remotes:plone_push}/plone.schemaeditor.git
diff --git a/experimental/chameleon.cfg b/experimental/chameleon.cfg
@@ -33,8 +33,8 @@ test-script = ${buildout:bin-directory}/test-pt
 [versions]
 ordereddict = 1.1
 sourcecodegen = 0.6.14
-z3c.pt = 2.2
-# Override for http://download.zope.org/zopetoolkit/index/1.0.4/ztk-versions.cfg:
+z3c.pt = 2.2.3
+# Override for http://download.zope.org/zopetoolkit/index/1.0.7/ztk-versions.cfg:
 zope.pagetemplate = 3.6.3
 
 [sources]

diff --git a/experimental/i18n.cfg b/experimental/i18n.cfg
@@ -61,6 +61,7 @@ plone =
 # Plone 4.2
     archetypes.querywidget
     plone.app.collection
+    plone.app.theming
 # no messages in plone.app.contentlisting
     plone.app.querystring
     plone.app.search