# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1254128990 -7200
# Node ID 3ef4ce39606690e4e69c9a4dd33d3cdfdbcdc87c
# Parent  ab10d1cb53ffb90a2cf843ab13b95d5fb6bc3cda# Parent  ab9e7bcfc76433e953e52fac3b7fa75cd0473ed5
merge

diff -r ab10d1cb53ff -r 3ef4ce396066 cwctl.py
--- a/cwctl.py	Mon Sep 28 11:09:40 2009 +0200
+++ b/cwctl.py	Mon Sep 28 11:09:50 2009 +0200
@@ -171,8 +171,7 @@
         """run the command with its specific arguments"""
         if args:
             raise BadCommandUsage('Too much arguments')
-        print 'CubicWeb version:', cwcfg.cubicweb_version()
-        print 'Detected mode:', cwcfg.mode
+        print 'CubicWeb %s (%s mode)' % (cwcfg.cubicweb_version(), cwcfg.mode)
         print
         print 'Available configurations:'
         for config in CONFIGURATIONS:
diff -r ab10d1cb53ff -r 3ef4ce396066 devtools/dataimport.py
--- a/devtools/dataimport.py	Mon Sep 28 11:09:40 2009 +0200
+++ b/devtools/dataimport.py	Mon Sep 28 11:09:50 2009 +0200
@@ -151,7 +151,7 @@
         return len(self.items) - 1
 
     def add(self, type, item):
-        assert isinstance(item, dict), item
+        assert isinstance(item, dict), 'item is not a dict but a %s' % type(item)
         eid = item['eid'] = self._put(type, item)
         self.eids[eid] = item
         self.types.setdefault(type, []).append(eid)
@@ -172,7 +172,7 @@
 
     def get_one(self, name, key):
         eids = self.indexes[name].get(key, [])
-        assert len(eids) == 1
+        assert len(eids) == 1, 'expected a single one got %i' % len(eids)
         return eids[0]
 
     def find(self, type, key, value):
diff -r ab10d1cb53ff -r 3ef4ce396066 doc/book/en/admin/setup.rst
--- a/doc/book/en/admin/setup.rst	Mon Sep 28 11:09:40 2009 +0200
+++ b/doc/book/en/admin/setup.rst	Mon Sep 28 11:09:50 2009 +0200
@@ -63,19 +63,26 @@
 
 .. _`ftp site`: http://ftp.logilab.org/pub/cubicweb/
 
-or keep up to date with on-going development by using Mercurial and its forest
-extension::
+Make sure you have installed the dependencies (see appendixes for the list).
+
+Install from version control system
+```````````````````````````````````
+
+You can keep up to date with on-going development by using Mercurial and its
+forest extension::
 
   hg fclone http://www.logilab.org/hg/forests/cubicweb
 
 See :ref:`MercurialPresentation` for more details about Mercurial.
+
 When cloning a repository, you might be set in a development branch
 (the 'default' branch). You should check that the branches of the
 repositories are set to 'stable' (using `hg up stable` for each one)
 if you do not intend to develop the framework itself.
 
-In both cases, make sure you have installed the dependencies (see appendixes for
-the list).
+Do not forget to update the forest itself (using `cd path/to/forest ; hg up`).
+
+Make sure you have installed the dependencies (see appendixes for the list).
 
 Windows installation
 ````````````````````
diff -r ab10d1cb53ff -r 3ef4ce396066 doc/book/en/annexes/depends.rst
--- a/doc/book/en/annexes/depends.rst	Mon Sep 28 11:09:40 2009 +0200
+++ b/doc/book/en/annexes/depends.rst	Mon Sep 28 11:09:50 2009 +0200
@@ -47,5 +47,17 @@
 * fyzz - http://www.logilab.org/project/fyzz - http://pypi.python.org/pypi/fyzz
   - included in the forest
 
+* psycopg2 - http://initd.org/projects/psycopg2 - http://pypi.python.org/pypi/psycopg2
+
+* docsutils - http://docutils.sourceforge.net/ - http://pypi.python.org/pypi/docutils
+
+For the google-appengine extension to be available, you also need:
+
+* dateutil - http://labix.org/python-dateutil -
+  http://pypi.python.org/pypi/python-dateutil/
+
+* vobject - http://vobject.skyhouseconsulting.com/ -
+  http://pypi.python.org/pypi/vobject
+
 Any help with the packaging of CubicWeb for more than Debian/Ubuntu (including
 eggs, buildouts, etc) will be greatly appreciated.
diff -r ab10d1cb53ff -r 3ef4ce396066 web/views/workflow.py
--- a/web/views/workflow.py	Mon Sep 28 11:09:40 2009 +0200
+++ b/web/views/workflow.py	Mon Sep 28 11:09:50 2009 +0200
@@ -24,6 +24,11 @@
 from cubicweb.web import formfields as ff, formwidgets as fwdgs
 from cubicweb.web.views import TmpFileViewMixin, forms, primary
 
+_pvs = uicfg.primaryview_section
+_pvs.tag_subject_of(('Workflow', 'initial_state', '*'), 'hidden')
+_pvs.tag_object_of(('*', 'state_of', 'Workflow'), 'hidden')
+_pvs.tag_object_of(('*', 'transition_of', 'Workflow'), 'hidden')
+
 _abaa = uicfg.actionbox_appearsin_addmenu
 _abaa.tag_subject_of(('BaseTransition', 'condition', 'RQLExpression'), False)
 _abaa.tag_subject_of(('State', 'allowed_transition', 'BaseTransition'), False)