Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
tempstorage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
tempstorage
Commits
c2eb4054
Commit
c2eb4054
authored
Dec 24, 2003
by
Jeremy Hylton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add loadEx definition.
parent
e1879ea8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
TemporaryStorage.py
TemporaryStorage.py
+6
-2
No files found.
TemporaryStorage.py
View file @
c2eb4054
...
@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of
...
@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of
non-cyclic garbage and it does rudimentary conflict resolution. This is a
non-cyclic garbage and it does rudimentary conflict resolution. This is a
ripoff of Jim's Packless bsddb3 storage.
ripoff of Jim's Packless bsddb3 storage.
$Id: TemporaryStorage.py,v 1.
3 2003/12/24 16:42:22
jeremy Exp $
$Id: TemporaryStorage.py,v 1.
4 2003/12/24 16:46:15
jeremy Exp $
"""
"""
__version__
=
'$Revision: 1.
3
$'
[
11
:
-
2
]
__version__
=
'$Revision: 1.
4
$'
[
11
:
-
2
]
from
zLOG
import
LOG
,
BLATHER
from
zLOG
import
LOG
,
BLATHER
from
ZODB.referencesf
import
referencesf
from
ZODB.referencesf
import
referencesf
...
@@ -97,6 +97,10 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
...
@@ -97,6 +97,10 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
finally
:
finally
:
self
.
_lock_release
()
self
.
_lock_release
()
def
loadEx
(
self
,
oid
,
version
):
p
,
s
=
self
.
load
(
oid
,
version
)
return
p
,
s
,
s
def
loadSerial
(
self
,
oid
,
serial
,
marker
=
[]):
def
loadSerial
(
self
,
oid
,
serial
,
marker
=
[]):
""" this is only useful to make conflict resolution work. It
""" this is only useful to make conflict resolution work. It
does not actually implement all the semantics that a revisioning
does not actually implement all the semantics that a revisioning
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment