[CMF-checkins] SVN: CMF/branches/CMF-1_5-branch/ - Change CVS
checkout documentation to their equivalent Subversion
Jens Vagelpohl
jens at dataflake.org
Wed Jul 20 17:16:59 EDT 2005
Log message for revision 37351:
- Change CVS checkout documentation to their equivalent Subversion
instructions
- In CMFSetup, make sure to give special treatment to both CVS and
.svn folders where this is necessary (e.g. to implicitly skip them
when importing profiles)
Changed:
U CMF/branches/CMF-1_5-branch/CHANGES.txt
D CMF/branches/CMF-1_5-branch/CMFCalendar/help/placeholder.txt
U CMF/branches/CMF-1_5-branch/CMFSetup/context.py
U CMF/branches/CMF-1_5-branch/CMFSetup/interfaces.py
U CMF/branches/CMF-1_5-branch/CMFSetup/tests/test_context.py
D CMF/branches/CMF-1_5-branch/INSTALL_CVS.txt
A CMF/branches/CMF-1_5-branch/INSTALL_SVN.txt
-=-
Modified: CMF/branches/CMF-1_5-branch/CHANGES.txt
===================================================================
--- CMF/branches/CMF-1_5-branch/CHANGES.txt 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/CHANGES.txt 2005-07-20 21:16:59 UTC (rev 37351)
@@ -2,6 +2,13 @@
Bugs Fixed
+ - Change CVS checkout documentation to their equivalent Subversion
+ instructions
+
+ - In CMFSetup, make sure to give special treatment to both CVS and
+ .svn folders where this is necessary (e.g. to implicitly skip them
+ when importing profiles)
+
- Made sure FSDVTest always deletes its temporary folder on tearDown.
(http://www.zope.org/Collectors/CMF/106)
Deleted: CMF/branches/CMF-1_5-branch/CMFCalendar/help/placeholder.txt
===================================================================
--- CMF/branches/CMF-1_5-branch/CMFCalendar/help/placeholder.txt 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/CMFCalendar/help/placeholder.txt 2005-07-20 21:16:59 UTC (rev 37351)
@@ -1 +0,0 @@
-So that 'cvs up -d' doesn't blow us away.
Modified: CMF/branches/CMF-1_5-branch/CMFSetup/context.py
===================================================================
--- CMF/branches/CMF-1_5-branch/CMFSetup/context.py 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/CMFSetup/context.py 2005-07-20 21:16:59 UTC (rev 37351)
@@ -118,7 +118,7 @@
return os.path.isdir( full_path )
security.declareProtected( ManagePortal, 'listDirectory' )
- def listDirectory( self, path, skip=('CVS',) ):
+ def listDirectory( self, path, skip=('CVS', '.svn') ):
""" See IImportContext.
"""
Modified: CMF/branches/CMF-1_5-branch/CMFSetup/interfaces.py
===================================================================
--- CMF/branches/CMF-1_5-branch/CMFSetup/interfaces.py 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/CMFSetup/interfaces.py 2005-07-20 21:16:59 UTC (rev 37351)
@@ -88,7 +88,7 @@
bool.
"""
- def listDirectory( path, skip=('CVS',) ):
+ def listDirectory( path, skip=('CVS', '.svn') ):
""" List IDs of the contents of a directory / folder.
Modified: CMF/branches/CMF-1_5-branch/CMFSetup/tests/test_context.py
===================================================================
--- CMF/branches/CMF-1_5-branch/CMFSetup/tests/test_context.py 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/CMFSetup/tests/test_context.py 2005-07-20 21:16:59 UTC (rev 37351)
@@ -284,6 +284,7 @@
self._makeFile( FILENAME, printable )
self._makeFile( os.path.join( SUBDIR, 'another.txt' ), 'ABC' )
self._makeFile( os.path.join( SUBDIR, 'CVS/skip.txt' ), 'DEF' )
+ self._makeFile( os.path.join( SUBDIR, '.svn/skip.txt' ), 'GHI' )
site = DummySite( 'site' ).__of__( self.root )
ctx = self._makeOne( site, self._PROFILE_PATH )
@@ -293,6 +294,7 @@
self.failUnless( 'nested.txt' in names )
self.failUnless( 'another.txt' in names )
self.failIf( 'CVS' in names )
+ self.failIf( '.svn' in names )
def test_listDirectory_skip_explicit( self ):
@@ -302,17 +304,18 @@
self._makeFile( FILENAME, printable )
self._makeFile( os.path.join( SUBDIR, 'another.txt' ), 'ABC' )
self._makeFile( os.path.join( SUBDIR, 'CVS/skip.txt' ), 'DEF' )
+ self._makeFile( os.path.join( SUBDIR, '.svn/skip.txt' ), 'GHI' )
site = DummySite( 'site' ).__of__( self.root )
ctx = self._makeOne( site, self._PROFILE_PATH )
names = ctx.listDirectory( SUBDIR, ( 'nested.txt', ) )
- self.assertEqual( len( names ), 2 )
+ self.assertEqual( len( names ), 3 )
self.failIf( 'nested.txt' in names )
self.failUnless( 'another.txt' in names )
self.failUnless( 'CVS' in names )
+ self.failUnless( '.svn' in names )
-
class DirectoryExportContextTests( FilesystemTestBase
, ConformsToISetupContext
, ConformsToIExportContext
Deleted: CMF/branches/CMF-1_5-branch/INSTALL_CVS.txt
===================================================================
--- CMF/branches/CMF-1_5-branch/INSTALL_CVS.txt 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/INSTALL_CVS.txt 2005-07-20 21:16:59 UTC (rev 37351)
@@ -1,104 +0,0 @@
-Overview
-
- This document describes the process of getting the CMF from
- the CVS repository, and installing it into your Zope. It assumes
- the following:
-
- * You want to install the "latest-and-greatest" version of
- the CMF from a CVS checkout.
-
- - See "Installing CMF":INSTALL.txt to install from a tarball.
-
- - See the note below [1] if you want to export or check out
- the sources for a specific version from CVS.
-
- *Please note that current versions of the CMF (1.5 and later)
- require Zope 2.7.0 or later. Also, please note that earlier
- versions of the CMF (< 1.5) may not be completely compatible
- with more recent versions of Zope (>= 2.8).*
-
- * For help with CVS in general, see the "CVS Online Manual",
- http://www.loria.fr/~molli/cvs-index.html
-
- * For direcitons on using the Zope CVS server, see "Public CVS
- Access", http://dev.zope.org/CVS/ReadOnlyAccess;
- substitute 'CMF' for 'Zope'.
-
-Installation
-
- 1. Fetch the CMF package from the Zope CVS repository::
-
- $ cd /tmp
- $ cvs -d :pserver:anonymous at cvs.zope.org:/cvs-repository login
- <supply "anonymous" as the password>
- $ cvs -d :pserver:anonymous at cvs.zope.org:/cvs-repository \
- checkout -d CMF-head CMF
-
- This checkout creats a directory, 'CMF-head', which contain
- subdirectories:
-
- - CMFCore
-
- - CMFDefault
-
- - CMFTopic
-
- - CMFCalendar
-
- - DCWorkflow
-
- and several others.
-
- 2. Copy or link each of these subdirectories into the 'Products' directory of
- your Zope server (either SOFTWARE_HOME or INSTANCE_HOME) e.g.::
-
- $ cd /var/zope/Products
- $ ln -s /tmp/CMF-head/CMFCore .
- $ ln -s /tmp/CMF-head/CMFDefault .
- $ ln -s /tmp/CMF-head/CMFTopic .
- $ ln -s /tmp/CMF-head/DCWorkflow .
-
- 3. Verify filesystem products:
-
- Start or restart your Zope server. Check to see that the
- following products are present in the Control_Panel / Products
- list; each should show a "normal" (non-broken) icon, and
- should have a version number matching the release version of
- the snapshot:
-
- - CMFCore
-
- - CMFDefault
-
- - CMFTopic
-
- 4. Create a CMF Site:
-
- From the management interface, somewhere in the "main"
- section of your site (*not* the Control_Panel!),
- select "Portal (New)" from the add list. Fill out the
- constructor form, and click the "Add" button.
-
-Refreshing your Checkout
-
- Note that to refresh an existing CVS sandbox, you should
- use 'cvs up -d -P' (assuming you want to remove obsolete
- directories and retrieve any newly-added ones).
-
-Fetching a Previous Version
-
-.. [1] A normal CVS checkout retrieves what is called the "head"
- (the latest revision for each file) from the "main trunk"
- (no unmerged branches).
-
- Retrieving Sources for a Release
-
- Sources for prior releases are tagged, using the release
- version identifier, but with the periods replaced with
- underscores. For instance, version 1.1 of the CMF
- was tagged as 'CMF-1_1-src'. To fetch such a
- release from CVS::
-
- $ cvs -d :pserver:anonymous at cvs.zope.org:/cvs-repository \
- checkout -r CMF-1_1-src CMF
-
Added: CMF/branches/CMF-1_5-branch/INSTALL_SVN.txt
===================================================================
--- CMF/branches/CMF-1_5-branch/INSTALL_SVN.txt 2005-07-20 20:08:03 UTC (rev 37350)
+++ CMF/branches/CMF-1_5-branch/INSTALL_SVN.txt 2005-07-20 21:16:59 UTC (rev 37351)
@@ -0,0 +1,99 @@
+Overview
+
+ This document describes the process of getting the CMF from the Subversion
+ repository, and installing it into your Zope. It assumes the following:
+
+ * You want to install the "latest-and-greatest" version of the CMF from
+ a Subversion checkout.
+
+ - See "Installing CMF":INSTALL.txt to install from a tarball.
+
+ - See the note below [1] if you want to export or check out
+ the sources for a specific version from Subversion.
+
+ *Please note that current versions of the CMF (1.5 and later) require Zope
+ 2.7.0 or later. Also, please note that earlier versions of the CMF (< 1.5)
+ may not be completely compatible with more recent versions of Zope (>= 2.8).*
+
+ * For help with Subversion in general, see "Version Control with
+ Subversion" at http://svnbook.red-bean.com/
+
+ * For directions on using the Zope Subversion server, see "The Zope Public
+ Subversion Repository", http://www.zope.org/DevHome/Subversion/FrontPage;
+ substitute 'CMF' for 'Zope'.
+
+Installation
+
+ 1. Fetch the CMF package from the Zope Subversion repository::
+
+ $ cd /tmp
+ $ svn co svn://svn.zope.org/repos/main/CMF/trunk CMF-head
+
+ This checkout creates a directory, 'CMF-head', which contain several
+ subdirectories:
+
+ - CMFCore
+
+ - CMFDefault
+
+ - CMFTopic
+
+ - CMFCalendar
+
+ - DCWorkflow
+
+ ... and several others.
+
+ 2. Copy or link each of these subdirectories into the 'Products' directory of
+ your Zope server (either SOFTWARE_HOME or INSTANCE_HOME) e.g.::
+
+ $ cd /var/zope/Products
+ $ ln -s /tmp/CMF-head/CMFCore .
+ $ ln -s /tmp/CMF-head/CMFDefault .
+ $ ln -s /tmp/CMF-head/CMFTopic .
+ $ ln -s /tmp/CMF-head/DCWorkflow .
+ ...
+
+ 3. Verify filesystem products:
+
+ Start or restart your Zope server. Check to see that the following
+ products are present in the Control_Panel / Products list; each should
+ show a "normal" (non-broken) icon, and should have a version number
+ matching the release version of the snapshot:
+
+ - CMFCore
+
+ - CMFDefault
+
+ - CMFTopic
+
+ - DCWorkflow
+
+ ...
+
+ 4. Create a CMF Site:
+
+ From the management interface, somewhere in the "main" section of your
+ site (*not* the Control_Panel!), select "Configured CMF Site" from the
+ add list. Fill out the constructor form, and click the "Add" button.
+
+Refreshing your Checkout
+
+ To refresh an existing Subversion sandbox, you should use 'svn up'.
+
+Fetching a Previous Version
+
+.. [1] A Subversion checkout as described above retrieves what is called
+ the "head" (the latest revision for each file) from the "main
+ trunk" (no unmerged branches).
+
+ Retrieving Sources for a specific release
+
+ Sources for prior releases are tagged, using the release version
+ identifier, but with the periods replaced with underscores. For
+ instance, version 1.5.2 of the CMF was tagged as 'CMF-1_5_2-release'.
+ To fetch such a release from Subversion::
+
+ $ svn co svn://svn.zope.org/repos/main/CMF/tags/CMF-1_5_2-release \
+ CMF-1.5.2
+
More information about the CMF-checkins
mailing list