ThetaDev/automerge
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

light edits

Browse source
This commit is contained in:
Orion Henry 2020-03-30 16:45:28 -07:00
parent f8aa3e2fd5
commit 461c970e30
2 changed files with 8 additions and 12 deletions
automerge-backend/src
backend.rsop_set.rs

13
automerge-backend/src/backend.rs
View file

@ -276,18 +276,16 @@ impl Backend {
) -> Result<Patch, AutomergeError> {
self.check_for_duplicate(&request)?; // Change has already been applied
let version = self.get_version(request.version)?.clone();
let ver = self.get_version(request.version)?.clone();
let actor = request.actor.clone();
request
.deps
.get_or_insert_with(|| version.op_set.deps.without(&actor));
.get_or_insert_with(|| ver.op_set.deps.without(&actor));
let start_op = self.op_set.max_op + 1;
let change = match request.request_type {
ChangeRequestType::Change => {
self.process_request(&request, &version.op_set, start_op)?
}
ChangeRequestType::Change => self.process_request(&request, &ver.op_set, start_op)?,
ChangeRequestType::Undo => self.undo(&request, start_op)?,
ChangeRequestType::Redo => self.redo(&request, start_op)?,
};
@ -299,8 +297,6 @@ impl Backend {
self.finalize_version(request.version, change)?;
Ok(patch)
// Ok(self.make_patch(diffs.unwrap(), Some(&tmp_request), true)?)
}
pub fn check_for_duplicate(&self, request: &ChangeRequest) -> Result<(), AutomergeError> {
@ -343,7 +339,7 @@ impl Backend {
undoable: bool,
) -> Result<Vec<PendingDiff>, AutomergeError> {
if let Some(all_deps) = self.states.add_change(&change)? {
// FIXME - move these to backend?
// maybe - move these out of op_set?
self.op_set.clock.set(&change.actor_id, change.seq);
self.op_set.deps.subtract(&all_deps);
self.op_set.deps.set(&change.actor_id, change.seq);
@ -372,7 +368,6 @@ impl Backend {
change: Rc<Change>,
) -> Result<(), AutomergeError> {
// remove all versions older than this one
// i wish i had drain filter
let mut i = 0;
while i != self.versions.len() {
if self.versions[i].version < request_version {

7
automerge-backend/src/op_set.rs
View file

@ -96,7 +96,6 @@ impl OpSet {
_local: bool,
undoable: bool,
) -> Result<Vec<PendingDiff>, AutomergeError> {
self.max_op = max(self.max_op, change.max_op());
let ops = OpHandle::extract(change);
@ -292,13 +291,15 @@ impl OpSet {
pub fn get_obj(&self, object_id: &ObjectID) -> Result<&ObjState, AutomergeError> {
self.objs
.get(&object_id).map(|o| o.as_ref())
.get(&object_id)
.map(|o| o.as_ref())
.ok_or_else(|| AutomergeError::MissingObjectError(object_id.clone()))
}
fn get_obj_mut(&mut self, object_id: &ObjectID) -> Result<&mut ObjState, AutomergeError> {
self.objs
.get_mut(&object_id).map(|rc| Rc::make_mut(rc))
.get_mut(&object_id)
.map(|rc| Rc::make_mut(rc))
.ok_or_else(|| AutomergeError::MissingObjectError(object_id.clone()))
}