[Checkins] SVN: zc.vault/trunk/src/zc/vault/ Convert to use new
zc.copy and zc.freeze packages instead of zc.copyversion.
Gary Poster
gary at zope.com
Wed Aug 23 23:13:15 EDT 2006
Log message for revision 69750:
Convert to use new zc.copy and zc.freeze packages instead of zc.copyversion.
Changed:
U zc.vault/trunk/src/zc/vault/README.txt
U zc.vault/trunk/src/zc/vault/catalog.txt
U zc.vault/trunk/src/zc/vault/configure.zcml
U zc.vault/trunk/src/zc/vault/core.py
U zc.vault/trunk/src/zc/vault/objectlog.py
U zc.vault/trunk/src/zc/vault/objectlog.txt
U zc.vault/trunk/src/zc/vault/tests.py
U zc.vault/trunk/src/zc/vault/traversal.py
U zc.vault/trunk/src/zc/vault/traversal.txt
U zc.vault/trunk/src/zc/vault/vault.py
U zc.vault/trunk/src/zc/vault/versions.txt
-=-
Modified: zc.vault/trunk/src/zc/vault/README.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/README.txt 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/README.txt 2006-08-24 03:13:14 UTC (rev 69750)
@@ -139,7 +139,7 @@
persistent.Persistent.
All non-None objects must also be adaptable to
-zc.copyversion.interfaces.IVersionable.
+zc.freeze.interfaces.IFreezable.
Here, we create an object, add it to the application, and try to add it to
an inventory.
@@ -154,54 +154,54 @@
>>> i.contents['mydemo'] = app['d1']
Traceback (most recent call last):
...
- ValueError: can only place versionable objects in vault, or None
+ ValueError: can only place freezable objects in vault, or None
-This error occurs because committing an inventory must version itself
-and version all of its contained objects, so that looking at an
+This error occurs because committing an inventory must freeze itself
+and freeze all of its contained objects, so that looking at an
historical inventory displays the objects as they were at the time of
commit. Here's a simple demo adapter for the Demo objects. We also
-declare that Demo is IVersionable, an important marker.
+declare that Demo is IFreezable, an important marker.
>>> import pytz
>>> import datetime
>>> from zope import interface, component, event
- >>> from zc.copyversion.interfaces import (
- ... IVersioning, ObjectVersionedEvent, IVersionable)
- >>> from zc.copyversion.versioning import method
- >>> class DemoVersioningAdapter(object):
- ... interface.implements(IVersioning)
+ >>> from zc.freeze.interfaces import (
+ ... IFreezing, ObjectFrozenEvent, IFreezable)
+ >>> from zc.freeze import method
+ >>> class DemoFreezingAdapter(object):
+ ... interface.implements(IFreezing)
... component.adapts(Demo)
... def __init__(self, context):
... self.context = context
... @property
- ... def _z_versioned(self):
- ... return (getattr(self.context, '_z__version_timestamp', None)
+ ... def _z_frozen(self):
+ ... return (getattr(self.context, '_z__freeze_timestamp', None)
... is not None)
... @property
- ... def _z_version_timestamp(self):
- ... return getattr(self.context, '_z__version_timestamp', None)
+ ... def _z_freeze_timestamp(self):
+ ... return getattr(self.context, '_z__freeze_timestamp', None)
... @method
- ... def _z_version(self):
- ... self.context._z__version_timestamp = datetime.datetime.now(
+ ... def _z_freeze(self):
+ ... self.context._z__freeze_timestamp = datetime.datetime.now(
... pytz.utc)
- ... event.notify(ObjectVersionedEvent(self))
+ ... event.notify(ObjectFrozenEvent(self))
...
- >>> component.provideAdapter(DemoVersioningAdapter)
- >>> interface.classImplements(Demo, IVersionable)
+ >>> component.provideAdapter(DemoFreezingAdapter)
+ >>> interface.classImplements(Demo, IFreezable)
As an aside, it's worth noting that the manifest objects provide
-IVersioning natively, so they can already be queried for the versioning
-status and timestamp without adaptation. When a manifest is versioned,
-all "contained" objects should be versioned as well.
+IFreezing natively, so they can already be queried for the freezing
+status and timestamp without adaptation. When a manifest is frozen,
+all "contained" objects should be frozen as well.
-It's not versioned now--and neither is our demo instance.
+It's not frozen now--and neither is our demo instance.
- >>> manifest._z_versioned
+ >>> manifest._z_frozen
False
- >>> IVersioning(app['d1'])._z_versioned
+ >>> IFreezing(app['d1'])._z_frozen
False
-Now that Demo instances are versionable we can add the object to the inventory.
+Now that Demo instances are freezable we can add the object to the inventory.
That means adding and removing objects. Here we add one.
>>> i.contents['mydemo'] = app['d1']
@@ -376,8 +376,8 @@
>>> events[-1].old_keys
('abe', 'barbara', 'donald')
-In some circumstances it's easier set the new order from a set of tokens. In
-that case the "updateOrderFromTokens" method is useful.
+In some circumstances it's easier to set the new order from a set of
+tokens. In that case the "updateOrderFromTokens" method is useful.
>>> def getToken(key):
... return i.contents(k).token
@@ -601,7 +601,7 @@
["<Demo u'c1'>", "<Demo u'd1'>"]
Now when we commit, all objects will be versioned, and we will receive events
-for the versioning and the committing. The events list represents recent
+for the freezing and the committing. The events list represents recent
events; when this document is run as a test, it is populated by listening for
all events and attaching them to the list.
@@ -612,42 +612,42 @@
True
>>> manifest.__parent__ is v
True
- >>> IVersioning(app['a1'])._z_versioned
+ >>> IFreezing(app['a1'])._z_frozen
True
- >>> IVersioning(app['b1'])._z_versioned
+ >>> IFreezing(app['b1'])._z_frozen
True
- >>> IVersioning(app['c1'])._z_versioned
+ >>> IFreezing(app['c1'])._z_frozen
True
- >>> IVersioning(app['d1'])._z_versioned
+ >>> IFreezing(app['d1'])._z_frozen
True
- >>> manifest._z_versioned
+ >>> manifest._z_frozen
True
>>> v.manifest is manifest
True
>>> len(v)
1
-After the versioning, the inventory enforces the versioning: no more changes
+After the committing, the inventory enforces the freeze: no more changes
can be made.
>>> i.contents['foo'] = Demo()
Traceback (most recent call last):
...
- VersionedError
+ FrozenError
>>> i.contents.updateOrder(())
Traceback (most recent call last):
...
- VersionedError
+ FrozenError
>>> i.contents('abe')('catherine')['foo'] = Demo()
Traceback (most recent call last):
...
- VersionedError
+ FrozenError
- >>> v.manifest._z_versioned
+ >>> v.manifest._z_frozen
True
-Enforcing the versioning of the inventory's objects is the responsibility of
-other configuration.
+Enforcing the freezing of the inventory's objects is the responsibility of
+other code or configuration, not the vault package.
The manifest now has an __name__ which is the string of its index. This is
of very limited usefulness, but with the right traverser might still allow
@@ -681,7 +681,7 @@
>>> i = Inventory(vault=v, mutable=True)
>>> manifest = i.manifest
- >>> manifest._z_versioned
+ >>> manifest._z_frozen
False
by specifying an inventory, from which its manifest will be
@@ -689,20 +689,20 @@
>>> i = Inventory(inventory=v.inventory, mutable=True)
>>> manifest = i.manifest
- >>> manifest._z_versioned
+ >>> manifest._z_frozen
False
by specifying a versioned manifest and "mutable=True";
>>> i = Inventory(v.manifest, mutable=True)
>>> manifest = i.manifest
- >>> manifest._z_versioned
+ >>> manifest._z_frozen
False
or by specifying a mutable manifest.
>>> i = Inventory(Manifest(v.manifest))
- >>> i.manifest._z_versioned
+ >>> i.manifest._z_frozen
False
These multiple spellings should be reexamined at a later date, and may have
@@ -716,7 +716,7 @@
shared among them.
>>> i_extra = Inventory(i.manifest)
- >>> manifest._z_versioned
+ >>> manifest._z_frozen
False
In any case, we now have an inventory that has the same contents as the
@@ -1074,14 +1074,14 @@
>>> i.contents('donald').local_item # None
>>> i.contents('donald').type
'base'
- >>> IVersioning(app['e1'])._z_versioned
+ >>> IFreezing(app['e1'])._z_frozen
False
Our changes are a bit different than what we had when we began the commit,
because of the version Factory. The f1 is not versioned, because we have made
a copy instead.
- >>> IVersioning(app['f1'])._z_versioned
+ >>> IFreezing(app['f1'])._z_frozen
False
>>> new_changed = dict(
... (getattr(item, 'name', None), item)
@@ -1096,9 +1096,9 @@
False
>>> new_changed['fred'].object.source_name
u'f1'
- >>> IVersioning(new_changed['anna'].object)._z_versioned
+ >>> IFreezing(new_changed['anna'].object)._z_frozen
True
- >>> IVersioning(new_changed['fred'].object)._z_versioned
+ >>> IFreezing(new_changed['fred'].object)._z_frozen
True
Now that we have two versions in the vault, we can introduce two
@@ -1603,7 +1603,7 @@
UpdateError: cannot change local relationships while updating
>>> long_running.contents('edna').relationship.object
<Demo u'e1'>
- >>> long_running.contents('edna').relationship._z_versioned
+ >>> long_running.contents('edna').relationship._z_frozen
False
>>> long_running.manifest.getType(long_running.contents.relationship)
'local'
Modified: zc.vault/trunk/src/zc/vault/catalog.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/catalog.txt 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/catalog.txt 2006-08-24 03:13:14 UTC (rev 69750)
@@ -40,8 +40,8 @@
>>> i = Inventory(vault=v)
>>> import persistent
>>> from zope.app.container.contained import Contained
- >>> from zc.copyversion.versioning import Versioning
- >>> class Demo(persistent.Persistent, Contained, Versioning):
+ >>> from zc.freeze import Freezing
+ >>> class Demo(persistent.Persistent, Contained, Freezing):
... def __repr__(self):
... return "<%s %r>" % (self.__class__.__name__, self.__name__)
...
Modified: zc.vault/trunk/src/zc/vault/configure.zcml
===================================================================
--- zc.vault/trunk/src/zc/vault/configure.zcml 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/configure.zcml 2006-08-24 03:13:14 UTC (rev 69750)
@@ -3,7 +3,7 @@
i18n_domain="zc.task">
<class class=".core.Mapping">
- <require like_class="zc.copyversion.versioning.VersioningAdapter" />
+ <require like_class="zc.freeze.FreezingAdapter" />
<require permission="zope.View"
interface="zope.interface.common.mapping.IEnumerableMapping" />
<require permission="zope.View"
@@ -24,7 +24,7 @@
</class>
<class class=".core.Relationship">
- <require like_class="zc.copyversion.versioning.VersioningAdapter" />
+ <require like_class="zc.freeze.FreezingAdapter" />
<require like_class=".keyref.Token" />
<require permission="zope.View"
attributes="token object containment children copy_source" />
@@ -40,7 +40,7 @@
</class>
<class class=".core.Manifest">
- <require like_class="zc.copyversion.versioning.VersioningAdapter" />
+ <require like_class="zc.freeze.FreezingAdapter" />
<require permission="zope.View"
attributes="held vault_index getBaseSources getBaseSource base_source
vault merged_sources update_source update_base updating
Modified: zc.vault/trunk/src/zc/vault/core.py
===================================================================
--- zc.vault/trunk/src/zc/vault/core.py 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/core.py 2006-08-24 03:13:14 UTC (rev 69750)
@@ -11,11 +11,11 @@
import zope.app.intid
import zope.app.intid.interfaces
from zc.relationship import index
-from zc.copyversion import versioning
-import zc.copyversion.interfaces
+import zc.freeze
+import zc.freeze.interfaces
import zope.app.keyreference.interfaces
# import rwproperty
-from zc.copyversion import rwproperty
+from zc.freeze import rwproperty
from zc.vault import interfaces, keyref
@@ -50,7 +50,7 @@
if self.reindex and manifest is not None:
manifest.reindex(rel)
-class Mapping(persistent.Persistent, versioning.Versioning):
+class Mapping(persistent.Persistent, zc.freeze.Freezing):
interface.implements(interfaces.IRelationshipContainment)
@@ -103,7 +103,7 @@
return default
return self._reverse.get(value, default)
- @versioning.method
+ @zc.freeze.method
@approvalmethod(reindex=True)
def __delitem__(self, key):
self._delitem(key)
@@ -117,7 +117,7 @@
self._length.change(-1)
event.notify(interfaces.ObjectRemoved(old, self, key))
- @versioning.method
+ @zc.freeze.method
@approvalmethod(reindex=True)
def __setitem__(self, key, value):
self._setitem(key, value)
@@ -158,7 +158,7 @@
event.notify(interfaces.ObjectRemoved(old_value, self, key))
event.notify(interfaces.ObjectAdded(value, self, key))
- @versioning.method
+ @zc.freeze.method
@approvalmethod(reindex=True)
def update(self, data):
if getattr(data, 'keys', None) is not None:
@@ -182,7 +182,7 @@
for k, v in data:
self._setitem(k, v)
- @versioning.method
+ @zc.freeze.method
@approvalmethod(reindex=False)
def updateOrder(self, order):
order = tuple(order)
@@ -204,7 +204,7 @@
def __ne__(self, other):
return not (self == other)
-class Relationship(keyref.Token, versioning.Versioning):
+class Relationship(keyref.Token, zc.freeze.Freezing):
interface.implements(interfaces.IRelationship)
_token = _copy_source = None
@@ -241,32 +241,32 @@
def copy_source(self): # None or tuple of (relationship, inventory)
return self._copy_source
- @versioning.method
- def _z_version(self):
+ @zc.freeze.method
+ def _z_freeze(self):
if self.token is None:
- raise zc.copyversion.interfaces.VersioningError(
+ raise zc.freeze.interfaces.FreezingError(
'Cannot version without a token')
vault = self.__parent__.vault
- if not self.containment._z_versioned:
+ if not self.containment._z_frozen:
prev = vault.getPrevious(self)
if prev is not None:
if prev.containment == self.containment:
- assert prev.containment._z_versioned
+ assert prev.containment._z_frozen
self._containment = prev.containment
- if not self._containment._z_versioned:
- self.containment._z_version()
+ if not self._containment._z_frozen:
+ self.containment._z_freeze()
if self._object is not None:
- obj_v = zc.copyversion.interfaces.IVersioning(self.object)
- if not obj_v._z_versioned:
+ obj_v = zc.freeze.interfaces.IFreezing(self.object)
+ if not obj_v._z_frozen:
factory = interfaces.IVersionFactory(vault, None)
if factory is not None:
res = factory(self.object, self.__parent__)
if res is not self.object:
self.object = res
- obj_v = zc.copyversion.interfaces.IVersioning(res)
- if not obj_v._z_versioned:
- obj_v._z_version()
- super(Relationship, self)._z_version()
+ obj_v = zc.freeze.interfaces.IFreezing(res)
+ if not obj_v._z_frozen:
+ obj_v._z_freeze()
+ super(Relationship, self)._z_freeze()
@property
def token(self):
@@ -283,16 +283,16 @@
@property
def object(self):
return self._object
- @versioning.setproperty
+ @zc.freeze.setproperty
def object(self, value):
if self.token is None and self.__parent__ is not None:
raise ValueError('cannot change object without token')
if self.token == self.__parent__.vault.top_token:
raise ValueError('cannot set object of top token')
if (value is not None and
- not zc.copyversion.interfaces.IVersionable.providedBy(value)):
+ not zc.freeze.interfaces.IFreezable.providedBy(value)):
raise ValueError(
- 'can only place versionable objects in vault, or None')
+ 'can only place freezable objects in vault, or None')
if self.__parent__ is not None:
self.__parent__.checkRelationshipChange(self)
if value is not self._object:
@@ -319,7 +319,7 @@
# NOTE: a reference to this function is persisted!
return index.__parent__.vault.intids.getObject(token)
-class Manifest(persistent.Persistent, versioning.Versioning,
+class Manifest(persistent.Persistent, zc.freeze.Freezing,
zope.app.container.contained.Contained):
interface.implements(interfaces.IManifest)
@@ -337,7 +337,7 @@
"explicitly passed vault must have a base in base_source.")
else: # vault but not base
base = vault.manifest
- if base is not None and not base._z_versioned:
+ if base is not None and not base._z_frozen:
raise ValueError('base must be versioned')
self.__parent__ = self._vault = vault
self._index = index.Index(
@@ -398,7 +398,7 @@
self._index.index_doc(rid, rel)
self._bases[iid] = data
- versioning.makeProperty('vault_index')
+ zc.freeze.makeProperty('vault_index')
def getBaseSources(self):
return tuple(data[1] for data in self._bases.values())
@@ -419,7 +419,7 @@
@property
def vault(self):
return self._vault
- @versioning.setproperty
+ @zc.freeze.setproperty
def vault(self, value):
if self.updating:
raise interfaces.UpdateError('Cannot change vault while updating')
@@ -456,14 +456,14 @@
def updating(self):
return self._updateSource is not None
- @versioning.method
- def _z_version(self):
+ @zc.freeze.method
+ def _z_freeze(self):
if self.updating:
- raise zc.copyversion.interfaces.VersioningError(
+ raise zc.freeze.interfaces.FreezingError(
'cannot version during update')
if (list(self.iterParentConflicts()) or
list(self.iterOrphanConflicts())):
- raise zc.copyversion.interfaces.VersioningError(
+ raise zc.freeze.interfaces.FreezingError(
'cannot version with conflicts')
selections = set(self._iterLinked())
b = base = self.base_source
@@ -478,8 +478,8 @@
if (b is None or
b.object is not rel.object or
b.containment != rel.containment):
- if not rel._z_versioned:
- rel._z_version()
+ if not rel._z_frozen:
+ rel._z_freeze()
else:
selections.remove(r)
self._local.remove(r)
@@ -487,7 +487,7 @@
self._index.unindex_doc(r)
self._selections.clear()
self._selections.update(selections)
- super(Manifest, self)._z_version()
+ super(Manifest, self)._z_freeze()
def _locateObject(self, relationship, force=False):
if not force:
@@ -518,7 +518,7 @@
set.insert(iid)
self._index.index_doc(iid, relationship)
- @versioning.method
+ @zc.freeze.method
def addLocal(self, relationship):
if self.updating:
raise interfaces.UpdateError(
@@ -532,7 +532,7 @@
self._index.tokenizeQuery({'token': relationship.token}))) == 1:
self.select(relationship)
- @versioning.method
+ @zc.freeze.method
def addModified(self, relationship):
if not self.updating:
raise interfaces.UpdateError(
@@ -543,7 +543,7 @@
self._index.tokenizeQuery({'token': relationship.token}))) == 1:
self.select(relationship)
- @versioning.method
+ @zc.freeze.method
def addSuggested(self, relationship):
if not self.updating:
raise interfaces.UpdateError(
@@ -554,7 +554,7 @@
self._add(relationship, self._suggested)
event.notify(interfaces.SuggestedRelationshipAdded(relationship))
- @versioning.method
+ @zc.freeze.method
def beginUpdate(self, source=None, base=None):
if self.updating:
raise interfaces.UpdateError(
@@ -579,20 +579,20 @@
o = source.getBaseSource(b.vault)
if o is not None:
# we found one!
- if (o._z_version_timestamp >
- b._z_version_timestamp):
+ if (o._z_freeze_timestamp >
+ b._z_freeze_timestamp):
b = o
if base is None or (
- b._z_version_timestamp >
- base._z_version_timestamp):
+ b._z_freeze_timestamp >
+ base._z_freeze_timestamp):
base = b
if base is None:
raise ValueError('no shared previous manifest')
else:
base = otherBase
elif (otherBase is None or
- otherBase._z_version_timestamp <=
- myBase._z_version_timestamp):
+ otherBase._z_freeze_timestamp <=
+ myBase._z_freeze_timestamp):
base = myBase
else:
base = otherBase
@@ -601,12 +601,12 @@
if base is source:
raise ValueError('base is source')
- elif base._z_version_timestamp > source._z_version_timestamp:
+ elif base._z_freeze_timestamp > source._z_freeze_timestamp:
raise NotImplementedError(
"don't know how to merge to older source")
if not interfaces.IManifest.providedBy(base):
raise ValueError('base must be manifest')
- if not source._z_versioned or not base._z_versioned:
+ if not source._z_frozen or not base._z_frozen:
raise ValueError('manifests must be versioned')
intids = self.vault.intids
self._oldSelections.update(self._selections)
@@ -649,7 +649,7 @@
resolver(self, l, s, b)
event.notify(interfaces.UpdateBegun(self, source, base))
- @versioning.method
+ @zc.freeze.method
def beginCollectionUpdate(self, source):
if self.updating:
raise interfaces.UpdateError(
@@ -675,7 +675,7 @@
self._oldOrphanResolutions.update(self._orphanResolutions)
tmp_source = set()
for rel in source:
- if not rel._z_versioned:
+ if not rel._z_frozen:
if rel.__parent__ is not None and rel.__parent__ is not self:
rel = Relationship(rel.token, relationship=rel)
rel.__parent__ = self
@@ -750,14 +750,14 @@
for b in source.getBaseSources():
iid = global_intids.register(b.vault)
o = bases.get(iid)
- if o is None or o._z_version_timestamp < b._z_version_timestamp:
+ if o is None or o._z_freeze_timestamp < b._z_freeze_timestamp:
bases[iid] = b
self._indexBases(bases.values(), source)
existing = IFBTree.multiunion(
[data[0] for data in self._bases.values()])
for i in selected:
orig = rel = intids.getObject(i)
- if rel._z_versioned:
+ if rel._z_frozen:
create_local = False
source_rel = source.get(rel.token)
if source_rel is rel:
@@ -765,8 +765,8 @@
elif source_rel is not None:
base_rel = base.get(rel.token)
if (base_rel is None or
- source_rel._z_version_timestamp >
- base_rel._z_version_timestamp):
+ source_rel._z_freeze_timestamp >
+ base_rel._z_freeze_timestamp):
create_local = True
if create_local:
rel = Relationship(
@@ -788,7 +788,7 @@
for i in selected:
if i not in existing:
rel = intids.getObject(i)
- if rel._z_versioned:
+ if rel._z_frozen:
rel = Relationship(
rel.token, relationship=rel, source_manifest=self)
rel.__parent__ = self
@@ -850,7 +850,7 @@
b.containment != rel.containment):
yield rel
- @versioning.method
+ @zc.freeze.method
def reindex(self, relationship):
t = self.vault.intids.queryId(relationship)
if t is not None and (t in self._local or t in self._suggested or
@@ -905,7 +905,7 @@
t = self.vault.intids.queryId(relationship)
return t is not None and t in self._selections
- @versioning.method
+ @zc.freeze.method
def select(self, relationship):
t = self.vault.intids.queryId(relationship)
if t is None or self.getType(relationship) is None:
@@ -1031,7 +1031,7 @@
return (token in self._conflicts and
token not in self._resolutions)
- @versioning.method
+ @zc.freeze.method
def resolveUpdateConflict(self, token):
if not self.updating:
raise interfaces.UpdateError(
@@ -1069,11 +1069,11 @@
self.getType(token) not in (interfaces.BASE, interfaces.MERGED)
and token not in self._orphanResolutions)
- @versioning.method
+ @zc.freeze.method
def resolveOrphanConflict(self, token):
self._orphanResolutions.insert(token)
- @versioning.method
+ @zc.freeze.method
def undoOrphanConflictResolution(self, token):
self._orphanResolutions.remove(token)
@@ -1257,8 +1257,8 @@
self._commit(manifest)
def _commit(self, manifest):
- if manifest._z_versioned:
- raise zc.copyversion.interfaces.VersionedError(manifest)
+ if manifest._z_frozen:
+ raise zc.freeze.interfaces.FrozenError(manifest)
if manifest.get(self.top_token) is None:
raise ValueError(
'cannot commit a manifest without a top_token relationship')
@@ -1275,7 +1275,7 @@
ix = len(self)
self._data[ix] = manifest
manifest.vault_index = ix
- manifest._z_version()
+ manifest._z_freeze()
for r in manifest:
if manifest.getLocal(r.token) is r:
p = self.getPrevious(r)
@@ -1294,7 +1294,7 @@
raise ValueError('source must be manifest')
if source.vault.intids is not self.intids:
raise ValueError('source must share intids')
- if not source._z_versioned:
+ if not source._z_frozen:
raise ValueError('source must already be versioned')
res = Manifest(self.manifest)
base_rels = dict((r.token, r) for r in res.base_source)
Modified: zc.vault/trunk/src/zc/vault/objectlog.py
===================================================================
--- zc.vault/trunk/src/zc/vault/objectlog.py 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/objectlog.py 2006-08-24 03:13:14 UTC (rev 69750)
@@ -4,7 +4,7 @@
import zope.location
import zc.objectlog.interfaces
from zc import objectlog
-import zc.copyversion.interfaces
+import zc.freeze.interfaces
from zc.vault.i18n import _
from zc.vault import interfaces
@@ -94,7 +94,7 @@
man.log(_('Committed'))
@component.adapter(
- interfaces.IRelationship, zc.copyversion.interfaces.IObjectVersionedEvent)
+ interfaces.IRelationship, zc.freeze.interfaces.IObjectFrozenEvent)
def logVersioning(rel, ev):
if zc.objectlog.interfaces.ILogging.providedBy(rel):
rel.log(_('Versioned'))
Modified: zc.vault/trunk/src/zc/vault/objectlog.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/objectlog.txt 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/objectlog.txt 2006-08-24 03:13:14 UTC (rev 69750)
@@ -41,8 +41,8 @@
>>> import persistent
>>> from zope.app.container.contained import Contained
- >>> from zc.copyversion.versioning import Versioning
- >>> class Demo(persistent.Persistent, Contained, Versioning):
+ >>> from zc.freeze import Freezing
+ >>> class Demo(persistent.Persistent, Contained, Freezing):
... def __repr__(self):
... return "<%s %r>" % (self.__class__.__name__, self.__name__)
...
Modified: zc.vault/trunk/src/zc/vault/tests.py
===================================================================
--- zc.vault/trunk/src/zc/vault/tests.py 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/tests.py 2006-08-24 03:13:14 UTC (rev 69750)
@@ -128,11 +128,11 @@
def traversalSetUp(test):
setUp(test)
- import zc.copyversion.copier
- component.provideAdapter(zc.copyversion.copier.location_copyfactory)
- component.provideAdapter(zc.copyversion.copier.versiondata_copyfactory)
- import zope.copypastemove
- component.provideAdapter(zope.copypastemove.ObjectCopier)
+ import zc.copy
+ component.provideAdapter(zc.copy.location_copyfactory)
+ import zc.freeze.copier
+ component.provideAdapter(zc.freeze.copier.data_copyfactory)
+ component.provideAdapter(zc.copy.ObjectCopier)
import zc.shortcut.adapters
component.provideAdapter(zc.shortcut.adapters.ObjectLinkerAdapter)
Modified: zc.vault/trunk/src/zc/vault/traversal.py
===================================================================
--- zc.vault/trunk/src/zc/vault/traversal.py 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/traversal.py 2006-08-24 03:13:14 UTC (rev 69750)
@@ -7,8 +7,8 @@
import zope.app.container.interfaces
import zope.app.container.constraints
-import zc.copyversion.copier
-import zc.copyversion.interfaces
+import zc.copy
+import zc.freeze.interfaces
import zc.shortcut
import zc.shortcut.proxy
import zc.shortcut.interfaces
@@ -158,10 +158,10 @@
if node == target._z_inventory_node and new_name == node.name:
return # noop
manifest = node.inventory.manifest
- if manifest._z_versioned:
- raise zc.copyversion.interfaces.VersionedError(manifest)
- if target._z_inventory_node.inventory.manifest._z_versioned:
- raise zc.copyversion.interfaces.VersionedError(
+ if manifest._z_frozen:
+ raise zc.freeze.interfaces.FrozenError(manifest)
+ if target._z_inventory_node.inventory.manifest._z_frozen:
+ raise zc.freeze.interfaces.FrozenError(
target._z_inventory_node.inventory.manifest)
checkObject(target, new_name, self.context)
chooser = zope.app.container.interfaces.INameChooser(target)
@@ -171,14 +171,14 @@
def moveable(self):
manifest = self.context._z_inventory_node.inventory.manifest
- return not manifest._z_versioned
+ return not manifest._z_frozen
def moveableTo(self, target, new_name=None):
node = self.context._z_inventory_node
manifest = node.inventory.manifest
- if (not manifest._z_versioned and
+ if (not manifest._z_frozen and
IInventoryItemAware.providedBy(target) and
- not target._z_inventory_node.inventory.manifest._z_versioned):
+ not target._z_inventory_node.inventory.manifest._z_frozen):
if new_name is None:
new_name = node.name
try:
@@ -207,8 +207,8 @@
def copyTo(self, target, new_name=None):
if IInventoryItemAware.providedBy(target):
- if target._z_inventory_node.inventory.manifest._z_versioned:
- raise zc.copyversion.interfaces.VersionedError(
+ if target._z_inventory_node.inventory.manifest._z_frozen:
+ raise zc.freeze.interfaces.FrozenError(
target._z_inventory_node.inventory.manifest)
else:
if not isInventoryObject(self.context):
@@ -236,7 +236,7 @@
else:
next = node(key)
original = next.object
- next.object = zc.copyversion.copier.copy(original)
+ next.object = zc.copy.copy(original)
stack.append((next, iter(next)))
return new_name
@@ -247,7 +247,7 @@
if not self.copyable():
return False
if IInventoryItemAware.providedBy(target):
- if target._z_inventory_node.inventory.manifest._z_versioned:
+ if target._z_inventory_node.inventory.manifest._z_frozen:
return False
check = checkObject
else:
@@ -275,8 +275,8 @@
def linkTo(self, target, new_name=None):
if IInventoryItemAware.providedBy(target):
- if target._z_inventory_node.inventory.manifest._z_versioned:
- raise zc.copyversion.interfaces.VersionedError(
+ if target._z_inventory_node.inventory.manifest._z_frozen:
+ raise zc.freeze.interfaces.FrozenError(
target._z_inventory_node.inventory.manifest)
else:
if not isInventoryObject(self.context):
@@ -299,7 +299,7 @@
def linkableTo(self, target, new_name=None):
if IInventoryItemAware.providedBy(target):
- if target._z_inventory_node.inventory.manifest._z_versioned:
+ if target._z_inventory_node.inventory.manifest._z_frozen:
return False
obj = self.context
check = checkObject
Modified: zc.vault/trunk/src/zc/vault/traversal.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/traversal.txt 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/traversal.txt 2006-08-24 03:13:14 UTC (rev 69750)
@@ -41,10 +41,10 @@
>>> import persistent
>>> import zope.annotation.interfaces
>>> import zope.interface
- >>> import zc.copyversion.versioning
+ >>> import zc.freeze
>>> import zope.app.container.interfaces
>>> class Demo(persistent.Persistent, zope.location.Location,
- ... zc.copyversion.versioning.Versioning):
+ ... zc.freeze.Freezing):
... zope.interface.implements(
... zope.annotation.interfaces.IAttributeAnnotatable,
... zope.app.container.interfaces.IContained)
Modified: zc.vault/trunk/src/zc/vault/vault.py
===================================================================
--- zc.vault/trunk/src/zc/vault/vault.py 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/vault.py 2006-08-24 03:13:14 UTC (rev 69750)
@@ -5,8 +5,8 @@
import zope.lifecycleevent
import zope.proxy
# import rwproperty
-from zc.copyversion import rwproperty
-import zc.copyversion.interfaces
+from zc.freeze import rwproperty
+import zc.freeze.interfaces
from zc.vault import interfaces, core
@@ -100,8 +100,8 @@
def makeMutable(self):
# local is mutable normally; modified is mutable while updating
- if self.inventory.manifest._z_versioned:
- raise zc.copyversion.interfaces.VersionedError
+ if self.inventory.manifest._z_frozen:
+ raise zc.freeze.interfaces.FrozenError
typ = self.type
if not self.inventory.manifest.updating:
if typ == interfaces.LOCAL:
@@ -509,7 +509,7 @@
manifest = inventory.manifest
elif inventory is not None:
raise ValueError('cannot pass both manifest and inventory')
- if mutable and manifest._z_versioned:
+ if mutable and manifest._z_frozen:
manifest = core.Manifest(manifest, vault)
event.notify(
zope.lifecycleevent.ObjectCreatedEvent(manifest))
Modified: zc.vault/trunk/src/zc/vault/versions.txt
===================================================================
--- zc.vault/trunk/src/zc/vault/versions.txt 2006-08-24 02:18:00 UTC (rev 69749)
+++ zc.vault/trunk/src/zc/vault/versions.txt 2006-08-24 03:13:14 UTC (rev 69750)
@@ -68,8 +68,8 @@
>>> len(p.versions)
1
>>> p.versions[0].get('foo') # None
- >>> import zc.copyversion.versioning
- >>> class Demo(persistent.Persistent, zc.copyversion.versioning.Versioning):
+ >>> import zc.freeze
+ >>> class Demo(persistent.Persistent, zc.freeze.Freezing):
... pass
>>> o = p.active['foo'] = Demo()
>>> p.commit()
@@ -162,4 +162,4 @@
>>> import transaction
>>> transaction.commit()
-Yay.
\ No newline at end of file
+Yay.
More information about the Checkins
mailing list